Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Update i18n files

Roland Geider9e592410c1ab
diff --git a/wger/locale/ar_SA/LC_MESSAGES/django.po b/wger/locale/ar_SA/LC_MESSAGES/django.po
index cc86c6765..fe96941aa 100644
--- a/wger/locale/ar_SA/LC_MESSAGES/django.po
+++ b/wger/locale/ar_SA/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-17 15:00+0200\n"
+"POT-Creation-Date: 2021-08-17 17:23+0200\n"
"PO-Revision-Date: 2021-04-11 18:54+0000\n"
"Last-Translator: rge <[email protected]>\n"
"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/rge/wger-"
@@ -40,7 +40,7 @@ msgstr "تمارين"
msgid "Ingredients"
msgstr "مقادير"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:225
+#: config/templates/language/overview.html:4 core/templates/navigation.html:228
msgid "Languages"
msgstr "اللغات"
@@ -212,8 +212,8 @@ msgstr ""
msgid "Empty placeholder schedule"
msgstr ""
-#: core/forms.py:61 core/templates/navigation.html:187
-#: core/templates/navigation.html:191 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:190
+#: core/templates/navigation.html:194 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr ""
@@ -286,8 +286,8 @@ msgstr ""
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:187
-#: core/templates/navigation.html:192 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
+#: core/templates/navigation.html:195 core/templates/template.html:150
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -755,84 +755,10 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4
-msgid "About us"
-msgstr ""
-
-#: core/templates/misc/about.html:8
-msgid "Responsible for the content of this site as per German law §5 TMG:"
-msgstr ""
-
-#: core/templates/misc/about.html:16
-msgid "GNUPG-Key:"
-msgstr ""
-
-#: core/templates/misc/contact.html:4 core/templates/navigation.html:153
-#: core/templates/template_features.html:86
-#: software/templates/contribute.html:28
-msgid "Get in touch"
-msgstr ""
-
-#: core/templates/misc/contact.html:10
-#, python-format
-msgid ""
-"Thank you for your interest. Feel free to use any of the\n"
-"ways below to send feedback you have about any aspect of the site. For\n"
-"support, say hi\n"
-"<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
-"a bug, consider doing it through the <a href=\"%(issues)s\">issue tracker</"
-"a>\n"
-"."
-msgstr ""
-
-#: core/templates/misc/contact.html:20
-#, python-format
-msgid ""
-"If you want to further help and improve this project,\n"
-"you might also be interested <a href=\"%(contribute)s\">in contributing</a>."
-msgstr ""
-
-#: core/templates/misc/contact.html:29
-msgid "Feedback form"
-msgstr ""
-
-#: core/templates/misc/contact.html:30
-msgid ""
-"A simple contact form. Remember that\n"
-"if you want an answer, you need to include some way to contact you."
-msgstr ""
-
-#: core/templates/misc/contact.html:35
-msgid "Twitter"
-msgstr ""
-
-#: core/templates/misc/contact.html:36
-msgid ""
-"We are also on twitter. Write us and tell us what\n"
-"you think! Except patches, don't send patches via twitter."
-msgstr ""
-
-#: core/templates/misc/contact.html:42
-msgid "Discord"
-msgstr ""
-
-#: core/templates/misc/contact.html:43
-msgid ""
-"Use the public group to get support for your\n"
-"local wger installation, discuss issues or your new idea, etc.\n"
-"(no registration needed)"
-msgstr ""
-
-#: core/templates/misc/contact.html:49
-msgid "Open feedback form"
-msgstr ""
-
-#: core/templates/misc/contact.html:53
-msgid "tweet to @wger_project"
-msgstr ""
-
-#: core/templates/misc/contact.html:56
-msgid "Go to the discord server"
+#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/template_features.html:118
+#: core/templates/template_no_context.html:88
+msgid "Imprint"
msgstr ""
#: core/templates/misc/fragments/shariff_modal.html:6
@@ -918,7 +844,7 @@ msgid "Add new exercise"
msgstr ""
#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:223
+#: core/templates/navigation.html:226
msgid "Administration"
msgstr ""
@@ -985,68 +911,62 @@ msgid "About this software"
msgstr ""
#: core/templates/navigation.html:151 core/templates/template_features.html:83
-#: software/templates/contribute.html:6
-msgid "Contribute!"
-msgstr ""
-
-#: core/templates/navigation.html:152
-msgid "Problems and wishes"
+#: software/templates/about_us.html:5
+msgid "About us"
msgstr ""
-#: core/templates/navigation.html:155 software/templates/features.html:209
+#: core/templates/navigation.html:153 software/templates/features.html:209
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:156 software/templates/license.html:7
-#: utils/models.py:40
+#: core/templates/navigation.html:157 utils/models.py:40
msgid "License"
msgstr ""
-#: core/templates/navigation.html:160
+#: core/templates/navigation.html:163
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:166 software/templates/contribute.html:59
+#: core/templates/navigation.html:169
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:172 core/templates/template.html:193
-#: core/templates/template_features.html:103
-#: software/templates/contribute.html:43 software/templates/contribute.html:50
+#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/template_features.html:100
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:193 core/templates/user/login.html:28
+#: core/templates/navigation.html:196 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:206
+#: core/templates/navigation.html:209
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:213
+#: core/templates/navigation.html:216
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:228
+#: core/templates/navigation.html:231
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:234
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:234 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:237 core/templates/user/list.html:4
+#: core/templates/navigation.html:240 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:238
+#: core/templates/navigation.html:241
msgid "Gyms"
msgstr ""
@@ -1160,18 +1080,12 @@ msgstr ""
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:201 core/templates/template_features.html:121
-#: core/templates/template_no_context.html:88
-msgid "About"
-msgstr ""
-
-#: core/templates/template.html:202 core/templates/template_features.html:125
+#: core/templates/template.html:202 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
#: core/templates/template.html:209 core/templates/template.html:210
-#: software/templates/license.html:18 software/templates/license.html:19
msgid "Released under the Affero GPL"
msgstr ""
@@ -1519,15 +1433,15 @@ msgstr ""
msgid "Rest day"
msgstr ""
-#: core/views/misc.py:199
+#: core/views/misc.py:184
msgid "Feedback"
msgstr ""
-#: core/views/misc.py:218 weight/templates/import_csv_form.html:9
+#: core/views/misc.py:203 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr ""
-#: core/views/misc.py:226
+#: core/views/misc.py:211
msgid "Your feedback was successfully sent. Thank you!"
msgstr ""
@@ -1696,7 +1610,6 @@ msgstr ""
#: exercises/templates/exercise/overview.html:118
#: exercises/templates/muscles/overview.html:114
#: nutrition/templates/ingredient/overview.html:85
-#: software/templates/contribute.html:39
msgid "Only registered users can do this"
msgstr ""
@@ -1890,7 +1803,7 @@ msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246 software/templates/contribute.html:37
+#: exercises/views/exercises.py:246
msgid "Add exercise"
msgstr ""
@@ -3518,75 +3431,53 @@ msgstr ""
msgid "Edit a weight unit to ingredient connection"
msgstr ""
-#: software/templates/contribute.html:9
+#: software/templates/about_us.html:9
msgid ""
-"wger Workout Manager is build by volunteers,\n"
-"the development process is open and freely accessible to anybody "
-"interested.\n"
-"If you are new to the free software world, we recommend to take a\n"
-"look <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
-"article</a> which summarizes they way open source projects work very well. "
+"Thank you for using wger! wger is a collaborative open source project, made "
+"by fitness enthusiasts from around the world."
msgstr ""
-#: software/templates/contribute.html:16
-msgid ""
-"Any kind of contribution is appreciated and welcome.\n"
-"Use this opportunity and influence the direction of the\n"
-"project. "
+#: software/templates/about_us.html:18
+msgid "Source code"
msgstr ""
-#: software/templates/contribute.html:23
-msgid "Use the site"
+#: software/templates/about_us.html:20
+msgid "Get the source code of this application and its server on github"
msgstr ""
-#: software/templates/contribute.html:24
-msgid ""
-"Simply use the site and tell your friends\n"
-"how useful it is! ;) . When you find something that you specially liked,\n"
-"could need some improvements or just doesn't work, tell us! This might not "
-"sound\n"
-"like much, but is incredibly important!"
+#: software/templates/about_us.html:25
+msgid "Have a problem or idea?"
msgstr ""
-#: software/templates/contribute.html:31
-msgid "Submit exercises"
+#: software/templates/about_us.html:27
+msgid ""
+"Get in touch if something didn't behave as expected or if there is a feature "
+"that you feel is missing."
msgstr ""
-#: software/templates/contribute.html:32
-msgid ""
-"Submit those cool exercises that you absolutely\n"
-"love and do every week but are not in the list yet. If you think some "
-"description\n"
-"is too short or some other detail is missing or could be improved, tell!"
+#: software/templates/about_us.html:32
+msgid "Say hi!"
msgstr ""
-#: software/templates/contribute.html:44
-msgid ""
-"Do you want to use wger in your own language?\n"
-"Do you think the current translation could be improved?\n"
-"The translations are easily managed and edited online, if you are "
-"interested,\n"
-"visit the link and start translating."
+#: software/templates/about_us.html:34
+msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
-#: software/templates/contribute.html:53
-msgid "Code"
+#: software/templates/about_us.html:39
+msgid "Translation"
msgstr ""
-#: software/templates/contribute.html:54
+#: software/templates/about_us.html:41
msgid ""
-"Obviously, you are highly encouraged to clone the\n"
-"repo and start hacking! Once you are ready, send a pull request and we\n"
-"will show the world. Take a look at the developer guide for more details\n"
-"on this."
+"This application is translated on weblate. If you also want to help, click "
+"the link and start translating"
msgstr ""
-#: software/templates/contribute.html:66
+#: software/templates/about_us.html:50
msgid "Our goal"
msgstr ""
-#: software/templates/contribute.html:69
+#: software/templates/about_us.html:53
msgid ""
"The goal is to build an awesome\n"
"and flexible fitness manager, along with a comprehensive and complete list "
@@ -3721,78 +3612,6 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr ""
-#: software/templates/issues.html:6
-msgid "Reporting a problem"
-msgstr ""
-
-#: software/templates/issues.html:10
-msgid ""
-"\n"
-"No software is perfect. For some severe errors, an email will be "
-"automatically sent, but\n"
-"not always, so I depend on you reporting everything that didn't behave as "
-"expected.\n"
-"Please describe in as much detail as you can what you were doing when the "
-"error\n"
-"happened.\n"
-msgstr ""
-
-#: software/templates/issues.html:21
-msgid "report problem to the issue tracker"
-msgstr ""
-
-#: software/templates/issues.html:25
-msgid "Enhancements"
-msgstr ""
-
-#: software/templates/issues.html:27
-msgid ""
-"\n"
-"The issue tracker can also be used to document enhancements to the "
-"software.\n"
-"If you have some suggestions or think a feature is missing, feel\n"
-"free to open a ticket. This can be anything from a slight change to a whole\n"
-"new section of the site. Please keep in mind that not all wishes can be\n"
-"implemented."
-msgstr ""
-
-#: software/templates/issues.html:36
-msgid "report wish to the issue tracker"
-msgstr ""
-
-#: software/templates/issues.html:41
-msgid "No Github account?"
-msgstr ""
-
-#: software/templates/issues.html:42
-msgid ""
-"Filing an issue requires a github account, if you don't\n"
-"have one and don't want to register, you can also send it to\n"
-"<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
-msgstr ""
-
-#: software/templates/license.html:10
-msgid ""
-"wger Workout Manager is Free/Libre Open Source\n"
-"Software (FLOSS)."
-msgstr ""
-
-#: software/templates/license.html:22
-msgid ""
-"wger Workout Manager is released under the <strong>Affero GNU\n"
-"General Public License (AGPL) Version 3+</strong> and can (under the "
-"conditions\n"
-"of the license) be used, modified and distributed (also with modifications)\n"
-"without restrictions."
-msgstr ""
-
-#: software/templates/license.html:29
-msgid ""
-"A copy the license text is contained in every wger Workout\n"
-"Manager release (LICENSE.txt) and can be read online on the website of\n"
-"<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</a>."
-msgstr ""
-
#: utils/generic_views.py:261
msgid "Yes, delete"
msgstr ""
diff --git a/wger/locale/bg/LC_MESSAGES/django.po b/wger/locale/bg/LC_MESSAGES/django.po
index 6734a3465..f58e5af2a 100644
--- a/wger/locale/bg/LC_MESSAGES/django.po
+++ b/wger/locale/bg/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-17 15:00+0200\n"
+"POT-Creation-Date: 2021-08-17 17:23+0200\n"
"PO-Revision-Date: 2021-04-15 07:27+0000\n"
"Last-Translator: Allan Nordhøy <[email protected]>\n"
"Language-Team: Bulgarian <https://hosted.weblate.org/projects/wger/web/bg/>\n"
@@ -42,7 +42,7 @@ msgstr "Упражнения"
msgid "Ingredients"
msgstr ""
-#: config/templates/language/overview.html:4 core/templates/navigation.html:225
+#: config/templates/language/overview.html:4 core/templates/navigation.html:228
msgid "Languages"
msgstr ""
@@ -214,8 +214,8 @@ msgstr "Моята готина тренировъчна схема"
msgid "Empty placeholder schedule"
msgstr "Празно място за тренировъчен план"
-#: core/forms.py:61 core/templates/navigation.html:187
-#: core/templates/navigation.html:191 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:190
+#: core/templates/navigation.html:194 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Вход"
@@ -290,8 +290,8 @@ msgstr ""
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:187
-#: core/templates/navigation.html:192 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
+#: core/templates/navigation.html:195 core/templates/template.html:150
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -766,94 +766,10 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4
-msgid "About us"
-msgstr "За нас"
-
-#: core/templates/misc/about.html:8
-msgid "Responsible for the content of this site as per German law §5 TMG:"
-msgstr "Отговност за съдържанието на този сайт, по немски закон §5 TMG:"
-
-#: core/templates/misc/about.html:16
-msgid "GNUPG-Key:"
-msgstr "GNUPG-Key:"
-
-#: core/templates/misc/contact.html:4 core/templates/navigation.html:153
-#: core/templates/template_features.html:86
-#: software/templates/contribute.html:28
-msgid "Get in touch"
-msgstr "Свържи се"
-
-#: core/templates/misc/contact.html:10
-#, python-format
-msgid ""
-"Thank you for your interest. Feel free to use any of the\n"
-"ways below to send feedback you have about any aspect of the site. For\n"
-"support, say hi\n"
-"<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
-"a bug, consider doing it through the <a href=\"%(issues)s\">issue tracker</"
-"a>\n"
-"."
-msgstr ""
-
-#: core/templates/misc/contact.html:20
-#, python-format
-msgid ""
-"If you want to further help and improve this project,\n"
-"you might also be interested <a href=\"%(contribute)s\">in contributing</a>."
-msgstr ""
-"Ако имаш желание да помогнеш да направиш този проект още по-добър,\n"
-"може би ще се интересуваш и от <a href=\"%(contribute)s\"> допринасяне </a>."
-
-#: core/templates/misc/contact.html:29
-msgid "Feedback form"
-msgstr "Форма за обратна връзка"
-
-#: core/templates/misc/contact.html:30
-msgid ""
-"A simple contact form. Remember that\n"
-"if you want an answer, you need to include some way to contact you."
-msgstr ""
-"Прост контактен формуляр. Помни, че\n"
-"ако искаш отговор, трябва да добавиш начин за свързване с теб."
-
-#: core/templates/misc/contact.html:35
-msgid "Twitter"
-msgstr "Туитер"
-
-#: core/templates/misc/contact.html:36
-msgid ""
-"We are also on twitter. Write us and tell us what\n"
-"you think! Except patches, don't send patches via twitter."
-msgstr ""
-"Ние сме също и в Туитър. Пиши ни и кажи какво\n"
-"мислиш! Освен поправки, моля не пращайте пачове по туитър."
-
-#: core/templates/misc/contact.html:42
-msgid "Discord"
-msgstr ""
-
-#: core/templates/misc/contact.html:43
-msgid ""
-"Use the public group to get support for your\n"
-"local wger installation, discuss issues or your new idea, etc.\n"
-"(no registration needed)"
-msgstr ""
-"Използвай публичната група за да получиш подкрепа за твоята\n"
-"локална wger инсталация или да дискутираш проблеми или новата ти идея и т."
-"н.\n"
-"(не е нужна регистрация)"
-
-#: core/templates/misc/contact.html:49
-msgid "Open feedback form"
-msgstr "Отворена форма за обратна връзка"
-
-#: core/templates/misc/contact.html:53
-msgid "tweet to @wger_project"
-msgstr ""
-
-#: core/templates/misc/contact.html:56
-msgid "Go to the discord server"
+#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/template_features.html:118
+#: core/templates/template_no_context.html:88
+msgid "Imprint"
msgstr ""
#: core/templates/misc/fragments/shariff_modal.html:6
@@ -943,7 +859,7 @@ msgid "Add new exercise"
msgstr "Добави ново упражнение"
#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:223
+#: core/templates/navigation.html:226
msgid "Administration"
msgstr "Администрация"
@@ -1010,68 +926,62 @@ msgid "About this software"
msgstr "Относно този код"
#: core/templates/navigation.html:151 core/templates/template_features.html:83
-#: software/templates/contribute.html:6
-msgid "Contribute!"
-msgstr "Допринеси!"
-
-#: core/templates/navigation.html:152
-msgid "Problems and wishes"
-msgstr "Проблеми и желания"
+#: software/templates/about_us.html:5
+msgid "About us"
+msgstr "За нас"
-#: core/templates/navigation.html:155 software/templates/features.html:209
+#: core/templates/navigation.html:153 software/templates/features.html:209
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:156 software/templates/license.html:7
-#: utils/models.py:40
+#: core/templates/navigation.html:157 utils/models.py:40
msgid "License"
msgstr "Лиценз"
-#: core/templates/navigation.html:160
+#: core/templates/navigation.html:163
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:166 software/templates/contribute.html:59
+#: core/templates/navigation.html:169
msgid "Get the code"
msgstr "Грабни кода"
-#: core/templates/navigation.html:172 core/templates/template.html:193
-#: core/templates/template_features.html:103
-#: software/templates/contribute.html:43 software/templates/contribute.html:50
+#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/template_features.html:100
msgid "Translate"
msgstr "Преведи"
-#: core/templates/navigation.html:193 core/templates/user/login.html:28
+#: core/templates/navigation.html:196 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Промени парола"
-#: core/templates/navigation.html:206
+#: core/templates/navigation.html:209
msgid "My preferences"
msgstr "Моите преференции"
-#: core/templates/navigation.html:213
+#: core/templates/navigation.html:216
msgid "Logout"
msgstr "Изход"
-#: core/templates/navigation.html:228
+#: core/templates/navigation.html:231
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:234
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:234 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Единици за тегло"
-#: core/templates/navigation.html:237 core/templates/user/list.html:4
+#: core/templates/navigation.html:240 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:238
+#: core/templates/navigation.html:241
msgid "Gyms"
msgstr ""
@@ -1191,18 +1101,12 @@ msgstr ""
msgid "Create some demo entries"
msgstr "Направи демонстративни попълнения"
-#: core/templates/template.html:201 core/templates/template_features.html:121
-#: core/templates/template_no_context.html:88
-msgid "About"
-msgstr "Относно"
-
-#: core/templates/template.html:202 core/templates/template_features.html:125
+#: core/templates/template.html:202 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
#: core/templates/template.html:209 core/templates/template.html:210
-#: software/templates/license.html:18 software/templates/license.html:19
msgid "Released under the Affero GPL"
msgstr "Създадено под закрилата на Affero GPL"
@@ -1554,15 +1458,15 @@ msgstr ""
msgid "Rest day"
msgstr "Ден за почивка"
-#: core/views/misc.py:199
+#: core/views/misc.py:184
msgid "Feedback"
msgstr "Обратна връзка"
-#: core/views/misc.py:218 weight/templates/import_csv_form.html:9
+#: core/views/misc.py:203 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr ""
-#: core/views/misc.py:226
+#: core/views/misc.py:211
msgid "Your feedback was successfully sent. Thank you!"
msgstr "Вашият съвет/коментар бе изпратен успешно. Благодарим ви!"
@@ -1731,7 +1635,6 @@ msgstr "име на упражнение"
#: exercises/templates/exercise/overview.html:118
#: exercises/templates/muscles/overview.html:114
#: nutrition/templates/ingredient/overview.html:85
-#: software/templates/contribute.html:39
msgid "Only registered users can do this"
msgstr "Само за регистрирани потребители"
@@ -1933,7 +1836,7 @@ msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246 software/templates/contribute.html:37
+#: exercises/views/exercises.py:246
msgid "Add exercise"
msgstr "Добави упражнение"
@@ -3615,114 +3518,55 @@ msgstr "Добави единица за тегло"
msgid "Edit a weight unit to ingredient connection"
msgstr "Промени единица за тегло към хранителната съставка"
-#: software/templates/contribute.html:9
-msgid ""
-"wger Workout Manager is build by volunteers,\n"
-"the development process is open and freely accessible to anybody "
-"interested.\n"
-"If you are new to the free software world, we recommend to take a\n"
-"look <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
-"article</a> which summarizes they way open source projects work very well. "
-msgstr ""
-"wger мениджъра за тренировки е изграден от доброволци, \n"
-"процеса на развитие е отворен и със свободен достъп на всеки "
-"заинтересован. \n"
-"Ако сте нов в света на свободния софтуер, ние препоръчваме да погледнете \n"
-"<a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">\n"
-"този артикул </a>, който обобщава начина, по който проектите с отворен код "
-"работят по-добре."
-
-#: software/templates/contribute.html:16
+#: software/templates/about_us.html:9
msgid ""
-"Any kind of contribution is appreciated and welcome.\n"
-"Use this opportunity and influence the direction of the\n"
-"project. "
+"Thank you for using wger! wger is a collaborative open source project, made "
+"by fitness enthusiasts from around the world."
msgstr ""
-"Всякакъв вид помощ е ценена и добре дошла. \n"
-"Използвайте тази възможност да повлияете на посоката на развитие \n"
-"проекта."
-#: software/templates/contribute.html:23
-msgid "Use the site"
-msgstr "Ползвайте страницата"
+#: software/templates/about_us.html:18
+msgid "Source code"
+msgstr ""
-#: software/templates/contribute.html:24
-msgid ""
-"Simply use the site and tell your friends\n"
-"how useful it is! ;) . When you find something that you specially liked,\n"
-"could need some improvements or just doesn't work, tell us! This might not "
-"sound\n"
-"like much, but is incredibly important!"
-msgstr ""
-"Просто използвайте сайта и кажете на приятелите си\n"
-"колко е полезен! ;). Когато намерите нещо специално, което ви харесва,\n"
-"или се нуждае от подобрения, или просто не работи, моля да ни кажете! Това "
-"може да не звучи\n"
-"като много, но е изключително важно!"
-
-#: software/templates/contribute.html:31
-msgid "Submit exercises"
-msgstr "Въведи упражненията"
-
-#: software/templates/contribute.html:32
+#: software/templates/about_us.html:20
+msgid "Get the source code of this application and its server on github"
+msgstr ""
+
+#: software/templates/about_us.html:25
+msgid "Have a problem or idea?"
+msgstr ""
+
+#: software/templates/about_us.html:27
msgid ""
-"Submit those cool exercises that you absolutely\n"
-"love and do every week but are not in the list yet. If you think some "
-"description\n"
-"is too short or some other detail is missing or could be improved, tell!"
-msgstr ""
-"Подай на тези готини упражнения, които абсолютно обичаш \n"
-"правиш всяка седмица, но не са в списъка, все още. Ако смяташ, че някои "
-"описание \n"
-"е твърде кратко или някаква друга подробност липсва, или може да се подобри, "
-"моля сподели!"
-
-#: software/templates/contribute.html:44
+"Get in touch if something didn't behave as expected or if there is a feature "
+"that you feel is missing."
+msgstr ""
+
+#: software/templates/about_us.html:32
+msgid "Say hi!"
+msgstr ""
+
+#: software/templates/about_us.html:34
+msgid "If you want to chat with us, hop on the Discord server and get in touch"
+msgstr ""
+
+#: software/templates/about_us.html:39
#, fuzzy
-#| msgid ""
-#| "Do you want to use wger in your own language?\n"
-#| "Do you think the current translation could be improved?\n"
-#| "The translations are easily managed and edited online, if you are "
-#| "interested,\n"
-#| "go to the transifex site, request access and we will set everything\n"
-#| "up. "
-msgid ""
-"Do you want to use wger in your own language?\n"
-"Do you think the current translation could be improved?\n"
-"The translations are easily managed and edited online, if you are "
-"interested,\n"
-"visit the link and start translating."
-msgstr ""
-"Искате ли да използвате wger на собствения си език? \n"
-"Мислите ли, че сегашният превод може да се подобри? \n"
-"Преводите лесно се управляват и редактират онлайн. Ако се интересувате, \n"
-"отидете на сайтът transifex и поискайте достъп."
-
-#: software/templates/contribute.html:53
-msgid "Code"
-msgstr "Код"
-
-#: software/templates/contribute.html:54
+#| msgid "Translate"
+msgid "Translation"
+msgstr "Преведи"
+
+#: software/templates/about_us.html:41
msgid ""
-"Obviously, you are highly encouraged to clone the\n"
-"repo and start hacking! Once you are ready, send a pull request and we\n"
-"will show the world. Take a look at the developer guide for more details\n"
-"on this."
-msgstr ""
-"Очевидно е, че сте силно насърчавани да клонирате \n"
-"хранилището и да заченете хакването! След като сте готови, изпратете заявка "
-"за теглене и ние \n"
-"ще го покажем на света. Обърнете внимание на наръчника за разработчици за "
-"повече информация \n"
-"по този въпрос."
-
-#: software/templates/contribute.html:66
+"This application is translated on weblate. If you also want to help, click "
+"the link and start translating"
+msgstr ""
+
+#: software/templates/about_us.html:50
msgid "Our goal"
msgstr ""
-#: software/templates/contribute.html:69
+#: software/templates/about_us.html:53
msgid ""
"The goal is to build an awesome\n"
"and flexible fitness manager, along with a comprehensive and complete list "
@@ -3861,78 +3705,6 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr ""
-#: software/templates/issues.html:6
-msgid "Reporting a problem"
-msgstr ""
-
-#: software/templates/issues.html:10
-msgid ""
-"\n"
-"No software is perfect. For some severe errors, an email will be "
-"automatically sent, but\n"
-"not always, so I depend on you reporting everything that didn't behave as "
-"expected.\n"
-"Please describe in as much detail as you can what you were doing when the "
-"error\n"
-"happened.\n"
-msgstr ""
-
-#: software/templates/issues.html:21
-msgid "report problem to the issue tracker"
-msgstr ""
-
-#: software/templates/issues.html:25
-msgid "Enhancements"
-msgstr ""
-
-#: software/templates/issues.html:27
-msgid ""
-"\n"
-"The issue tracker can also be used to document enhancements to the "
-"software.\n"
-"If you have some suggestions or think a feature is missing, feel\n"
-"free to open a ticket. This can be anything from a slight change to a whole\n"
-"new section of the site. Please keep in mind that not all wishes can be\n"
-"implemented."
-msgstr ""
-
-#: software/templates/issues.html:36
-msgid "report wish to the issue tracker"
-msgstr ""
-
-#: software/templates/issues.html:41
-msgid "No Github account?"
-msgstr ""
-
-#: software/templates/issues.html:42
-msgid ""
-"Filing an issue requires a github account, if you don't\n"
-"have one and don't want to register, you can also send it to\n"
-"<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
-msgstr ""
-
-#: software/templates/license.html:10
-msgid ""
-"wger Workout Manager is Free/Libre Open Source\n"
-"Software (FLOSS)."
-msgstr ""
-
-#: software/templates/license.html:22
-msgid ""
-"wger Workout Manager is released under the <strong>Affero GNU\n"
-"General Public License (AGPL) Version 3+</strong> and can (under the "
-"conditions\n"
-"of the license) be used, modified and distributed (also with modifications)\n"
-"without restrictions."
-msgstr ""
-
-#: software/templates/license.html:29
-msgid ""
-"A copy the license text is contained in every wger Workout\n"
-"Manager release (LICENSE.txt) and can be read online on the website of\n"
-"<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</a>."
-msgstr ""
-
#: utils/generic_views.py:261
msgid "Yes, delete"
msgstr ""
@@ -4096,6 +3868,162 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Responsible for the content of this site as per German law §5 TMG:"
+#~ msgstr "Отговност за съдържанието на този сайт, по немски закон §5 TMG:"
+
+#~ msgid "GNUPG-Key:"
+#~ msgstr "GNUPG-Key:"
+
+#~ msgid "Get in touch"
+#~ msgstr "Свържи се"
+
+#~ msgid ""
+#~ "If you want to further help and improve this project,\n"
+#~ "you might also be interested <a href=\"%(contribute)s\">in contributing</"
+#~ "a>."
+#~ msgstr ""
+#~ "Ако имаш желание да помогнеш да направиш този проект още по-добър,\n"
+#~ "може би ще се интересуваш и от <a href=\"%(contribute)s\"> допринасяне </"
+#~ "a>."
+
+#~ msgid "Feedback form"
+#~ msgstr "Форма за обратна връзка"
+
+#~ msgid ""
+#~ "A simple contact form. Remember that\n"
+#~ "if you want an answer, you need to include some way to contact you."
+#~ msgstr ""
+#~ "Прост контактен формуляр. Помни, че\n"
+#~ "ако искаш отговор, трябва да добавиш начин за свързване с теб."
+
+#~ msgid "Twitter"
+#~ msgstr "Туитер"
+
+#~ msgid ""
+#~ "We are also on twitter. Write us and tell us what\n"
+#~ "you think! Except patches, don't send patches via twitter."
+#~ msgstr ""
+#~ "Ние сме също и в Туитър. Пиши ни и кажи какво\n"
+#~ "мислиш! Освен поправки, моля не пращайте пачове по туитър."
+
+#~ msgid ""
+#~ "Use the public group to get support for your\n"
+#~ "local wger installation, discuss issues or your new idea, etc.\n"
+#~ "(no registration needed)"
+#~ msgstr ""
+#~ "Използвай публичната група за да получиш подкрепа за твоята\n"
+#~ "локална wger инсталация или да дискутираш проблеми или новата ти идея и т."
+#~ "н.\n"
+#~ "(не е нужна регистрация)"
+
+#~ msgid "Open feedback form"
+#~ msgstr "Отворена форма за обратна връзка"
+
+#~ msgid "Contribute!"
+#~ msgstr "Допринеси!"
+
+#~ msgid "Problems and wishes"
+#~ msgstr "Проблеми и желания"
+
+#~ msgid "About"
+#~ msgstr "Относно"
+
+#~ msgid ""
+#~ "wger Workout Manager is build by volunteers,\n"
+#~ "the development process is open and freely accessible to anybody "
+#~ "interested.\n"
+#~ "If you are new to the free software world, we recommend to take a\n"
+#~ "look <a href=\"http://schlitt.info/opensource/"
+#~ "blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
+#~ "article</a> which summarizes they way open source projects work very "
+#~ "well. "
+#~ msgstr ""
+#~ "wger мениджъра за тренировки е изграден от доброволци, \n"
+#~ "процеса на развитие е отворен и със свободен достъп на всеки "
+#~ "заинтересован. \n"
+#~ "Ако сте нов в света на свободния софтуер, ние препоръчваме да "
+#~ "погледнете \n"
+#~ "<a href=\"http://schlitt.info/opensource/"
+#~ "blog/0541_10_golden_rules_for_starting_with_open_source.html\">\n"
+#~ "този артикул </a>, който обобщава начина, по който проектите с отворен "
+#~ "код работят по-добре."
+
+#~ msgid ""
+#~ "Any kind of contribution is appreciated and welcome.\n"
+#~ "Use this opportunity and influence the direction of the\n"
+#~ "project. "
+#~ msgstr ""
+#~ "Всякакъв вид помощ е ценена и добре дошла. \n"
+#~ "Използвайте тази възможност да повлияете на посоката на развитие \n"
+#~ "проекта."
+
+#~ msgid "Use the site"
+#~ msgstr "Ползвайте страницата"
+
+#~ msgid ""
+#~ "Simply use the site and tell your friends\n"
+#~ "how useful it is! ;) . When you find something that you specially liked,\n"
+#~ "could need some improvements or just doesn't work, tell us! This might "
+#~ "not sound\n"
+#~ "like much, but is incredibly important!"
+#~ msgstr ""
+#~ "Просто използвайте сайта и кажете на приятелите си\n"
+#~ "колко е полезен! ;). Когато намерите нещо специално, което ви харесва,\n"
+#~ "или се нуждае от подобрения, или просто не работи, моля да ни кажете! "
+#~ "Това може да не звучи\n"
+#~ "като много, но е изключително важно!"
+
+#~ msgid "Submit exercises"
+#~ msgstr "Въведи упражненията"
+
+#~ msgid ""
+#~ "Submit those cool exercises that you absolutely\n"
+#~ "love and do every week but are not in the list yet. If you think some "
+#~ "description\n"
+#~ "is too short or some other detail is missing or could be improved, tell!"
+#~ msgstr ""
+#~ "Подай на тези готини упражнения, които абсолютно обичаш \n"
+#~ "правиш всяка седмица, но не са в списъка, все още. Ако смяташ, че някои "
+#~ "описание \n"
+#~ "е твърде кратко или някаква друга подробност липсва, или може да се "
+#~ "подобри, моля сподели!"
+
+#, fuzzy
+#~| msgid ""
+#~| "Do you want to use wger in your own language?\n"
+#~| "Do you think the current translation could be improved?\n"
+#~| "The translations are easily managed and edited online, if you are "
+#~| "interested,\n"
+#~| "go to the transifex site, request access and we will set everything\n"
+#~| "up. "
+#~ msgid ""
+#~ "Do you want to use wger in your own language?\n"
+#~ "Do you think the current translation could be improved?\n"
+#~ "The translations are easily managed and edited online, if you are "
+#~ "interested,\n"
+#~ "visit the link and start translating."
+#~ msgstr ""
+#~ "Искате ли да използвате wger на собствения си език? \n"
+#~ "Мислите ли, че сегашният превод може да се подобри? \n"
+#~ "Преводите лесно се управляват и редактират онлайн. Ако се интересувате, \n"
+#~ "отидете на сайтът transifex и поискайте достъп."
+
+#~ msgid "Code"
+#~ msgstr "Код"
+
+#~ msgid ""
+#~ "Obviously, you are highly encouraged to clone the\n"
+#~ "repo and start hacking! Once you are ready, send a pull request and we\n"
+#~ "will show the world. Take a look at the developer guide for more details\n"
+#~ "on this."
+#~ msgstr ""
+#~ "Очевидно е, че сте силно насърчавани да клонирате \n"
+#~ "хранилището и да заченете хакването! След като сте готови, изпратете "
+#~ "заявка за теглене и ние \n"
+#~ "ще го покажем на света. Обърнете внимание на наръчника за разработчици за "
+#~ "повече информация \n"
+#~ "по този въпрос."
+
#~ msgid "The goal or description of the new workout."
#~ msgstr "Целта или описанието на предишната тренировка."
diff --git a/wger/locale/cs/LC_MESSAGES/django.po b/wger/locale/cs/LC_MESSAGES/django.po
index ed67e657d..a27dda491 100644
--- a/wger/locale/cs/LC_MESSAGES/django.po
+++ b/wger/locale/cs/LC_MESSAGES/django.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-17 15:00+0200\n"
+"POT-Creation-Date: 2021-08-17 17:23+0200\n"
"PO-Revision-Date: 2021-04-15 07:27+0000\n"
"Last-Translator: Zrnek <[email protected]>\n"
"Language-Team: Czech <https://hosted.weblate.org/projects/wger/web/cs/>\n"
@@ -48,7 +48,7 @@ msgstr "Cviky"
msgid "Ingredients"
msgstr "Potraviny"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:225
+#: config/templates/language/overview.html:4 core/templates/navigation.html:228
msgid "Languages"
msgstr "Jazyky"
@@ -224,8 +224,8 @@ msgstr "Můj suprový tréninkový rozvrh"
msgid "Empty placeholder schedule"
msgstr "Prázdný ukázkový rozvrh"
-#: core/forms.py:61 core/templates/navigation.html:187
-#: core/templates/navigation.html:191 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:190
+#: core/templates/navigation.html:194 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Přihlášení"
@@ -304,8 +304,8 @@ msgstr "Chybné heslo"
msgid "The form is secured with reCAPTCHA"
msgstr "Zabezpečeno reCaptcha"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:187
-#: core/templates/navigation.html:192 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
+#: core/templates/navigation.html:195 core/templates/template.html:150
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -802,98 +802,11 @@ msgstr "Seznam licencí"
msgid "Nothing found"
msgstr "Nic nenalezeno"
-#: core/templates/misc/about.html:4
-msgid "About us"
-msgstr "O nás"
-
-#: core/templates/misc/about.html:8
-msgid "Responsible for the content of this site as per German law §5 TMG:"
-msgstr "Zodpovědnou osobou za obsah na stránce je dle Německého práva §5 TMG:"
-
-#: core/templates/misc/about.html:16
-msgid "GNUPG-Key:"
-msgstr "Klíč GNUPG:"
-
-#: core/templates/misc/contact.html:4 core/templates/navigation.html:153
-#: core/templates/template_features.html:86
-#: software/templates/contribute.html:28
-msgid "Get in touch"
-msgstr "Zkontaktujte nás"
-
-#: core/templates/misc/contact.html:10
-#, python-format
-msgid ""
-"Thank you for your interest. Feel free to use any of the\n"
-"ways below to send feedback you have about any aspect of the site. For\n"
-"support, say hi\n"
-"<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
-"a bug, consider doing it through the <a href=\"%(issues)s\">issue tracker</"
-"a>\n"
-"."
-msgstr ""
-"Děkujeme za tvůj zájem. Neváhej využít několik z cest, jakými nám můžeš "
-"poslat feedback o jakékoliv části této stránky. \n"
-"<a href=\"%(discord)s\">Můžeš nás pozdravit na Discordu</a>, hlášení chyb je "
-"nejlepší udělat přes <a href=\"%(issues)s\">issue tracker.</a>"
-
-#: core/templates/misc/contact.html:20
-#, python-format
-msgid ""
-"If you want to further help and improve this project,\n"
-"you might also be interested <a href=\"%(contribute)s\">in contributing</a>."
-msgstr ""
-"Chceteli pomoct ve zlepšování tohoto projektu,\n"
-"možná by jste mohli mít zájem <a href=\"%(contribute)s\">přispět</a>."
-
-#: core/templates/misc/contact.html:29
-msgid "Feedback form"
-msgstr "Zpětná vazba"
-
-#: core/templates/misc/contact.html:30
-msgid ""
-"A simple contact form. Remember that\n"
-"if you want an answer, you need to include some way to contact you."
-msgstr ""
-"Kontaktní formulář. Nezapomeňte\n"
-"pokud chcete, abychom vám zaslai odpověď, musíte na sebe uvést kontakt."
-
-#: core/templates/misc/contact.html:35
-msgid "Twitter"
-msgstr "Twitter"
-
-#: core/templates/misc/contact.html:36
-msgid ""
-"We are also on twitter. Write us and tell us what\n"
-"you think! Except patches, don't send patches via twitter."
-msgstr ""
-"Jsme také na twitteru. Napište nám, svůj názor\n"
-"na tento produk! Kromě opravy. Opravu neposílejte přes twitter."
-
-#: core/templates/misc/contact.html:42
-msgid "Discord"
-msgstr "Discord"
-
-#: core/templates/misc/contact.html:43
-msgid ""
-"Use the public group to get support for your\n"
-"local wger installation, discuss issues or your new idea, etc.\n"
-"(no registration needed)"
+#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/template_features.html:118
+#: core/templates/template_no_context.html:88
+msgid "Imprint"
msgstr ""
-"Pomocí veřejné skupiny získáte podporu pro vaši\n"
-"lokální intalaci wger. Můžete diskutovat o nápadech, \n"
-"problémech a podobně. (Registrace není nutná)"
-
-#: core/templates/misc/contact.html:49
-msgid "Open feedback form"
-msgstr "Otevřít formulář zpětné vazby"
-
-#: core/templates/misc/contact.html:53
-msgid "tweet to @wger_project"
-msgstr "tweetnout @wger_project"
-
-#: core/templates/misc/contact.html:56
-msgid "Go to the discord server"
-msgstr "Jít na Discord server"
#: core/templates/misc/fragments/shariff_modal.html:6
msgid "Share this page"
@@ -986,7 +899,7 @@ msgid "Add new exercise"
msgstr "Přidat nový cvik"
#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:223
+#: core/templates/navigation.html:226
msgid "Administration"
msgstr "Administrace"
@@ -1053,68 +966,62 @@ msgid "About this software"
msgstr "O programu"
#: core/templates/navigation.html:151 core/templates/template_features.html:83
-#: software/templates/contribute.html:6
-msgid "Contribute!"
-msgstr "Přispějte!"
-
-#: core/templates/navigation.html:152
-msgid "Problems and wishes"
-msgstr "Přání a stížnosti"
+#: software/templates/about_us.html:5
+msgid "About us"
+msgstr "O nás"
-#: core/templates/navigation.html:155 software/templates/features.html:209
+#: core/templates/navigation.html:153 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:156 software/templates/license.html:7
-#: utils/models.py:40
+#: core/templates/navigation.html:157 utils/models.py:40
msgid "License"
msgstr "Licence"
-#: core/templates/navigation.html:160
+#: core/templates/navigation.html:163
msgid "Developer documentation"
msgstr "Dokumentace vývojáře"
-#: core/templates/navigation.html:166 software/templates/contribute.html:59
+#: core/templates/navigation.html:169
msgid "Get the code"
msgstr "Získat kód."
-#: core/templates/navigation.html:172 core/templates/template.html:193
-#: core/templates/template_features.html:103
-#: software/templates/contribute.html:43 software/templates/contribute.html:50
+#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/template_features.html:100
msgid "Translate"
msgstr "Překlad"
-#: core/templates/navigation.html:193 core/templates/user/login.html:28
+#: core/templates/navigation.html:196 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Reset hesla"
-#: core/templates/navigation.html:206
+#: core/templates/navigation.html:209
msgid "My preferences"
msgstr "Má nastavení"
-#: core/templates/navigation.html:213
+#: core/templates/navigation.html:216
msgid "Logout"
msgstr "Odhlásit"
-#: core/templates/navigation.html:228
+#: core/templates/navigation.html:231
msgid "Licenses"
msgstr "Licence"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:234
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Opakující jednotky"
-#: core/templates/navigation.html:234 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Jednotka hmostnosti"
-#: core/templates/navigation.html:237 core/templates/user/list.html:4
+#: core/templates/navigation.html:240 core/templates/user/list.html:4
msgid "User list"
msgstr "Uživatelský seznam"
-#: core/templates/navigation.html:238
+#: core/templates/navigation.html:241
msgid "Gyms"
msgstr "Posilovny"
@@ -1233,18 +1140,12 @@ msgstr "Využíváte testovací účet. Data zde vložená budou po týdnu smaz
msgid "Create some demo entries"
msgstr "Vytvořit nějaké testovací potraviny"
-#: core/templates/template.html:201 core/templates/template_features.html:121
-#: core/templates/template_no_context.html:88
-msgid "About"
-msgstr "O nás"
-
-#: core/templates/template.html:202 core/templates/template_features.html:125
+#: core/templates/template.html:202 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Obecná pravidla."
#: core/templates/template.html:209 core/templates/template.html:210
-#: software/templates/license.html:18 software/templates/license.html:19
msgid "Released under the Affero GPL"
msgstr "Uvolněno pod licencí Affero GPL"
@@ -1604,15 +1505,15 @@ msgstr ""
msgid "Rest day"
msgstr "Odpočinkový den"
-#: core/views/misc.py:199
+#: core/views/misc.py:184
msgid "Feedback"
msgstr "Zpětná vazba"
-#: core/views/misc.py:218 weight/templates/import_csv_form.html:9
+#: core/views/misc.py:203 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Zaslat"
-#: core/views/misc.py:226
+#: core/views/misc.py:211
msgid "Your feedback was successfully sent. Thank you!"
msgstr "Vaše zpětná vazba byla zaslána. Děkujeme."
@@ -1786,7 +1687,6 @@ msgstr "jméno cviku"
#: exercises/templates/exercise/overview.html:118
#: exercises/templates/muscles/overview.html:114
#: nutrition/templates/ingredient/overview.html:85
-#: software/templates/contribute.html:39
msgid "Only registered users can do this"
msgstr "Tohle je jen pro registrované uživatele"
@@ -1998,7 +1898,7 @@ msgstr ""
"%(name_original)sje příliš podobné již existujícímu cvičení "
"\"%(exercise_name)s\""
-#: exercises/views/exercises.py:246 software/templates/contribute.html:37
+#: exercises/views/exercises.py:246
msgid "Add exercise"
msgstr "Přidat cvik"
@@ -3757,108 +3657,55 @@ msgstr "Přidat novou jednotku váhy"
msgid "Edit a weight unit to ingredient connection"
msgstr "Upravit jednotku hmotnosti spojenou se složkou"
-#: software/templates/contribute.html:9
+#: software/templates/about_us.html:9
msgid ""
-"wger Workout Manager is build by volunteers,\n"
-"the development process is open and freely accessible to anybody "
-"interested.\n"
-"If you are new to the free software world, we recommend to take a\n"
-"look <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
-"article</a> which summarizes they way open source projects work very well. "
+"Thank you for using wger! wger is a collaborative open source project, made "
+"by fitness enthusiasts from around the world."
msgstr ""
-"wger Správce tréninku je postaven na dobrovolnících, kdy\n"
-"vývojový proces je otevřený a volně přístupný komukoliv, kdo má zájem.\n"
-"Pokud jste ve světě svobodného software nový, doporučujeme si nejprve "
-"přečíst <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">tento\n"
-"článek</a>, který shrnuje, že principy open source projektů fungují velmi "
-"dobře. "
-
-#: software/templates/contribute.html:16
-msgid ""
-"Any kind of contribution is appreciated and welcome.\n"
-"Use this opportunity and influence the direction of the\n"
-"project. "
-msgstr ""
-"Jakýkoliv druh příspěvku uvítáme a jsme za něj rádi.\n"
-"Využijte možnost ovlivnit další směr tohoto projektu."
-#: software/templates/contribute.html:23
-msgid "Use the site"
-msgstr "Použít stránku"
+#: software/templates/about_us.html:18
+msgid "Source code"
+msgstr ""
-#: software/templates/contribute.html:24
-msgid ""
-"Simply use the site and tell your friends\n"
-"how useful it is! ;) . When you find something that you specially liked,\n"
-"could need some improvements or just doesn't work, tell us! This might not "
-"sound\n"
-"like much, but is incredibly important!"
+#: software/templates/about_us.html:20
+msgid "Get the source code of this application and its server on github"
msgstr ""
-"Jednoduše používejte tuto stránku a řekněte svým přátelům,\n"
-"jak užitečné jsou! ;-) Když zjistíte, že byste tu něco rád uvítal, nebo \n"
-"vás napadne nějaké vylepšení, řekněte nám to! Nezní to jako moc, ale pro nás "
-"je to důležité!"
-#: software/templates/contribute.html:31
-msgid "Submit exercises"
-msgstr "Odeslat cvikya"
+#: software/templates/about_us.html:25
+msgid "Have a problem or idea?"
+msgstr ""
-#: software/templates/contribute.html:32
+#: software/templates/about_us.html:27
msgid ""
-"Submit those cool exercises that you absolutely\n"
-"love and do every week but are not in the list yet. If you think some "
-"description\n"
-"is too short or some other detail is missing or could be improved, tell!"
+"Get in touch if something didn't behave as expected or if there is a feature "
+"that you feel is missing."
msgstr ""
-"Vložte do databáze své úžasné cviky, které milujete \n"
-"a provádíte je každý týden ale nejsou doposud v našem seznamu. \n"
-"Pokud si myslíte, že nějaký popis je příliš stručný, nebo chybí jiný detail "
-"a šlo by jej i zlepšit, řekněte nám to."
-#: software/templates/contribute.html:44
-#, fuzzy
-#| msgid ""
-#| "Do you want to use wger in your own language?\n"
-#| "Do you think the current translation could be improved?\n"
-#| "The translations are easily managed and edited online, if you are "
-#| "interested,\n"
-#| "go to the transifex site, request access and we will set everything\n"
-#| "up. "
-msgid ""
-"Do you want to use wger in your own language?\n"
-"Do you think the current translation could be improved?\n"
-"The translations are easily managed and edited online, if you are "
-"interested,\n"
-"visit the link and start translating."
+#: software/templates/about_us.html:32
+msgid "Say hi!"
+msgstr ""
+
+#: software/templates/about_us.html:34
+msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
-"Chcete používat wger v rodném jazyce?\n"
-"Myslíte si, že aktuální překlad by se měl zlepšit?\n"
-"Překlady jdou snadno spravovat a upravovat online, pokud máte zájem,\n"
-"jděte na stránku transifex a požádejte o přístup a my vám jej nastavíme."
-#: software/templates/contribute.html:53
-msgid "Code"
-msgstr "Kód"
+#: software/templates/about_us.html:39
+#, fuzzy
+#| msgid "Translate"
+msgid "Translation"
+msgstr "Překlad"
-#: software/templates/contribute.html:54
+#: software/templates/about_us.html:41
msgid ""
-"Obviously, you are highly encouraged to clone the\n"
-"repo and start hacking! Once you are ready, send a pull request and we\n"
-"will show the world. Take a look at the developer guide for more details\n"
-"on this."
+"This application is translated on weblate. If you also want to help, click "
+"the link and start translating"
msgstr ""
-"Je žádoucí si vytvořit klon repositáře a začít zkoumat kód! \n"
-"Jakmile budete připraveni odeslat pull, udělejte to a ukažte jej světu.\n"
-"Podívejte se do příručky pro vývojáře, pokud chcete o tom vědět\n"
-"více informací."
-#: software/templates/contribute.html:66
+#: software/templates/about_us.html:50
msgid "Our goal"
msgstr "Váš cíl"
-#: software/templates/contribute.html:69
+#: software/templates/about_us.html:53
msgid ""
"The goal is to build an awesome\n"
"and flexible fitness manager, along with a comprehensive and complete list "
@@ -4023,105 +3870,6 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr "100%% Zdarma <br>a<br>Open Source"
-#: software/templates/issues.html:6
-msgid "Reporting a problem"
-msgstr "Ohlásit problém"
-
-#: software/templates/issues.html:10
-msgid ""
-"\n"
-"No software is perfect. For some severe errors, an email will be "
-"automatically sent, but\n"
-"not always, so I depend on you reporting everything that didn't behave as "
-"expected.\n"
-"Please describe in as much detail as you can what you were doing when the "
-"error\n"
-"happened.\n"
-msgstr ""
-"\n"
-"Žádný program není perfektní. O některých závažných chybách jsme automaticky "
-"informováni\n"
-"ale ne vždy. Proto jsme závislý na vašich oznámení, že ne vše se chová tak, "
-"jak by se očekávalo.\n"
-"Popiště prosím vždy podrobně, co jste dělali, když se chyba objevila.\n"
-
-#: software/templates/issues.html:21
-msgid "report problem to the issue tracker"
-msgstr "nahlaste problém do sledovače incidentů"
-
-#: software/templates/issues.html:25
-msgid "Enhancements"
-msgstr "Vylepšení"
-
-#: software/templates/issues.html:27
-msgid ""
-"\n"
-"The issue tracker can also be used to document enhancements to the "
-"software.\n"
-"If you have some suggestions or think a feature is missing, feel\n"
-"free to open a ticket. This can be anything from a slight change to a whole\n"
-"new section of the site. Please keep in mind that not all wishes can be\n"
-"implemented."
-msgstr ""
-"\n"
-"Sledovač incidentů může být použit také k zaslání návrhů na vylepšení "
-"programu. \n"
-"Pokud máte nějaké návrh na novou funkci a myslíte si, že zde chybí, můžete "
-"otevřít \n"
-"nový Ticket. Může to být cokoliv, od jednoduché změny až po komplexní "
-"změnu \n"
-"části webu. Pamatujte prosím, že ne všechny přání mohou být realizována."
-
-#: software/templates/issues.html:36
-msgid "report wish to the issue tracker"
-msgstr "zašlete poznatek do Sledovače incidentů"
-
-#: software/templates/issues.html:41
-msgid "No Github account?"
-msgstr "Nemáte Github účet?"
-
-#: software/templates/issues.html:42
-msgid ""
-"Filing an issue requires a github account, if you don't\n"
-"have one and don't want to register, you can also send it to\n"
-"<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
-msgstr ""
-"Uzpornění na problém vyžaduje mít GitHub účet. Pokud jej nemáte\n"
-"můžete se registrovat, nebo můžete také zaslat problém na\n"
-"<a href=\"https://groups.google.com/group/wger\">mailovou konverzaci</a>."
-
-#: software/templates/license.html:10
-msgid ""
-"wger Workout Manager is Free/Libre Open Source\n"
-"Software (FLOSS)."
-msgstr ""
-"wger Správce tréninku je Free/Libre Open Source\n"
-"Software (FLOSS)"
-
-#: software/templates/license.html:22
-msgid ""
-"wger Workout Manager is released under the <strong>Affero GNU\n"
-"General Public License (AGPL) Version 3+</strong> and can (under the "
-"conditions\n"
-"of the license) be used, modified and distributed (also with modifications)\n"
-"without restrictions."
-msgstr ""
-"wger Správce tréninku je uvolněn pod licencí <strong>Affero GNU\n"
-"General Public License (AGPL) Verze 3+</strong> a může být (za podmínek \n"
-"určené licencí) být používán, modifikován a distribuován (také s úpravami)\n"
-"bez omezení."
-
-#: software/templates/license.html:29
-msgid ""
-"A copy the license text is contained in every wger Workout\n"
-"Manager release (LICENSE.txt) and can be read online on the website of\n"
-"<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</a>."
-msgstr ""
-"Kopie textu licence je obsažena v každém wger Workout\n"
-"Manager (LICENSE.txt) a lze si jí i přečíst on-line na internetových "
-"stránkách\n"
-"<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'> projektu GNU </a>."
-
#: utils/generic_views.py:261
msgid "Yes, delete"
msgstr "Ano, smazat"
@@ -4312,6 +4060,270 @@ msgstr "Úspěšně smazáno."
msgid "Delete weight entry for the %s"
msgstr "Vymazat záznam váhy pro %s"
+#~ msgid "Responsible for the content of this site as per German law §5 TMG:"
+#~ msgstr ""
+#~ "Zodpovědnou osobou za obsah na stránce je dle Německého práva §5 TMG:"
+
+#~ msgid "GNUPG-Key:"
+#~ msgstr "Klíč GNUPG:"
+
+#~ msgid "Get in touch"
+#~ msgstr "Zkontaktujte nás"
+
+#~ msgid ""
+#~ "Thank you for your interest. Feel free to use any of the\n"
+#~ "ways below to send feedback you have about any aspect of the site. For\n"
+#~ "support, say hi\n"
+#~ "<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
+#~ "a bug, consider doing it through the <a href=\"%(issues)s\">issue "
+#~ "tracker</a>\n"
+#~ "."
+#~ msgstr ""
+#~ "Děkujeme za tvůj zájem. Neváhej využít několik z cest, jakými nám můžeš "
+#~ "poslat feedback o jakékoliv části této stránky. \n"
+#~ "<a href=\"%(discord)s\">Můžeš nás pozdravit na Discordu</a>, hlášení chyb "
+#~ "je nejlepší udělat přes <a href=\"%(issues)s\">issue tracker.</a>"
+
+#~ msgid ""
+#~ "If you want to further help and improve this project,\n"
+#~ "you might also be interested <a href=\"%(contribute)s\">in contributing</"
+#~ "a>."
+#~ msgstr ""
+#~ "Chceteli pomoct ve zlepšování tohoto projektu,\n"
+#~ "možná by jste mohli mít zájem <a href=\"%(contribute)s\">přispět</a>."
+
+#~ msgid "Feedback form"
+#~ msgstr "Zpětná vazba"
+
+#~ msgid ""
+#~ "A simple contact form. Remember that\n"
+#~ "if you want an answer, you need to include some way to contact you."
+#~ msgstr ""
+#~ "Kontaktní formulář. Nezapomeňte\n"
+#~ "pokud chcete, abychom vám zaslai odpověď, musíte na sebe uvést kontakt."
+
+#~ msgid "Twitter"
+#~ msgstr "Twitter"
+
+#~ msgid ""
+#~ "We are also on twitter. Write us and tell us what\n"
+#~ "you think! Except patches, don't send patches via twitter."
+#~ msgstr ""
+#~ "Jsme také na twitteru. Napište nám, svůj názor\n"
+#~ "na tento produk! Kromě opravy. Opravu neposílejte přes twitter."
+
+#~ msgid "Discord"
+#~ msgstr "Discord"
+
+#~ msgid ""
+#~ "Use the public group to get support for your\n"
+#~ "local wger installation, discuss issues or your new idea, etc.\n"
+#~ "(no registration needed)"
+#~ msgstr ""
+#~ "Pomocí veřejné skupiny získáte podporu pro vaši\n"
+#~ "lokální intalaci wger. Můžete diskutovat o nápadech, \n"
+#~ "problémech a podobně. (Registrace není nutná)"
+
+#~ msgid "Open feedback form"
+#~ msgstr "Otevřít formulář zpětné vazby"
+
+#~ msgid "tweet to @wger_project"
+#~ msgstr "tweetnout @wger_project"
+
+#~ msgid "Go to the discord server"
+#~ msgstr "Jít na Discord server"
+
+#~ msgid "Contribute!"
+#~ msgstr "Přispějte!"
+
+#~ msgid "Problems and wishes"
+#~ msgstr "Přání a stížnosti"
+
+#~ msgid "About"
+#~ msgstr "O nás"
+
+#~ msgid ""
+#~ "wger Workout Manager is build by volunteers,\n"
+#~ "the development process is open and freely accessible to anybody "
+#~ "interested.\n"
+#~ "If you are new to the free software world, we recommend to take a\n"
+#~ "look <a href=\"http://schlitt.info/opensource/"
+#~ "blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
+#~ "article</a> which summarizes they way open source projects work very "
+#~ "well. "
+#~ msgstr ""
+#~ "wger Správce tréninku je postaven na dobrovolnících, kdy\n"
+#~ "vývojový proces je otevřený a volně přístupný komukoliv, kdo má zájem.\n"
+#~ "Pokud jste ve světě svobodného software nový, doporučujeme si nejprve "
+#~ "přečíst <a href=\"http://schlitt.info/opensource/"
+#~ "blog/0541_10_golden_rules_for_starting_with_open_source.html\">tento\n"
+#~ "článek</a>, který shrnuje, že principy open source projektů fungují velmi "
+#~ "dobře. "
+
+#~ msgid ""
+#~ "Any kind of contribution is appreciated and welcome.\n"
+#~ "Use this opportunity and influence the direction of the\n"
+#~ "project. "
+#~ msgstr ""
+#~ "Jakýkoliv druh příspěvku uvítáme a jsme za něj rádi.\n"
+#~ "Využijte možnost ovlivnit další směr tohoto projektu."
+
+#~ msgid "Use the site"
+#~ msgstr "Použít stránku"
+
+#~ msgid ""
+#~ "Simply use the site and tell your friends\n"
+#~ "how useful it is! ;) . When you find something that you specially liked,\n"
+#~ "could need some improvements or just doesn't work, tell us! This might "
+#~ "not sound\n"
+#~ "like much, but is incredibly important!"
+#~ msgstr ""
+#~ "Jednoduše používejte tuto stránku a řekněte svým přátelům,\n"
+#~ "jak užitečné jsou! ;-) Když zjistíte, že byste tu něco rád uvítal, nebo \n"
+#~ "vás napadne nějaké vylepšení, řekněte nám to! Nezní to jako moc, ale pro "
+#~ "nás je to důležité!"
+
+#~ msgid "Submit exercises"
+#~ msgstr "Odeslat cvikya"
+
+#~ msgid ""
+#~ "Submit those cool exercises that you absolutely\n"
+#~ "love and do every week but are not in the list yet. If you think some "
+#~ "description\n"
+#~ "is too short or some other detail is missing or could be improved, tell!"
+#~ msgstr ""
+#~ "Vložte do databáze své úžasné cviky, které milujete \n"
+#~ "a provádíte je každý týden ale nejsou doposud v našem seznamu. \n"
+#~ "Pokud si myslíte, že nějaký popis je příliš stručný, nebo chybí jiný "
+#~ "detail a šlo by jej i zlepšit, řekněte nám to."
+
+#, fuzzy
+#~| msgid ""
+#~| "Do you want to use wger in your own language?\n"
+#~| "Do you think the current translation could be improved?\n"
+#~| "The translations are easily managed and edited online, if you are "
+#~| "interested,\n"
+#~| "go to the transifex site, request access and we will set everything\n"
+#~| "up. "
+#~ msgid ""
+#~ "Do you want to use wger in your own language?\n"
+#~ "Do you think the current translation could be improved?\n"
+#~ "The translations are easily managed and edited online, if you are "
+#~ "interested,\n"
+#~ "visit the link and start translating."
+#~ msgstr ""
+#~ "Chcete používat wger v rodném jazyce?\n"
+#~ "Myslíte si, že aktuální překlad by se měl zlepšit?\n"
+#~ "Překlady jdou snadno spravovat a upravovat online, pokud máte zájem,\n"
+#~ "jděte na stránku transifex a požádejte o přístup a my vám jej nastavíme."
+
+#~ msgid "Code"
+#~ msgstr "Kód"
+
+#~ msgid ""
+#~ "Obviously, you are highly encouraged to clone the\n"
+#~ "repo and start hacking! Once you are ready, send a pull request and we\n"
+#~ "will show the world. Take a look at the developer guide for more details\n"
+#~ "on this."
+#~ msgstr ""
+#~ "Je žádoucí si vytvořit klon repositáře a začít zkoumat kód! \n"
+#~ "Jakmile budete připraveni odeslat pull, udělejte to a ukažte jej světu.\n"
+#~ "Podívejte se do příručky pro vývojáře, pokud chcete o tom vědět\n"
+#~ "více informací."
+
+#~ msgid "Reporting a problem"
+#~ msgstr "Ohlásit problém"
+
+#~ msgid ""
+#~ "\n"
+#~ "No software is perfect. For some severe errors, an email will be "
+#~ "automatically sent, but\n"
+#~ "not always, so I depend on you reporting everything that didn't behave as "
+#~ "expected.\n"
+#~ "Please describe in as much detail as you can what you were doing when the "
+#~ "error\n"
+#~ "happened.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Žádný program není perfektní. O některých závažných chybách jsme "
+#~ "automaticky informováni\n"
+#~ "ale ne vždy. Proto jsme závislý na vašich oznámení, že ne vše se chová "
+#~ "tak, jak by se očekávalo.\n"
+#~ "Popiště prosím vždy podrobně, co jste dělali, když se chyba objevila.\n"
+
+#~ msgid "report problem to the issue tracker"
+#~ msgstr "nahlaste problém do sledovače incidentů"
+
+#~ msgid "Enhancements"
+#~ msgstr "Vylepšení"
+
+#~ msgid ""
+#~ "\n"
+#~ "The issue tracker can also be used to document enhancements to the "
+#~ "software.\n"
+#~ "If you have some suggestions or think a feature is missing, feel\n"
+#~ "free to open a ticket. This can be anything from a slight change to a "
+#~ "whole\n"
+#~ "new section of the site. Please keep in mind that not all wishes can be\n"
+#~ "implemented."
+#~ msgstr ""
+#~ "\n"
+#~ "Sledovač incidentů může být použit také k zaslání návrhů na vylepšení "
+#~ "programu. \n"
+#~ "Pokud máte nějaké návrh na novou funkci a myslíte si, že zde chybí, "
+#~ "můžete otevřít \n"
+#~ "nový Ticket. Může to být cokoliv, od jednoduché změny až po komplexní "
+#~ "změnu \n"
+#~ "části webu. Pamatujte prosím, že ne všechny přání mohou být realizována."
+
+#~ msgid "report wish to the issue tracker"
+#~ msgstr "zašlete poznatek do Sledovače incidentů"
+
+#~ msgid "No Github account?"
+#~ msgstr "Nemáte Github účet?"
+
+#~ msgid ""
+#~ "Filing an issue requires a github account, if you don't\n"
+#~ "have one and don't want to register, you can also send it to\n"
+#~ "<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
+#~ msgstr ""
+#~ "Uzpornění na problém vyžaduje mít GitHub účet. Pokud jej nemáte\n"
+#~ "můžete se registrovat, nebo můžete také zaslat problém na\n"
+#~ "<a href=\"https://groups.google.com/group/wger\">mailovou konverzaci</a>."
+
+#~ msgid ""
+#~ "wger Workout Manager is Free/Libre Open Source\n"
+#~ "Software (FLOSS)."
+#~ msgstr ""
+#~ "wger Správce tréninku je Free/Libre Open Source\n"
+#~ "Software (FLOSS)"
+
+#~ msgid ""
+#~ "wger Workout Manager is released under the <strong>Affero GNU\n"
+#~ "General Public License (AGPL) Version 3+</strong> and can (under the "
+#~ "conditions\n"
+#~ "of the license) be used, modified and distributed (also with "
+#~ "modifications)\n"
+#~ "without restrictions."
+#~ msgstr ""
+#~ "wger Správce tréninku je uvolněn pod licencí <strong>Affero GNU\n"
+#~ "General Public License (AGPL) Verze 3+</strong> a může být (za podmínek \n"
+#~ "určené licencí) být používán, modifikován a distribuován (také s "
+#~ "úpravami)\n"
+#~ "bez omezení."
+
+#~ msgid ""
+#~ "A copy the license text is contained in every wger Workout\n"
+#~ "Manager release (LICENSE.txt) and can be read online on the website of\n"
+#~ "<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</"
+#~ "a>."
+#~ msgstr ""
+#~ "Kopie textu licence je obsažena v každém wger Workout\n"
+#~ "Manager (LICENSE.txt) a lze si jí i přečíst on-line na internetových "
+#~ "stránkách\n"
+#~ "<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'> projektu GNU </"
+#~ "a>."
+
#~ msgid "Use pauses in workout timer"
#~ msgstr "Použít pauzy v čase tréninku"
diff --git a/wger/locale/da/LC_MESSAGES/django.po b/wger/locale/da/LC_MESSAGES/django.po
index 14a9dd246..80cfe2546 100644
--- a/wger/locale/da/LC_MESSAGES/django.po
+++ b/wger/locale/da/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-17 15:00+0200\n"
+"POT-Creation-Date: 2021-08-17 17:23+0200\n"
"PO-Revision-Date: 2021-04-11 18:54+0000\n"
"Last-Translator: rge <[email protected]>\n"
"Language-Team: Danish (http://www.transifex.com/rge/wger-workout-manager/"
@@ -43,7 +43,7 @@ msgstr "Øvelser"
msgid "Ingredients"
msgstr "Ingredienser"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:225
+#: config/templates/language/overview.html:4 core/templates/navigation.html:228
msgid "Languages"
msgstr "Sprog"
@@ -219,8 +219,8 @@ msgstr "Min seje trænings-plan"
msgid "Empty placeholder schedule"
msgstr "Tom plan"
-#: core/forms.py:61 core/templates/navigation.html:187
-#: core/templates/navigation.html:191 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:190
+#: core/templates/navigation.html:194 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr ""
@@ -297,8 +297,8 @@ msgstr "Ukorrekt kodeord"
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:187
-#: core/templates/navigation.html:192 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
+#: core/templates/navigation.html:195 core/templates/template.html:150
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -768,84 +768,10 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4
-msgid "About us"
-msgstr ""
-
-#: core/templates/misc/about.html:8
-msgid "Responsible for the content of this site as per German law §5 TMG:"
-msgstr ""
-
-#: core/templates/misc/about.html:16
-msgid "GNUPG-Key:"
-msgstr ""
-
-#: core/templates/misc/contact.html:4 core/templates/navigation.html:153
-#: core/templates/template_features.html:86
-#: software/templates/contribute.html:28
-msgid "Get in touch"
-msgstr ""
-
-#: core/templates/misc/contact.html:10
-#, python-format
-msgid ""
-"Thank you for your interest. Feel free to use any of the\n"
-"ways below to send feedback you have about any aspect of the site. For\n"
-"support, say hi\n"
-"<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
-"a bug, consider doing it through the <a href=\"%(issues)s\">issue tracker</"
-"a>\n"
-"."
-msgstr ""
-
-#: core/templates/misc/contact.html:20
-#, python-format
-msgid ""
-"If you want to further help and improve this project,\n"
-"you might also be interested <a href=\"%(contribute)s\">in contributing</a>."
-msgstr ""
-
-#: core/templates/misc/contact.html:29
-msgid "Feedback form"
-msgstr ""
-
-#: core/templates/misc/contact.html:30
-msgid ""
-"A simple contact form. Remember that\n"
-"if you want an answer, you need to include some way to contact you."
-msgstr ""
-
-#: core/templates/misc/contact.html:35
-msgid "Twitter"
-msgstr ""
-
-#: core/templates/misc/contact.html:36
-msgid ""
-"We are also on twitter. Write us and tell us what\n"
-"you think! Except patches, don't send patches via twitter."
-msgstr ""
-
-#: core/templates/misc/contact.html:42
-msgid "Discord"
-msgstr ""
-
-#: core/templates/misc/contact.html:43
-msgid ""
-"Use the public group to get support for your\n"
-"local wger installation, discuss issues or your new idea, etc.\n"
-"(no registration needed)"
-msgstr ""
-
-#: core/templates/misc/contact.html:49
-msgid "Open feedback form"
-msgstr ""
-
-#: core/templates/misc/contact.html:53
-msgid "tweet to @wger_project"
-msgstr ""
-
-#: core/templates/misc/contact.html:56
-msgid "Go to the discord server"
+#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/template_features.html:118
+#: core/templates/template_no_context.html:88
+msgid "Imprint"
msgstr ""
#: core/templates/misc/fragments/shariff_modal.html:6
@@ -931,7 +857,7 @@ msgid "Add new exercise"
msgstr ""
#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:223
+#: core/templates/navigation.html:226
msgid "Administration"
msgstr ""
@@ -998,68 +924,62 @@ msgid "About this software"
msgstr ""
#: core/templates/navigation.html:151 core/templates/template_features.html:83
-#: software/templates/contribute.html:6
-msgid "Contribute!"
-msgstr ""
-
-#: core/templates/navigation.html:152
-msgid "Problems and wishes"
+#: software/templates/about_us.html:5
+msgid "About us"
msgstr ""
-#: core/templates/navigation.html:155 software/templates/features.html:209
+#: core/templates/navigation.html:153 software/templates/features.html:209
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:156 software/templates/license.html:7
-#: utils/models.py:40
+#: core/templates/navigation.html:157 utils/models.py:40
msgid "License"
msgstr ""
-#: core/templates/navigation.html:160
+#: core/templates/navigation.html:163
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:166 software/templates/contribute.html:59
+#: core/templates/navigation.html:169
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:172 core/templates/template.html:193
-#: core/templates/template_features.html:103
-#: software/templates/contribute.html:43 software/templates/contribute.html:50
+#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/template_features.html:100
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:193 core/templates/user/login.html:28
+#: core/templates/navigation.html:196 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:206
+#: core/templates/navigation.html:209
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:213
+#: core/templates/navigation.html:216
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:228
+#: core/templates/navigation.html:231
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:234
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:234 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:237 core/templates/user/list.html:4
+#: core/templates/navigation.html:240 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:238
+#: core/templates/navigation.html:241
msgid "Gyms"
msgstr ""
@@ -1173,18 +1093,12 @@ msgstr ""
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:201 core/templates/template_features.html:121
-#: core/templates/template_no_context.html:88
-msgid "About"
-msgstr ""
-
-#: core/templates/template.html:202 core/templates/template_features.html:125
+#: core/templates/template.html:202 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
#: core/templates/template.html:209 core/templates/template.html:210
-#: software/templates/license.html:18 software/templates/license.html:19
msgid "Released under the Affero GPL"
msgstr ""
@@ -1532,15 +1446,15 @@ msgstr ""
msgid "Rest day"
msgstr ""
-#: core/views/misc.py:199
+#: core/views/misc.py:184
msgid "Feedback"
msgstr ""
-#: core/views/misc.py:218 weight/templates/import_csv_form.html:9
+#: core/views/misc.py:203 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr ""
-#: core/views/misc.py:226
+#: core/views/misc.py:211
msgid "Your feedback was successfully sent. Thank you!"
msgstr ""
@@ -1709,7 +1623,6 @@ msgstr ""
#: exercises/templates/exercise/overview.html:118
#: exercises/templates/muscles/overview.html:114
#: nutrition/templates/ingredient/overview.html:85
-#: software/templates/contribute.html:39
msgid "Only registered users can do this"
msgstr ""
@@ -1903,7 +1816,7 @@ msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246 software/templates/contribute.html:37
+#: exercises/views/exercises.py:246
msgid "Add exercise"
msgstr ""
@@ -3531,75 +3444,53 @@ msgstr ""
msgid "Edit a weight unit to ingredient connection"
msgstr ""
-#: software/templates/contribute.html:9
+#: software/templates/about_us.html:9
msgid ""
-"wger Workout Manager is build by volunteers,\n"
-"the development process is open and freely accessible to anybody "
-"interested.\n"
-"If you are new to the free software world, we recommend to take a\n"
-"look <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
-"article</a> which summarizes they way open source projects work very well. "
+"Thank you for using wger! wger is a collaborative open source project, made "
+"by fitness enthusiasts from around the world."
msgstr ""
-#: software/templates/contribute.html:16
-msgid ""
-"Any kind of contribution is appreciated and welcome.\n"
-"Use this opportunity and influence the direction of the\n"
-"project. "
+#: software/templates/about_us.html:18
+msgid "Source code"
msgstr ""
-#: software/templates/contribute.html:23
-msgid "Use the site"
+#: software/templates/about_us.html:20
+msgid "Get the source code of this application and its server on github"
msgstr ""
-#: software/templates/contribute.html:24
-msgid ""
-"Simply use the site and tell your friends\n"
-"how useful it is! ;) . When you find something that you specially liked,\n"
-"could need some improvements or just doesn't work, tell us! This might not "
-"sound\n"
-"like much, but is incredibly important!"
+#: software/templates/about_us.html:25
+msgid "Have a problem or idea?"
msgstr ""
-#: software/templates/contribute.html:31
-msgid "Submit exercises"
+#: software/templates/about_us.html:27
+msgid ""
+"Get in touch if something didn't behave as expected or if there is a feature "
+"that you feel is missing."
msgstr ""
-#: software/templates/contribute.html:32
-msgid ""
-"Submit those cool exercises that you absolutely\n"
-"love and do every week but are not in the list yet. If you think some "
-"description\n"
-"is too short or some other detail is missing or could be improved, tell!"
+#: software/templates/about_us.html:32
+msgid "Say hi!"
msgstr ""
-#: software/templates/contribute.html:44
-msgid ""
-"Do you want to use wger in your own language?\n"
-"Do you think the current translation could be improved?\n"
-"The translations are easily managed and edited online, if you are "
-"interested,\n"
-"visit the link and start translating."
+#: software/templates/about_us.html:34
+msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
-#: software/templates/contribute.html:53
-msgid "Code"
+#: software/templates/about_us.html:39
+msgid "Translation"
msgstr ""
-#: software/templates/contribute.html:54
+#: software/templates/about_us.html:41
msgid ""
-"Obviously, you are highly encouraged to clone the\n"
-"repo and start hacking! Once you are ready, send a pull request and we\n"
-"will show the world. Take a look at the developer guide for more details\n"
-"on this."
+"This application is translated on weblate. If you also want to help, click "
+"the link and start translating"
msgstr ""
-#: software/templates/contribute.html:66
+#: software/templates/about_us.html:50
msgid "Our goal"
msgstr ""
-#: software/templates/contribute.html:69
+#: software/templates/about_us.html:53
msgid ""
"The goal is to build an awesome\n"
"and flexible fitness manager, along with a comprehensive and complete list "
@@ -3734,78 +3625,6 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr ""
-#: software/templates/issues.html:6
-msgid "Reporting a problem"
-msgstr ""
-
-#: software/templates/issues.html:10
-msgid ""
-"\n"
-"No software is perfect. For some severe errors, an email will be "
-"automatically sent, but\n"
-"not always, so I depend on you reporting everything that didn't behave as "
-"expected.\n"
-"Please describe in as much detail as you can what you were doing when the "
-"error\n"
-"happened.\n"
-msgstr ""
-
-#: software/templates/issues.html:21
-msgid "report problem to the issue tracker"
-msgstr ""
-
-#: software/templates/issues.html:25
-msgid "Enhancements"
-msgstr ""
-
-#: software/templates/issues.html:27
-msgid ""
-"\n"
-"The issue tracker can also be used to document enhancements to the "
-"software.\n"
-"If you have some suggestions or think a feature is missing, feel\n"
-"free to open a ticket. This can be anything from a slight change to a whole\n"
-"new section of the site. Please keep in mind that not all wishes can be\n"
-"implemented."
-msgstr ""
-
-#: software/templates/issues.html:36
-msgid "report wish to the issue tracker"
-msgstr ""
-
-#: software/templates/issues.html:41
-msgid "No Github account?"
-msgstr ""
-
-#: software/templates/issues.html:42
-msgid ""
-"Filing an issue requires a github account, if you don't\n"
-"have one and don't want to register, you can also send it to\n"
-"<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
-msgstr ""
-
-#: software/templates/license.html:10
-msgid ""
-"wger Workout Manager is Free/Libre Open Source\n"
-"Software (FLOSS)."
-msgstr ""
-
-#: software/templates/license.html:22
-msgid ""
-"wger Workout Manager is released under the <strong>Affero GNU\n"
-"General Public License (AGPL) Version 3+</strong> and can (under the "
-"conditions\n"
-"of the license) be used, modified and distributed (also with modifications)\n"
-"without restrictions."
-msgstr ""
-
-#: software/templates/license.html:29
-msgid ""
-"A copy the license text is contained in every wger Workout\n"
-"Manager release (LICENSE.txt) and can be read online on the website of\n"
-"<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</a>."
-msgstr ""
-
#: utils/generic_views.py:261
msgid "Yes, delete"
msgstr ""
diff --git a/wger/locale/de/LC_MESSAGES/django.po b/wger/locale/de/LC_MESSAGES/django.po
index 509d9dacf..e73aa8741 100644
--- a/wger/locale/de/LC_MESSAGES/django.po
+++ b/wger/locale/de/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-17 15:00+0200\n"
+"POT-Creation-Date: 2021-08-17 17:23+0200\n"
"PO-Revision-Date: 2021-05-11 09:34+0000\n"
"Last-Translator: J. Lavoie <[email protected]>\n"
"Language-Team: German <https://hosted.weblate.org/projects/wger/web/de/>\n"
@@ -45,7 +45,7 @@ msgstr "Übungen"
msgid "Ingredients"
msgstr "Zutaten"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:225
+#: config/templates/language/overview.html:4 core/templates/navigation.html:228
msgid "Languages"
msgstr "Sprachen"
@@ -222,8 +222,8 @@ msgstr "Mein cooler Zeitplan"
msgid "Empty placeholder schedule"
msgstr "Leerer Platzhalter Zeitplan"
-#: core/forms.py:61 core/templates/navigation.html:187
-#: core/templates/navigation.html:191 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:190
+#: core/templates/navigation.html:194 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Anmelden"
@@ -300,8 +300,8 @@ msgstr "Ungültiges Passwort"
msgid "The form is secured with reCAPTCHA"
msgstr "Das Formular ist mit reCaptcha gesichert"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:187
-#: core/templates/navigation.html:192 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
+#: core/templates/navigation.html:195 core/templates/template.html:150
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -802,99 +802,11 @@ msgstr "Lizenzliste"
msgid "Nothing found"
msgstr "Nichts gefunden"
-#: core/templates/misc/about.html:4
-msgid "About us"
-msgstr "Über uns"
-
-#: core/templates/misc/about.html:8
-msgid "Responsible for the content of this site as per German law §5 TMG:"
-msgstr "Angaben gemäß §5 TMG:"
-
-#: core/templates/misc/about.html:16
-msgid "GNUPG-Key:"
-msgstr "GNUPG-Schlüssel:"
-
-#: core/templates/misc/contact.html:4 core/templates/navigation.html:153
-#: core/templates/template_features.html:86
-#: software/templates/contribute.html:28
-msgid "Get in touch"
-msgstr "Melde dich"
-
-#: core/templates/misc/contact.html:10
-#, python-format
-msgid ""
-"Thank you for your interest. Feel free to use any of the\n"
-"ways below to send feedback you have about any aspect of the site. For\n"
-"support, say hi\n"
-"<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
-"a bug, consider doing it through the <a href=\"%(issues)s\">issue tracker</"
-"a>\n"
-"."
-msgstr ""
-"Danke für dein Interesse. Du kannst gerne eine der folgenden Möglichkeiten "
-"benutzen um Feedback zu geben. Um Hilfe zu bekommen, sag hallo <a href="
-"\"%(discord)s\">auf dem Discord-Server</a>, um einen Fehler zu berichten, "
-"öffne ein Ticket im <a href=\"%(issues)s\">Issue-Tracker</a>."
-
-#: core/templates/misc/contact.html:20
-#, python-format
-msgid ""
-"If you want to further help and improve this project,\n"
-"you might also be interested <a href=\"%(contribute)s\">in contributing</a>."
-msgstr ""
-"Wenn du weiter helfen und dieses Projekt verbessern willst, \n"
-"hast du vielleicht interesse am <a href=\"%(contribute)s\">Mitmachen</a>."
-
-#: core/templates/misc/contact.html:29
-msgid "Feedback form"
-msgstr "Feedbackformular"
-
-#: core/templates/misc/contact.html:30
-msgid ""
-"A simple contact form. Remember that\n"
-"if you want an answer, you need to include some way to contact you."
-msgstr ""
-"Ein einfaches Feedbackformular. Beachte bitte, dass wenn du eine Antwort "
-"willst\n"
-"auch eine Kontaktmöglichkeit angeben musst."
-
-#: core/templates/misc/contact.html:35
-msgid "Twitter"
-msgstr "Twitter"
-
-#: core/templates/misc/contact.html:36
-msgid ""
-"We are also on twitter. Write us and tell us what\n"
-"you think! Except patches, don't send patches via twitter."
-msgstr ""
-"Wir sind auch auf twitter. Schreibe uns und erzähle uns was du denkst!\n"
-"Außer Patches. Schicke keine Patches über Twitter."
-
-#: core/templates/misc/contact.html:42
-msgid "Discord"
-msgstr "Discord"
-
-#: core/templates/misc/contact.html:43
-msgid ""
-"Use the public group to get support for your\n"
-"local wger installation, discuss issues or your new idea, etc.\n"
-"(no registration needed)"
+#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/template_features.html:118
+#: core/templates/template_no_context.html:88
+msgid "Imprint"
msgstr ""
-"Benutze die öffentliche Gruppe um Support für deine lokale\n"
-"Installation zu erhalten, über Probleme oder Ideen zu diskutieren, etc.\n"
-"(keine Anmeldung nötig)"
-
-#: core/templates/misc/contact.html:49
-msgid "Open feedback form"
-msgstr "Rückmeldungsformular öffnen"
-
-#: core/templates/misc/contact.html:53
-msgid "tweet to @wger_project"
-msgstr "Tweet an @wger_project"
-
-#: core/templates/misc/contact.html:56
-msgid "Go to the discord server"
-msgstr "Zum Discord-Server gehen"
#: core/templates/misc/fragments/shariff_modal.html:6
msgid "Share this page"
@@ -987,7 +899,7 @@ msgid "Add new exercise"
msgstr "Neue Übung hinzufügen"
#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:223
+#: core/templates/navigation.html:226
msgid "Administration"
msgstr "Administration"
@@ -1054,68 +966,62 @@ msgid "About this software"
msgstr "Über diese Software"
#: core/templates/navigation.html:151 core/templates/template_features.html:83
-#: software/templates/contribute.html:6
-msgid "Contribute!"
-msgstr "Mach mit!"
-
-#: core/templates/navigation.html:152
-msgid "Problems and wishes"
-msgstr "Probleme und Wünsche"
+#: software/templates/about_us.html:5
+msgid "About us"
+msgstr "Über uns"
-#: core/templates/navigation.html:155 software/templates/features.html:209
+#: core/templates/navigation.html:153 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:156 software/templates/license.html:7
-#: utils/models.py:40
+#: core/templates/navigation.html:157 utils/models.py:40
msgid "License"
msgstr "Lizenz"
-#: core/templates/navigation.html:160
+#: core/templates/navigation.html:163
msgid "Developer documentation"
msgstr "Entwickler-Dokumentation"
-#: core/templates/navigation.html:166 software/templates/contribute.html:59
+#: core/templates/navigation.html:169
msgid "Get the code"
msgstr "Quellcode"
-#: core/templates/navigation.html:172 core/templates/template.html:193
-#: core/templates/template_features.html:103
-#: software/templates/contribute.html:43 software/templates/contribute.html:50
+#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/template_features.html:100
msgid "Translate"
msgstr "Übersetze"
-#: core/templates/navigation.html:193 core/templates/user/login.html:28
+#: core/templates/navigation.html:196 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Passwort zurücketzen"
-#: core/templates/navigation.html:206
+#: core/templates/navigation.html:209
msgid "My preferences"
msgstr "Meine Einstellungen"
-#: core/templates/navigation.html:213
+#: core/templates/navigation.html:216
msgid "Logout"
msgstr "Abmelden"
-#: core/templates/navigation.html:228
+#: core/templates/navigation.html:231
msgid "Licenses"
msgstr "Lizenzen"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:234
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Wiederholungs-Einheiten"
-#: core/templates/navigation.html:234 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Gewichtseinheiten"
-#: core/templates/navigation.html:237 core/templates/user/list.html:4
+#: core/templates/navigation.html:240 core/templates/user/list.html:4
msgid "User list"
msgstr "Benutzerliste"
-#: core/templates/navigation.html:238
+#: core/templates/navigation.html:241
msgid "Gyms"
msgstr "Studios"
@@ -1235,18 +1141,12 @@ msgstr ""
msgid "Create some demo entries"
msgstr "Beispieldaten erstellen"
-#: core/templates/template.html:201 core/templates/template_features.html:121
-#: core/templates/template_no_context.html:88
-msgid "About"
-msgstr "Impressum"
-
-#: core/templates/template.html:202 core/templates/template_features.html:125
+#: core/templates/template.html:202 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Allgemeine Nutzungsbedingungen"
#: core/templates/template.html:209 core/templates/template.html:210
-#: software/templates/license.html:18 software/templates/license.html:19
msgid "Released under the Affero GPL"
msgstr "Unter der Affero GPL veröffentlicht"
@@ -1607,15 +1507,15 @@ msgstr ""
msgid "Rest day"
msgstr "Ruhetag"
-#: core/views/misc.py:199
+#: core/views/misc.py:184
msgid "Feedback"
msgstr "Rückmeldung"
-#: core/views/misc.py:218 weight/templates/import_csv_form.html:9
+#: core/views/misc.py:203 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Abschicken"
-#: core/views/misc.py:226
+#: core/views/misc.py:211
msgid "Your feedback was successfully sent. Thank you!"
msgstr "Dein Feedback wurde erfolgeich versendet. Danke!"
@@ -1791,7 +1691,6 @@ msgstr "Übung"
#: exercises/templates/exercise/overview.html:118
#: exercises/templates/muscles/overview.html:114
#: nutrition/templates/ingredient/overview.html:85
-#: software/templates/contribute.html:39
msgid "Only registered users can do this"
msgstr "Nur registrierte Benutzer dürfen das"
@@ -2003,7 +1902,7 @@ msgid ""
msgstr ""
"%(name_original)s ist zu ähnlich zur bestehenden Übung „%(exercise_name)s“"
-#: exercises/views/exercises.py:246 software/templates/contribute.html:37
+#: exercises/views/exercises.py:246
msgid "Add exercise"
msgstr "Neue Übung hinzufügen"
@@ -3780,103 +3679,55 @@ msgstr "Eine neue Gewichtseinheit hinzufügen"
msgid "Edit a weight unit to ingredient connection"
msgstr "Verbindung Gewichtseinheit-Zutat bearbeiten"
-#: software/templates/contribute.html:9
+#: software/templates/about_us.html:9
msgid ""
-"wger Workout Manager is build by volunteers,\n"
-"the development process is open and freely accessible to anybody "
-"interested.\n"
-"If you are new to the free software world, we recommend to take a\n"
-"look <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
-"article</a> which summarizes they way open source projects work very well. "
+"Thank you for using wger! wger is a collaborative open source project, made "
+"by fitness enthusiasts from around the world."
msgstr ""
-"wger Workout Manager wird von Freiwilligen gemacht. Der Entwicklungsprozess\n"
-"ist offen und für jeden Interessierten zugänglich.\n"
-"Wenn du neu zur Welt der Freien Software bist, empfehlen wir dir einen "
-"Blick\n"
-"auf <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">diesen\n"
-"Artikel</a> zu werfen, der gut zusammenfasst wie quelloffene Projekte\n"
-"funktionieren. "
-
-#: software/templates/contribute.html:16
-msgid ""
-"Any kind of contribution is appreciated and welcome.\n"
-"Use this opportunity and influence the direction of the\n"
-"project. "
+
+#: software/templates/about_us.html:18
+msgid "Source code"
msgstr ""
-"Jede Form der Mitarbeit ist willkommen und wird sehr geschätzt.\n"
-"Nutze diese Möglichkeit und beinflusse die Richtung in der das\n"
-"Projekt gehen wird. "
-#: software/templates/contribute.html:23
-msgid "Use the site"
-msgstr "Benutze die Website"
+#: software/templates/about_us.html:20
+msgid "Get the source code of this application and its server on github"
+msgstr ""
-#: software/templates/contribute.html:24
-msgid ""
-"Simply use the site and tell your friends\n"
-"how useful it is! ;) . When you find something that you specially liked,\n"
-"could need some improvements or just doesn't work, tell us! This might not "
-"sound\n"
-"like much, but is incredibly important!"
+#: software/templates/about_us.html:25
+msgid "Have a problem or idea?"
msgstr ""
-"Benutze einfach die Website und erzähle deinen Freunden wie nützlich sie "
-"ist! ;)\n"
-"Wenn du etwas findest was dir besonders gefallen hat, verbessert werden\n"
-"könnte oder gar nicht funktioniert, sag Bescheid! Das klingt vielleicht "
-"nicht\n"
-"nach viel, ist aber extrem wichtig!"
-
-#: software/templates/contribute.html:31
-msgid "Submit exercises"
-msgstr "Reiche Übungen ein"
-
-#: software/templates/contribute.html:32
+
+#: software/templates/about_us.html:27
msgid ""
-"Submit those cool exercises that you absolutely\n"
-"love and do every week but are not in the list yet. If you think some "
-"description\n"
-"is too short or some other detail is missing or could be improved, tell!"
+"Get in touch if something didn't behave as expected or if there is a feature "
+"that you feel is missing."
msgstr ""
-"Reiche die coole Übungen ein die du jede Woche machst aber noch nicht in\n"
-"der Liste sind. Wenn du denkst, dass eine Beschreibung zu kurz ist oder \n"
-"irgendein Detail fehlt oder verbessert werden könnte, sag Bescheid!"
-#: software/templates/contribute.html:44
-msgid ""
-"Do you want to use wger in your own language?\n"
-"Do you think the current translation could be improved?\n"
-"The translations are easily managed and edited online, if you are "
-"interested,\n"
-"visit the link and start translating."
+#: software/templates/about_us.html:32
+msgid "Say hi!"
msgstr ""
-"Willst du wger in deiner Muttersprache benutzen? Denkst du dass die\n"
-"aktuelle Übersetzung verbessert werden könnte? Die Übersetzungen können\n"
-"komfortabel online verwaltet und bearbeitet werden. Wenn du interessiert\n"
-"bist, besuche den Link und fang an zu übersetzten."
-#: software/templates/contribute.html:53
-msgid "Code"
-msgstr "Quellcode"
+#: software/templates/about_us.html:34
+msgid "If you want to chat with us, hop on the Discord server and get in touch"
+msgstr ""
-#: software/templates/contribute.html:54
+#: software/templates/about_us.html:39
+#, fuzzy
+#| msgid "Translate"
+msgid "Translation"
+msgstr "Übersetze"
+
+#: software/templates/about_us.html:41
msgid ""
-"Obviously, you are highly encouraged to clone the\n"
-"repo and start hacking! Once you are ready, send a pull request and we\n"
-"will show the world. Take a look at the developer guide for more details\n"
-"on this."
+"This application is translated on weblate. If you also want to help, click "
+"the link and start translating"
msgstr ""
-"Selbstverständlich bist du herzlich eingeladen, das Repository\n"
-"zu klonen und zu hacken! Wenn du fertig bist, schicke ein Pull Request\n"
-"und wir werden es der Welt zeigen. Schaue dir die Entwickler Leitfaden\n"
-"an für weitere Details."
-#: software/templates/contribute.html:66
+#: software/templates/about_us.html:50
msgid "Our goal"
msgstr "Unser Ziel"
-#: software/templates/contribute.html:69
+#: software/templates/about_us.html:53
msgid ""
"The goal is to build an awesome\n"
"and flexible fitness manager, along with a comprehensive and complete list "
@@ -4050,104 +3901,6 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr "100 %% frei <br>und <br>quelloffen"
-#: software/templates/issues.html:6
-msgid "Reporting a problem"
-msgstr "Problem berichten"
-
-#: software/templates/issues.html:10
-msgid ""
-"\n"
-"No software is perfect. For some severe errors, an email will be "
-"automatically sent, but\n"
-"not always, so I depend on you reporting everything that didn't behave as "
-"expected.\n"
-"Please describe in as much detail as you can what you were doing when the "
-"error\n"
-"happened.\n"
-msgstr ""
-"\n"
-"Keine Software ist perfekt. Bei manchen schweren Fehlern bekomme ich "
-"automatisch eine E-Mail, aber nicht immer. Ich brauche also deine "
-"Fehlerberichte, um über darüber zu überhaupt zu erfahren und reagieren zu "
-"können. Bitte im Detail beschreiben, wie es zum Fehler kam.\n"
-
-#: software/templates/issues.html:21
-msgid "report problem to the issue tracker"
-msgstr "Problem im Issuetracker melden"
-
-#: software/templates/issues.html:25
-msgid "Enhancements"
-msgstr "Verbesserungen"
-
-#: software/templates/issues.html:27
-msgid ""
-"\n"
-"The issue tracker can also be used to document enhancements to the "
-"software.\n"
-"If you have some suggestions or think a feature is missing, feel\n"
-"free to open a ticket. This can be anything from a slight change to a whole\n"
-"new section of the site. Please keep in mind that not all wishes can be\n"
-"implemented."
-msgstr ""
-"\n"
-"Der Issuetracker kann auch dafür benutzt werden, um Verbesserungen "
-"vorzuschlagen. Wenn du Ideen hast oder denkst, dass etwas fehlt, öffne \n"
-"auch ein Ticket. Das kann alles mögliche sein, von einer kleinen Anpassung\n"
-"bis zu einem komplett neuen Bereich. Beachte aber, dass nicht alles \n"
-"umgesetzt werden kann."
-
-#: software/templates/issues.html:36
-msgid "report wish to the issue tracker"
-msgstr "Wunsch im Issuetracker melden"
-
-#: software/templates/issues.html:41
-msgid "No Github account?"
-msgstr "Kein Github-Konto?"
-
-#: software/templates/issues.html:42
-msgid ""
-"Filing an issue requires a github account, if you don't\n"
-"have one and don't want to register, you can also send it to\n"
-"<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
-msgstr ""
-"Um ein Ticket bei Github zu erstellen, braucht man dort ein Konto. Wenn du \n"
-"keins hast und du dich auch nicht registrieren willst, schreibe bitte\n"
-"dann einfach an <a href=\"https://groups.google.com/group/wger\">die "
-"Mailingliste</a>."
-
-#: software/templates/license.html:10
-msgid ""
-"wger Workout Manager is Free/Libre Open Source\n"
-"Software (FLOSS)."
-msgstr ""
-"wger Workout Manager ist eine freie\n"
-"und kostenlose\n"
-"Software."
-
-#: software/templates/license.html:22
-msgid ""
-"wger Workout Manager is released under the <strong>Affero GNU\n"
-"General Public License (AGPL) Version 3+</strong> and can (under the "
-"conditions\n"
-"of the license) be used, modified and distributed (also with modifications)\n"
-"without restrictions."
-msgstr ""
-"wger Workout Manager steht unter der <strong>Affero GNU\n"
-"General Public License (AGPL) Version 3+</strong> und darf ohne "
-"Restriktionen (unter den Bedingungen der Lizenz) benutzt, verändert und "
-"(geändert) weitergegeben werden."
-
-#: software/templates/license.html:29
-msgid ""
-"A copy the license text is contained in every wger Workout\n"
-"Manager release (LICENSE.txt) and can be read online on the website of\n"
-"<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</a>."
-msgstr ""
-"Eine Kopie des Lizenztextes ist in jeder wger Workout\n"
-"Manager-Version (LICENSE.txt) und kann online gelesen werden auf der Website "
-"von\n"
-"<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>des GNU-Projekts</a>."
-
#: utils/generic_views.py:261
msgid "Yes, delete"
msgstr "Löschen bestätigen"
@@ -4338,6 +4091,267 @@ msgstr "Erfolgreich gelöscht."
msgid "Delete weight entry for the %s"
msgstr "Gewichtseintrag für den %s löschen"
+#~ msgid "Responsible for the content of this site as per German law §5 TMG:"
+#~ msgstr "Angaben gemäß §5 TMG:"
+
+#~ msgid "GNUPG-Key:"
+#~ msgstr "GNUPG-Schlüssel:"
+
+#~ msgid "Get in touch"
+#~ msgstr "Melde dich"
+
+#~ msgid ""
+#~ "Thank you for your interest. Feel free to use any of the\n"
+#~ "ways below to send feedback you have about any aspect of the site. For\n"
+#~ "support, say hi\n"
+#~ "<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
+#~ "a bug, consider doing it through the <a href=\"%(issues)s\">issue "
+#~ "tracker</a>\n"
+#~ "."
+#~ msgstr ""
+#~ "Danke für dein Interesse. Du kannst gerne eine der folgenden "
+#~ "Möglichkeiten benutzen um Feedback zu geben. Um Hilfe zu bekommen, sag "
+#~ "hallo <a href=\"%(discord)s\">auf dem Discord-Server</a>, um einen Fehler "
+#~ "zu berichten, öffne ein Ticket im <a href=\"%(issues)s\">Issue-Tracker</"
+#~ "a>."
+
+#~ msgid ""
+#~ "If you want to further help and improve this project,\n"
+#~ "you might also be interested <a href=\"%(contribute)s\">in contributing</"
+#~ "a>."
+#~ msgstr ""
+#~ "Wenn du weiter helfen und dieses Projekt verbessern willst, \n"
+#~ "hast du vielleicht interesse am <a href=\"%(contribute)s\">Mitmachen</a>."
+
+#~ msgid "Feedback form"
+#~ msgstr "Feedbackformular"
+
+#~ msgid ""
+#~ "A simple contact form. Remember that\n"
+#~ "if you want an answer, you need to include some way to contact you."
+#~ msgstr ""
+#~ "Ein einfaches Feedbackformular. Beachte bitte, dass wenn du eine Antwort "
+#~ "willst\n"
+#~ "auch eine Kontaktmöglichkeit angeben musst."
+
+#~ msgid "Twitter"
+#~ msgstr "Twitter"
+
+#~ msgid ""
+#~ "We are also on twitter. Write us and tell us what\n"
+#~ "you think! Except patches, don't send patches via twitter."
+#~ msgstr ""
+#~ "Wir sind auch auf twitter. Schreibe uns und erzähle uns was du denkst!\n"
+#~ "Außer Patches. Schicke keine Patches über Twitter."
+
+#~ msgid "Discord"
+#~ msgstr "Discord"
+
+#~ msgid ""
+#~ "Use the public group to get support for your\n"
+#~ "local wger installation, discuss issues or your new idea, etc.\n"
+#~ "(no registration needed)"
+#~ msgstr ""
+#~ "Benutze die öffentliche Gruppe um Support für deine lokale\n"
+#~ "Installation zu erhalten, über Probleme oder Ideen zu diskutieren, etc.\n"
+#~ "(keine Anmeldung nötig)"
+
+#~ msgid "Open feedback form"
+#~ msgstr "Rückmeldungsformular öffnen"
+
+#~ msgid "tweet to @wger_project"
+#~ msgstr "Tweet an @wger_project"
+
+#~ msgid "Go to the discord server"
+#~ msgstr "Zum Discord-Server gehen"
+
+#~ msgid "Contribute!"
+#~ msgstr "Mach mit!"
+
+#~ msgid "Problems and wishes"
+#~ msgstr "Probleme und Wünsche"
+
+#~ msgid "About"
+#~ msgstr "Impressum"
+
+#~ msgid ""
+#~ "wger Workout Manager is build by volunteers,\n"
+#~ "the development process is open and freely accessible to anybody "
+#~ "interested.\n"
+#~ "If you are new to the free software world, we recommend to take a\n"
+#~ "look <a href=\"http://schlitt.info/opensource/"
+#~ "blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
+#~ "article</a> which summarizes they way open source projects work very "
+#~ "well. "
+#~ msgstr ""
+#~ "wger Workout Manager wird von Freiwilligen gemacht. Der "
+#~ "Entwicklungsprozess\n"
+#~ "ist offen und für jeden Interessierten zugänglich.\n"
+#~ "Wenn du neu zur Welt der Freien Software bist, empfehlen wir dir einen "
+#~ "Blick\n"
+#~ "auf <a href=\"http://schlitt.info/opensource/"
+#~ "blog/0541_10_golden_rules_for_starting_with_open_source.html\">diesen\n"
+#~ "Artikel</a> zu werfen, der gut zusammenfasst wie quelloffene Projekte\n"
+#~ "funktionieren. "
+
+#~ msgid ""
+#~ "Any kind of contribution is appreciated and welcome.\n"
+#~ "Use this opportunity and influence the direction of the\n"
+#~ "project. "
+#~ msgstr ""
+#~ "Jede Form der Mitarbeit ist willkommen und wird sehr geschätzt.\n"
+#~ "Nutze diese Möglichkeit und beinflusse die Richtung in der das\n"
+#~ "Projekt gehen wird. "
+
+#~ msgid "Use the site"
+#~ msgstr "Benutze die Website"
+
+#~ msgid ""
+#~ "Simply use the site and tell your friends\n"
+#~ "how useful it is! ;) . When you find something that you specially liked,\n"
+#~ "could need some improvements or just doesn't work, tell us! This might "
+#~ "not sound\n"
+#~ "like much, but is incredibly important!"
+#~ msgstr ""
+#~ "Benutze einfach die Website und erzähle deinen Freunden wie nützlich sie "
+#~ "ist! ;)\n"
+#~ "Wenn du etwas findest was dir besonders gefallen hat, verbessert werden\n"
+#~ "könnte oder gar nicht funktioniert, sag Bescheid! Das klingt vielleicht "
+#~ "nicht\n"
+#~ "nach viel, ist aber extrem wichtig!"
+
+#~ msgid "Submit exercises"
+#~ msgstr "Reiche Übungen ein"
+
+#~ msgid ""
+#~ "Submit those cool exercises that you absolutely\n"
+#~ "love and do every week but are not in the list yet. If you think some "
+#~ "description\n"
+#~ "is too short or some other detail is missing or could be improved, tell!"
+#~ msgstr ""
+#~ "Reiche die coole Übungen ein die du jede Woche machst aber noch nicht in\n"
+#~ "der Liste sind. Wenn du denkst, dass eine Beschreibung zu kurz ist oder \n"
+#~ "irgendein Detail fehlt oder verbessert werden könnte, sag Bescheid!"
+
+#~ msgid ""
+#~ "Do you want to use wger in your own language?\n"
+#~ "Do you think the current translation could be improved?\n"
+#~ "The translations are easily managed and edited online, if you are "
+#~ "interested,\n"
+#~ "visit the link and start translating."
+#~ msgstr ""
+#~ "Willst du wger in deiner Muttersprache benutzen? Denkst du dass die\n"
+#~ "aktuelle Übersetzung verbessert werden könnte? Die Übersetzungen können\n"
+#~ "komfortabel online verwaltet und bearbeitet werden. Wenn du interessiert\n"
+#~ "bist, besuche den Link und fang an zu übersetzten."
+
+#~ msgid "Code"
+#~ msgstr "Quellcode"
+
+#~ msgid ""
+#~ "Obviously, you are highly encouraged to clone the\n"
+#~ "repo and start hacking! Once you are ready, send a pull request and we\n"
+#~ "will show the world. Take a look at the developer guide for more details\n"
+#~ "on this."
+#~ msgstr ""
+#~ "Selbstverständlich bist du herzlich eingeladen, das Repository\n"
+#~ "zu klonen und zu hacken! Wenn du fertig bist, schicke ein Pull Request\n"
+#~ "und wir werden es der Welt zeigen. Schaue dir die Entwickler Leitfaden\n"
+#~ "an für weitere Details."
+
+#~ msgid "Reporting a problem"
+#~ msgstr "Problem berichten"
+
+#~ msgid ""
+#~ "\n"
+#~ "No software is perfect. For some severe errors, an email will be "
+#~ "automatically sent, but\n"
+#~ "not always, so I depend on you reporting everything that didn't behave as "
+#~ "expected.\n"
+#~ "Please describe in as much detail as you can what you were doing when the "
+#~ "error\n"
+#~ "happened.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Keine Software ist perfekt. Bei manchen schweren Fehlern bekomme ich "
+#~ "automatisch eine E-Mail, aber nicht immer. Ich brauche also deine "
+#~ "Fehlerberichte, um über darüber zu überhaupt zu erfahren und reagieren zu "
+#~ "können. Bitte im Detail beschreiben, wie es zum Fehler kam.\n"
+
+#~ msgid "report problem to the issue tracker"
+#~ msgstr "Problem im Issuetracker melden"
+
+#~ msgid "Enhancements"
+#~ msgstr "Verbesserungen"
+
+#~ msgid ""
+#~ "\n"
+#~ "The issue tracker can also be used to document enhancements to the "
+#~ "software.\n"
+#~ "If you have some suggestions or think a feature is missing, feel\n"
+#~ "free to open a ticket. This can be anything from a slight change to a "
+#~ "whole\n"
+#~ "new section of the site. Please keep in mind that not all wishes can be\n"
+#~ "implemented."
+#~ msgstr ""
+#~ "\n"
+#~ "Der Issuetracker kann auch dafür benutzt werden, um Verbesserungen "
+#~ "vorzuschlagen. Wenn du Ideen hast oder denkst, dass etwas fehlt, öffne \n"
+#~ "auch ein Ticket. Das kann alles mögliche sein, von einer kleinen "
+#~ "Anpassung\n"
+#~ "bis zu einem komplett neuen Bereich. Beachte aber, dass nicht alles \n"
+#~ "umgesetzt werden kann."
+
+#~ msgid "report wish to the issue tracker"
+#~ msgstr "Wunsch im Issuetracker melden"
+
+#~ msgid "No Github account?"
+#~ msgstr "Kein Github-Konto?"
+
+#~ msgid ""
+#~ "Filing an issue requires a github account, if you don't\n"
+#~ "have one and don't want to register, you can also send it to\n"
+#~ "<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
+#~ msgstr ""
+#~ "Um ein Ticket bei Github zu erstellen, braucht man dort ein Konto. Wenn "
+#~ "du \n"
+#~ "keins hast und du dich auch nicht registrieren willst, schreibe bitte\n"
+#~ "dann einfach an <a href=\"https://groups.google.com/group/wger\">die "
+#~ "Mailingliste</a>."
+
+#~ msgid ""
+#~ "wger Workout Manager is Free/Libre Open Source\n"
+#~ "Software (FLOSS)."
+#~ msgstr ""
+#~ "wger Workout Manager ist eine freie\n"
+#~ "und kostenlose\n"
+#~ "Software."
+
+#~ msgid ""
+#~ "wger Workout Manager is released under the <strong>Affero GNU\n"
+#~ "General Public License (AGPL) Version 3+</strong> and can (under the "
+#~ "conditions\n"
+#~ "of the license) be used, modified and distributed (also with "
+#~ "modifications)\n"
+#~ "without restrictions."
+#~ msgstr ""
+#~ "wger Workout Manager steht unter der <strong>Affero GNU\n"
+#~ "General Public License (AGPL) Version 3+</strong> und darf ohne "
+#~ "Restriktionen (unter den Bedingungen der Lizenz) benutzt, verändert und "
+#~ "(geändert) weitergegeben werden."
+
+#~ msgid ""
+#~ "A copy the license text is contained in every wger Workout\n"
+#~ "Manager release (LICENSE.txt) and can be read online on the website of\n"
+#~ "<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</"
+#~ "a>."
+#~ msgstr ""
+#~ "Eine Kopie des Lizenztextes ist in jeder wger Workout\n"
+#~ "Manager-Version (LICENSE.txt) und kann online gelesen werden auf der "
+#~ "Website von\n"
+#~ "<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>des GNU-Projekts</"
+#~ "a>."
+
#~ msgid "Use pauses in workout timer"
#~ msgstr "Pausen im Studiomodus benutzen"
diff --git a/wger/locale/el/LC_MESSAGES/django.po b/wger/locale/el/LC_MESSAGES/django.po
index 27131ab6c..d0234c426 100644
--- a/wger/locale/el/LC_MESSAGES/django.po
+++ b/wger/locale/el/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-17 15:00+0200\n"
+"POT-Creation-Date: 2021-08-17 17:23+0200\n"
"PO-Revision-Date: 2021-04-17 13:26+0000\n"
"Last-Translator: Eugenia Russell <[email protected]>\n"
"Language-Team: Greek <https://hosted.weblate.org/projects/wger/web/el/>\n"
@@ -44,7 +44,7 @@ msgstr "Ασκήσεις"
msgid "Ingredients"
msgstr "Συστατικά"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:225
+#: config/templates/language/overview.html:4 core/templates/navigation.html:228
msgid "Languages"
msgstr "Γλώσσες"
@@ -221,8 +221,8 @@ msgstr "Το τέλειο πρόγραμμα γυμναστικής μου"
msgid "Empty placeholder schedule"
msgstr "Άδειο placeholder ημερολογίου"
-#: core/forms.py:61 core/templates/navigation.html:187
-#: core/templates/navigation.html:191 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:190
+#: core/templates/navigation.html:194 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Σύνδεση"
@@ -303,8 +303,8 @@ msgstr "Λάθος κωδικός"
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:187
-#: core/templates/navigation.html:192 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
+#: core/templates/navigation.html:195 core/templates/template.html:150
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -788,90 +788,10 @@ msgstr "Λίστα αδειών"
msgid "Nothing found"
msgstr "Δεν βρέθηκε τίποτα"
-#: core/templates/misc/about.html:4
-msgid "About us"
-msgstr "Σχετικά με μας"
-
-#: core/templates/misc/about.html:8
-msgid "Responsible for the content of this site as per German law §5 TMG:"
-msgstr ""
-"Υπεύθυνος για το περιεχόμενο της σελίδας όπως χρήζει ο Γερμανικός νόμος §5 "
-"TMG:"
-
-#: core/templates/misc/about.html:16
-msgid "GNUPG-Key:"
-msgstr "GNUPG-Key:"
-
-#: core/templates/misc/contact.html:4 core/templates/navigation.html:153
-#: core/templates/template_features.html:86
-#: software/templates/contribute.html:28
-msgid "Get in touch"
-msgstr "Μείνετε ενημερωμένοι"
-
-#: core/templates/misc/contact.html:10
-#, python-format
-msgid ""
-"Thank you for your interest. Feel free to use any of the\n"
-"ways below to send feedback you have about any aspect of the site. For\n"
-"support, say hi\n"
-"<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
-"a bug, consider doing it through the <a href=\"%(issues)s\">issue tracker</"
-"a>\n"
-"."
-msgstr ""
-
-#: core/templates/misc/contact.html:20
-#, python-format
-msgid ""
-"If you want to further help and improve this project,\n"
-"you might also be interested <a href=\"%(contribute)s\">in contributing</a>."
-msgstr ""
-
-#: core/templates/misc/contact.html:29
-msgid "Feedback form"
-msgstr "Φόρμα feedback"
-
-#: core/templates/misc/contact.html:30
-msgid ""
-"A simple contact form. Remember that\n"
-"if you want an answer, you need to include some way to contact you."
-msgstr ""
-"Μια απλή φόρμα επικοινωνίας. Θυμηθείτε ότι αν θέλετε\n"
-"απάντηση, θα πρέπει να εισάγετε κάποιο τρόπο επικοινωνίας σας."
-
-#: core/templates/misc/contact.html:35
-msgid "Twitter"
-msgstr "Twitter"
-
-#: core/templates/misc/contact.html:36
-msgid ""
-"We are also on twitter. Write us and tell us what\n"
-"you think! Except patches, don't send patches via twitter."
-msgstr ""
-"Είμαστε επίσης και στο twitter. Γράψτε και πείτε μας την\n"
-"άποψη σας! Εκτός απο patches, μήν στέλνετε patches μέσω twitter."
-
-#: core/templates/misc/contact.html:42
-msgid "Discord"
-msgstr ""
-
-#: core/templates/misc/contact.html:43
-msgid ""
-"Use the public group to get support for your\n"
-"local wger installation, discuss issues or your new idea, etc.\n"
-"(no registration needed)"
-msgstr ""
-
-#: core/templates/misc/contact.html:49
-msgid "Open feedback form"
-msgstr "Ανοιχτή φόρμα feedback"
-
-#: core/templates/misc/contact.html:53
-msgid "tweet to @wger_project"
-msgstr ""
-
-#: core/templates/misc/contact.html:56
-msgid "Go to the discord server"
+#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/template_features.html:118
+#: core/templates/template_no_context.html:88
+msgid "Imprint"
msgstr ""
#: core/templates/misc/fragments/shariff_modal.html:6
@@ -961,7 +881,7 @@ msgid "Add new exercise"
msgstr "Νέα άσκηση"
#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:223
+#: core/templates/navigation.html:226
msgid "Administration"
msgstr "Διαχείριση"
@@ -1028,68 +948,62 @@ msgid "About this software"
msgstr "Σχετικά"
#: core/templates/navigation.html:151 core/templates/template_features.html:83
-#: software/templates/contribute.html:6
-msgid "Contribute!"
-msgstr "Συμβάλλετε!"
-
-#: core/templates/navigation.html:152
-msgid "Problems and wishes"
-msgstr "Προβλήματα και ευχές"
+#: software/templates/about_us.html:5
+msgid "About us"
+msgstr "Σχετικά με μας"
-#: core/templates/navigation.html:155 software/templates/features.html:209
+#: core/templates/navigation.html:153 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:156 software/templates/license.html:7
-#: utils/models.py:40
+#: core/templates/navigation.html:157 utils/models.py:40
msgid "License"
msgstr "Άδεια"
-#: core/templates/navigation.html:160
+#: core/templates/navigation.html:163
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:166 software/templates/contribute.html:59
+#: core/templates/navigation.html:169
msgid "Get the code"
msgstr "Κατεβάστε τον κώδικα"
-#: core/templates/navigation.html:172 core/templates/template.html:193
-#: core/templates/template_features.html:103
-#: software/templates/contribute.html:43 software/templates/contribute.html:50
+#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/template_features.html:100
msgid "Translate"
msgstr "Μετάφραση"
-#: core/templates/navigation.html:193 core/templates/user/login.html:28
+#: core/templates/navigation.html:196 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Αλλαγή κωδικού"
-#: core/templates/navigation.html:206
+#: core/templates/navigation.html:209
msgid "My preferences"
msgstr "Οι προτιμήσεις μου"
-#: core/templates/navigation.html:213
+#: core/templates/navigation.html:216
msgid "Logout"
msgstr "Έξοδος"
-#: core/templates/navigation.html:228
+#: core/templates/navigation.html:231
msgid "Licenses"
msgstr "Άδειες"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:234
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:234 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Μονάδες βάρους"
-#: core/templates/navigation.html:237 core/templates/user/list.html:4
+#: core/templates/navigation.html:240 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:238
+#: core/templates/navigation.html:241
msgid "Gyms"
msgstr "Γυμναστήρια"
@@ -1213,18 +1127,12 @@ msgstr ""
msgid "Create some demo entries"
msgstr "Δημιουργήστε μερικές δοκιμαστικές εγγραφές"
-#: core/templates/template.html:201 core/templates/template_features.html:121
-#: core/templates/template_no_context.html:88
-msgid "About"
-msgstr "Σχετικά"
-
-#: core/templates/template.html:202 core/templates/template_features.html:125
+#: core/templates/template.html:202 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
#: core/templates/template.html:209 core/templates/template.html:210
-#: software/templates/license.html:18 software/templates/license.html:19
msgid "Released under the Affero GPL"
msgstr "Released under the Affero GPL"
@@ -1586,15 +1494,15 @@ msgstr ""
msgid "Rest day"
msgstr "Μέρα ανάπαυσης"
-#: core/views/misc.py:199
+#: core/views/misc.py:184
msgid "Feedback"
msgstr "Feedback"
-#: core/views/misc.py:218 weight/templates/import_csv_form.html:9
+#: core/views/misc.py:203 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Υποβολ΄"
-#: core/views/misc.py:226
+#: core/views/misc.py:211
msgid "Your feedback was successfully sent. Thank you!"
msgstr "Το feedback σας αποστάλθηκε με επιτυχία. Ευχαριστούμε!"
@@ -1768,7 +1676,6 @@ msgstr "ονομασία άσκησης"
#: exercises/templates/exercise/overview.html:118
#: exercises/templates/muscles/overview.html:114
#: nutrition/templates/ingredient/overview.html:85
-#: software/templates/contribute.html:39
msgid "Only registered users can do this"
msgstr "Μόνο εγγεγραμμένοι χρήστες μπορούν να το κάνουν αυτό"
@@ -1977,7 +1884,7 @@ msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246 software/templates/contribute.html:37
+#: exercises/views/exercises.py:246
msgid "Add exercise"
msgstr "Νέα άσκηση"
@@ -3729,110 +3636,55 @@ msgstr "Προσθήκη νέας μονάδας βάρους"
msgid "Edit a weight unit to ingredient connection"
msgstr "Επεξεργασία μια μονάδας βάρους στον συσχετισμό συστατικού"
-#: software/templates/contribute.html:9
+#: software/templates/about_us.html:9
msgid ""
-"wger Workout Manager is build by volunteers,\n"
-"the development process is open and freely accessible to anybody "
-"interested.\n"
-"If you are new to the free software world, we recommend to take a\n"
-"look <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
-"article</a> which summarizes they way open source projects work very well. "
-msgstr ""
-"Το wger Workout Manager χτίζεται απο εθελοντές,\n"
-"η διαδικασία ανάπτυξης είναι ανοιχτή και πλήρως διαθέσιμο σε οποιονδήποτε.\n"
-"Αν είστε νέος στον κόσμο του ελεύθερου λογισμικού, σας συνιστούμε να ρίξετε "
-"μιά ματιά σε αυτό <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">το άρθρο</a> "
-"που περιληπτικά αναφέρει πως τα προγράμματα ανοιχτού κώδικα δουλεύουν καλά."
-
-#: software/templates/contribute.html:16
-msgid ""
-"Any kind of contribution is appreciated and welcome.\n"
-"Use this opportunity and influence the direction of the\n"
-"project. "
+"Thank you for using wger! wger is a collaborative open source project, made "
+"by fitness enthusiasts from around the world."
msgstr ""
-"Εκτιμούμε πολύ οποιοδήποτε είδος συνεισφοράς.\n"
-"Χρησιμοποιήστε αυτήν την ευκαιρία για να επηρεάσετε\n"
-"την εξέλιξη του έργου."
-#: software/templates/contribute.html:23
-msgid "Use the site"
-msgstr "Χρησιμοποιήστε το site"
+#: software/templates/about_us.html:18
+msgid "Source code"
+msgstr ""
-#: software/templates/contribute.html:24
-msgid ""
-"Simply use the site and tell your friends\n"
-"how useful it is! ;) . When you find something that you specially liked,\n"
-"could need some improvements or just doesn't work, tell us! This might not "
-"sound\n"
-"like much, but is incredibly important!"
-msgstr ""
-"Απλα χρησιμοποιήστε την σελίδα και πείτε τους φίλους σας πόσο χρήσιμη "
-"είναι! ;) . Όταν βρείτε κάτι που σας άρεσε ιδιαίτερα, που χρειάζεται "
-"βελτίωση ή απλά δεν λειτουργεί, πείτε μας! Μπορεί να μην φαινεται αρκετό "
-"αυτό, αλλά είναι παρα πολύ σημαντικό!"
-
-#: software/templates/contribute.html:31
-msgid "Submit exercises"
-msgstr "Υποβολή ασκήσεων"
-
-#: software/templates/contribute.html:32
+#: software/templates/about_us.html:20
+msgid "Get the source code of this application and its server on github"
+msgstr ""
+
+#: software/templates/about_us.html:25
+msgid "Have a problem or idea?"
+msgstr ""
+
+#: software/templates/about_us.html:27
msgid ""
-"Submit those cool exercises that you absolutely\n"
-"love and do every week but are not in the list yet. If you think some "
-"description\n"
-"is too short or some other detail is missing or could be improved, tell!"
-msgstr ""
-"Υποβάλλετε εκείνες τις τέλειες ασκήσεις που τόσο πολύ αγαπάτε\n"
-"και κάνετε κάθε εβδομάδα αλλα δεν έχουν μπεί ακόμα στην λίστα. Αν\n"
-"νομίζετε ότι κάποια περιγραφή\n"
-"είναι πολύ μικρή ή κάποια άλλη λεπτομέρεια λείπει ή μπορεί να βελτιωθεί, "
-"πείτε το!"
-
-#: software/templates/contribute.html:44
+"Get in touch if something didn't behave as expected or if there is a feature "
+"that you feel is missing."
+msgstr ""
+
+#: software/templates/about_us.html:32
+msgid "Say hi!"
+msgstr ""
+
+#: software/templates/about_us.html:34
+msgid "If you want to chat with us, hop on the Discord server and get in touch"
+msgstr ""
+
+#: software/templates/about_us.html:39
#, fuzzy
-#| msgid ""
-#| "Do you want to use wger in your own language?\n"
-#| "Do you think the current translation could be improved?\n"
-#| "The translations are easily managed and edited online, if you are "
-#| "interested,\n"
-#| "go to the transifex site, request access and we will set everything\n"
-#| "up. "
-msgid ""
-"Do you want to use wger in your own language?\n"
-"Do you think the current translation could be improved?\n"
-"The translations are easily managed and edited online, if you are "
-"interested,\n"
-"visit the link and start translating."
-msgstr ""
-"Θέλετε να χρησιμοποιήσετε το wger στην γλώσσα σας;\n"
-"Νομίζετε ότι η τρέχουσα μετάφραση μπορεί να βελτιωθεί;\n"
-"Οι μεταφράσεις μπορούν να διαχειριστούν εύκολα και να επεξεργαστούν online. "
-"Αν ενδιαφέρεστε, επισκεφτείτε την σελίδα της transifex, αιτηθείτε πρόσβαση "
-"και τα υπόλοιπα θα τα ετοιμάσουμε εμείς."
-
-#: software/templates/contribute.html:53
-msgid "Code"
-msgstr "Κώδικας"
-
-#: software/templates/contribute.html:54
+#| msgid "Translate"
+msgid "Translation"
+msgstr "Μετάφραση"
+
+#: software/templates/about_us.html:41
msgid ""
-"Obviously, you are highly encouraged to clone the\n"
-"repo and start hacking! Once you are ready, send a pull request and we\n"
-"will show the world. Take a look at the developer guide for more details\n"
-"on this."
+"This application is translated on weblate. If you also want to help, click "
+"the link and start translating"
msgstr ""
-"Προφανώς, σας ενθαρρύνουμε θερμά να κάνετε έναν κλώνο του repo και να "
-"αρχίσετε τις μετατροπές! Εφόσον έχετε ξεκινήσει, στείλτε ένα αίτημα pull και "
-"θα το δείξουμε σε όλο τον κόσμο. Ρίξτε μιά ματιά στον οδηγό ανάπτυξης για "
-"περισσότερες πληροφορίες."
-#: software/templates/contribute.html:66
+#: software/templates/about_us.html:50
msgid "Our goal"
msgstr "Ο στόχος μας"
-#: software/templates/contribute.html:69
+#: software/templates/about_us.html:53
msgid ""
"The goal is to build an awesome\n"
"and flexible fitness manager, along with a comprehensive and complete list "
@@ -3973,80 +3825,6 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr ""
-#: software/templates/issues.html:6
-msgid "Reporting a problem"
-msgstr "Αναφέρετε ένα πρόβλημα"
-
-#: software/templates/issues.html:10
-msgid ""
-"\n"
-"No software is perfect. For some severe errors, an email will be "
-"automatically sent, but\n"
-"not always, so I depend on you reporting everything that didn't behave as "
-"expected.\n"
-"Please describe in as much detail as you can what you were doing when the "
-"error\n"
-"happened.\n"
-msgstr ""
-
-#: software/templates/issues.html:21
-msgid "report problem to the issue tracker"
-msgstr "αναφέρετε το πρόβλημα στον ιχνηλάτη προβλημάτων"
-
-#: software/templates/issues.html:25
-msgid "Enhancements"
-msgstr "Βελτιώσεις"
-
-#: software/templates/issues.html:27
-msgid ""
-"\n"
-"The issue tracker can also be used to document enhancements to the "
-"software.\n"
-"If you have some suggestions or think a feature is missing, feel\n"
-"free to open a ticket. This can be anything from a slight change to a whole\n"
-"new section of the site. Please keep in mind that not all wishes can be\n"
-"implemented."
-msgstr ""
-
-#: software/templates/issues.html:36
-msgid "report wish to the issue tracker"
-msgstr ""
-
-#: software/templates/issues.html:41
-msgid "No Github account?"
-msgstr "Δεν έχετε λογαριασμό Github;"
-
-#: software/templates/issues.html:42
-msgid ""
-"Filing an issue requires a github account, if you don't\n"
-"have one and don't want to register, you can also send it to\n"
-"<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
-msgstr ""
-
-#: software/templates/license.html:10
-msgid ""
-"wger Workout Manager is Free/Libre Open Source\n"
-"Software (FLOSS)."
-msgstr ""
-"Το wger Workout Manager είναι Λογισμικό\n"
-"Ελεύθερο/Ανοιχτού Κώδικα (FLOSS)."
-
-#: software/templates/license.html:22
-msgid ""
-"wger Workout Manager is released under the <strong>Affero GNU\n"
-"General Public License (AGPL) Version 3+</strong> and can (under the "
-"conditions\n"
-"of the license) be used, modified and distributed (also with modifications)\n"
-"without restrictions."
-msgstr ""
-
-#: software/templates/license.html:29
-msgid ""
-"A copy the license text is contained in every wger Workout\n"
-"Manager release (LICENSE.txt) and can be read online on the website of\n"
-"<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</a>."
-msgstr ""
-
#: utils/generic_views.py:261
msgid "Yes, delete"
msgstr "Ναί, διαγραφή"
@@ -4228,6 +4006,161 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Responsible for the content of this site as per German law §5 TMG:"
+#~ msgstr ""
+#~ "Υπεύθυνος για το περιεχόμενο της σελίδας όπως χρήζει ο Γερμανικός νόμος "
+#~ "§5 TMG:"
+
+#~ msgid "GNUPG-Key:"
+#~ msgstr "GNUPG-Key:"
+
+#~ msgid "Get in touch"
+#~ msgstr "Μείνετε ενημερωμένοι"
+
+#~ msgid "Feedback form"
+#~ msgstr "Φόρμα feedback"
+
+#~ msgid ""
+#~ "A simple contact form. Remember that\n"
+#~ "if you want an answer, you need to include some way to contact you."
+#~ msgstr ""
+#~ "Μια απλή φόρμα επικοινωνίας. Θυμηθείτε ότι αν θέλετε\n"
+#~ "απάντηση, θα πρέπει να εισάγετε κάποιο τρόπο επικοινωνίας σας."
+
+#~ msgid "Twitter"
+#~ msgstr "Twitter"
+
+#~ msgid ""
+#~ "We are also on twitter. Write us and tell us what\n"
+#~ "you think! Except patches, don't send patches via twitter."
+#~ msgstr ""
+#~ "Είμαστε επίσης και στο twitter. Γράψτε και πείτε μας την\n"
+#~ "άποψη σας! Εκτός απο patches, μήν στέλνετε patches μέσω twitter."
+
+#~ msgid "Open feedback form"
+#~ msgstr "Ανοιχτή φόρμα feedback"
+
+#~ msgid "Contribute!"
+#~ msgstr "Συμβάλλετε!"
+
+#~ msgid "Problems and wishes"
+#~ msgstr "Προβλήματα και ευχές"
+
+#~ msgid "About"
+#~ msgstr "Σχετικά"
+
+#~ msgid ""
+#~ "wger Workout Manager is build by volunteers,\n"
+#~ "the development process is open and freely accessible to anybody "
+#~ "interested.\n"
+#~ "If you are new to the free software world, we recommend to take a\n"
+#~ "look <a href=\"http://schlitt.info/opensource/"
+#~ "blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
+#~ "article</a> which summarizes they way open source projects work very "
+#~ "well. "
+#~ msgstr ""
+#~ "Το wger Workout Manager χτίζεται απο εθελοντές,\n"
+#~ "η διαδικασία ανάπτυξης είναι ανοιχτή και πλήρως διαθέσιμο σε "
+#~ "οποιονδήποτε.\n"
+#~ "Αν είστε νέος στον κόσμο του ελεύθερου λογισμικού, σας συνιστούμε να "
+#~ "ρίξετε μιά ματιά σε αυτό <a href=\"http://schlitt.info/opensource/"
+#~ "blog/0541_10_golden_rules_for_starting_with_open_source.html\">το άρθρο</"
+#~ "a> που περιληπτικά αναφέρει πως τα προγράμματα ανοιχτού κώδικα δουλεύουν "
+#~ "καλά."
+
+#~ msgid ""
+#~ "Any kind of contribution is appreciated and welcome.\n"
+#~ "Use this opportunity and influence the direction of the\n"
+#~ "project. "
+#~ msgstr ""
+#~ "Εκτιμούμε πολύ οποιοδήποτε είδος συνεισφοράς.\n"
+#~ "Χρησιμοποιήστε αυτήν την ευκαιρία για να επηρεάσετε\n"
+#~ "την εξέλιξη του έργου."
+
+#~ msgid "Use the site"
+#~ msgstr "Χρησιμοποιήστε το site"
+
+#~ msgid ""
+#~ "Simply use the site and tell your friends\n"
+#~ "how useful it is! ;) . When you find something that you specially liked,\n"
+#~ "could need some improvements or just doesn't work, tell us! This might "
+#~ "not sound\n"
+#~ "like much, but is incredibly important!"
+#~ msgstr ""
+#~ "Απλα χρησιμοποιήστε την σελίδα και πείτε τους φίλους σας πόσο χρήσιμη "
+#~ "είναι! ;) . Όταν βρείτε κάτι που σας άρεσε ιδιαίτερα, που χρειάζεται "
+#~ "βελτίωση ή απλά δεν λειτουργεί, πείτε μας! Μπορεί να μην φαινεται αρκετό "
+#~ "αυτό, αλλά είναι παρα πολύ σημαντικό!"
+
+#~ msgid "Submit exercises"
+#~ msgstr "Υποβολή ασκήσεων"
+
+#~ msgid ""
+#~ "Submit those cool exercises that you absolutely\n"
+#~ "love and do every week but are not in the list yet. If you think some "
+#~ "description\n"
+#~ "is too short or some other detail is missing or could be improved, tell!"
+#~ msgstr ""
+#~ "Υποβάλλετε εκείνες τις τέλειες ασκήσεις που τόσο πολύ αγαπάτε\n"
+#~ "και κάνετε κάθε εβδομάδα αλλα δεν έχουν μπεί ακόμα στην λίστα. Αν\n"
+#~ "νομίζετε ότι κάποια περιγραφή\n"
+#~ "είναι πολύ μικρή ή κάποια άλλη λεπτομέρεια λείπει ή μπορεί να βελτιωθεί, "
+#~ "πείτε το!"
+
+#, fuzzy
+#~| msgid ""
+#~| "Do you want to use wger in your own language?\n"
+#~| "Do you think the current translation could be improved?\n"
+#~| "The translations are easily managed and edited online, if you are "
+#~| "interested,\n"
+#~| "go to the transifex site, request access and we will set everything\n"
+#~| "up. "
+#~ msgid ""
+#~ "Do you want to use wger in your own language?\n"
+#~ "Do you think the current translation could be improved?\n"
+#~ "The translations are easily managed and edited online, if you are "
+#~ "interested,\n"
+#~ "visit the link and start translating."
+#~ msgstr ""
+#~ "Θέλετε να χρησιμοποιήσετε το wger στην γλώσσα σας;\n"
+#~ "Νομίζετε ότι η τρέχουσα μετάφραση μπορεί να βελτιωθεί;\n"
+#~ "Οι μεταφράσεις μπορούν να διαχειριστούν εύκολα και να επεξεργαστούν "
+#~ "online. Αν ενδιαφέρεστε, επισκεφτείτε την σελίδα της transifex, αιτηθείτε "
+#~ "πρόσβαση και τα υπόλοιπα θα τα ετοιμάσουμε εμείς."
+
+#~ msgid "Code"
+#~ msgstr "Κώδικας"
+
+#~ msgid ""
+#~ "Obviously, you are highly encouraged to clone the\n"
+#~ "repo and start hacking! Once you are ready, send a pull request and we\n"
+#~ "will show the world. Take a look at the developer guide for more details\n"
+#~ "on this."
+#~ msgstr ""
+#~ "Προφανώς, σας ενθαρρύνουμε θερμά να κάνετε έναν κλώνο του repo και να "
+#~ "αρχίσετε τις μετατροπές! Εφόσον έχετε ξεκινήσει, στείλτε ένα αίτημα pull "
+#~ "και θα το δείξουμε σε όλο τον κόσμο. Ρίξτε μιά ματιά στον οδηγό ανάπτυξης "
+#~ "για περισσότερες πληροφορίες."
+
+#~ msgid "Reporting a problem"
+#~ msgstr "Αναφέρετε ένα πρόβλημα"
+
+#~ msgid "report problem to the issue tracker"
+#~ msgstr "αναφέρετε το πρόβλημα στον ιχνηλάτη προβλημάτων"
+
+#~ msgid "Enhancements"
+#~ msgstr "Βελτιώσεις"
+
+#~ msgid "No Github account?"
+#~ msgstr "Δεν έχετε λογαριασμό Github;"
+
+#~ msgid ""
+#~ "wger Workout Manager is Free/Libre Open Source\n"
+#~ "Software (FLOSS)."
+#~ msgstr ""
+#~ "Το wger Workout Manager είναι Λογισμικό\n"
+#~ "Ελεύθερο/Ανοιχτού Κώδικα (FLOSS)."
+
#~ msgid "Use pauses in workout timer"
#~ msgstr "Χρήση παύσεων στον χρονομετρητή προπονήσεων"
diff --git a/wger/locale/es/LC_MESSAGES/django.po b/wger/locale/es/LC_MESSAGES/django.po
index 08a3176d7..cb18c7e45 100644
--- a/wger/locale/es/LC_MESSAGES/django.po
+++ b/wger/locale/es/LC_MESSAGES/django.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-17 15:00+0200\n"
+"POT-Creation-Date: 2021-08-17 17:23+0200\n"
"PO-Revision-Date: 2021-05-09 09:11+0000\n"
"Last-Translator: J. Lavoie <[email protected]>\n"
"Language-Team: Spanish <https://hosted.weblate.org/projects/wger/web/es/>\n"
@@ -49,7 +49,7 @@ msgstr "Ejercicios"
msgid "Ingredients"
msgstr "Ingredientes"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:225
+#: config/templates/language/overview.html:4 core/templates/navigation.html:228
msgid "Languages"
msgstr "Idiomas"
@@ -226,8 +226,8 @@ msgstr "Mi programa de rutinas"
msgid "Empty placeholder schedule"
msgstr "Programación de marcador posición vacía"
-#: core/forms.py:61 core/templates/navigation.html:187
-#: core/templates/navigation.html:191 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:190
+#: core/templates/navigation.html:194 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Ingresar"
@@ -304,8 +304,8 @@ msgstr "Contraseña incorrecta"
msgid "The form is secured with reCAPTCHA"
msgstr "El Formulario está asegurado por recaptcha"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:187
-#: core/templates/navigation.html:192 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
+#: core/templates/navigation.html:195 core/templates/template.html:150
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -803,93 +803,11 @@ msgstr "Listado de licencias"
msgid "Nothing found"
msgstr "No se ha encontrado nada"
-#: core/templates/misc/about.html:4
-msgid "About us"
-msgstr "Sobre nosotros"
-
-#: core/templates/misc/about.html:8
-msgid "Responsible for the content of this site as per German law §5 TMG:"
-msgstr "Responsable del contenido de esta página según la ley alemana §5 TMG:"
-
-#: core/templates/misc/about.html:16
-msgid "GNUPG-Key:"
-msgstr "Llave de GNUPG:"
-
-#: core/templates/misc/contact.html:4 core/templates/navigation.html:153
-#: core/templates/template_features.html:86
-#: software/templates/contribute.html:28
-msgid "Get in touch"
-msgstr "Contactar"
-
-#: core/templates/misc/contact.html:10
-#, python-format
-msgid ""
-"Thank you for your interest. Feel free to use any of the\n"
-"ways below to send feedback you have about any aspect of the site. For\n"
-"support, say hi\n"
-"<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
-"a bug, consider doing it through the <a href=\"%(issues)s\">issue tracker</"
-"a>\n"
-"."
-msgstr ""
-
-#: core/templates/misc/contact.html:20
-#, python-format
-msgid ""
-"If you want to further help and improve this project,\n"
-"you might also be interested <a href=\"%(contribute)s\">in contributing</a>."
-msgstr ""
-"Si quieres además ayudar y mejorar este proyecto, a lo mejor estás "
-"interesado <a href=\"%(contribute)s\">en contribuir</a>."
-
-#: core/templates/misc/contact.html:29
-msgid "Feedback form"
-msgstr "Formulário de sugerencias"
-
-#: core/templates/misc/contact.html:30
-msgid ""
-"A simple contact form. Remember that\n"
-"if you want an answer, you need to include some way to contact you."
-msgstr ""
-"Un simple formulario para contactos. Acuérdate de poner alguna forma de "
-"contactarte, si quieres recibir una respuesta."
-
-#: core/templates/misc/contact.html:35
-msgid "Twitter"
-msgstr "Twitter"
-
-#: core/templates/misc/contact.html:36
-msgid ""
-"We are also on twitter. Write us and tell us what\n"
-"you think! Except patches, don't send patches via twitter."
-msgstr ""
-"También estamos en twitter. Escríbenos y dínos lo que piensas.\n"
-"Excepto parches, no nos mandes parches por twitter."
-
-#: core/templates/misc/contact.html:42
-msgid "Discord"
-msgstr "Discord"
-
-#: core/templates/misc/contact.html:43
-msgid ""
-"Use the public group to get support for your\n"
-"local wger installation, discuss issues or your new idea, etc.\n"
-"(no registration needed)"
+#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/template_features.html:118
+#: core/templates/template_no_context.html:88
+msgid "Imprint"
msgstr ""
-"Usa el grupo público para obtener ayuda para tu instalación local de wger, "
-"discutir problemas o nuevas ideas, etc. (no es necesario registrarse)."
-
-#: core/templates/misc/contact.html:49
-msgid "Open feedback form"
-msgstr "Abre formulário de sugerencias"
-
-#: core/templates/misc/contact.html:53
-msgid "tweet to @wger_project"
-msgstr "tweet a @wger_project"
-
-#: core/templates/misc/contact.html:56
-msgid "Go to the discord server"
-msgstr "Ir a servidor de discord"
#: core/templates/misc/fragments/shariff_modal.html:6
msgid "Share this page"
@@ -982,7 +900,7 @@ msgid "Add new exercise"
msgstr "Añadir nuevo ejercicio"
#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:223
+#: core/templates/navigation.html:226
msgid "Administration"
msgstr "Administración"
@@ -1049,68 +967,62 @@ msgid "About this software"
msgstr "Sobre este programa"
#: core/templates/navigation.html:151 core/templates/template_features.html:83
-#: software/templates/contribute.html:6
-msgid "Contribute!"
-msgstr "¡Contribuye!"
-
-#: core/templates/navigation.html:152
-msgid "Problems and wishes"
-msgstr "Problemas y deseos"
+#: software/templates/about_us.html:5
+msgid "About us"
+msgstr "Sobre nosotros"
-#: core/templates/navigation.html:155 software/templates/features.html:209
+#: core/templates/navigation.html:153 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:156 software/templates/license.html:7
-#: utils/models.py:40
+#: core/templates/navigation.html:157 utils/models.py:40
msgid "License"
msgstr "Licencia"
-#: core/templates/navigation.html:160
+#: core/templates/navigation.html:163
msgid "Developer documentation"
msgstr "Documentación para desarrolladores"
-#: core/templates/navigation.html:166 software/templates/contribute.html:59
+#: core/templates/navigation.html:169
msgid "Get the code"
msgstr "Código fuente"
-#: core/templates/navigation.html:172 core/templates/template.html:193
-#: core/templates/template_features.html:103
-#: software/templates/contribute.html:43 software/templates/contribute.html:50
+#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/template_features.html:100
msgid "Translate"
msgstr "Traduce"
-#: core/templates/navigation.html:193 core/templates/user/login.html:28
+#: core/templates/navigation.html:196 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Restablecer la contraseña"
-#: core/templates/navigation.html:206
+#: core/templates/navigation.html:209
msgid "My preferences"
msgstr "Mis preferencias"
-#: core/templates/navigation.html:213
+#: core/templates/navigation.html:216
msgid "Logout"
msgstr "Cerrar sesión"
-#: core/templates/navigation.html:228
+#: core/templates/navigation.html:231
msgid "Licenses"
msgstr "Licencias"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:234
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Unidades de repetición"
-#: core/templates/navigation.html:234 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Unidades de peso"
-#: core/templates/navigation.html:237 core/templates/user/list.html:4
+#: core/templates/navigation.html:240 core/templates/user/list.html:4
msgid "User list"
msgstr "Lista de usuarios"
-#: core/templates/navigation.html:238
+#: core/templates/navigation.html:241
msgid "Gyms"
msgstr "Gimnasios"
@@ -1235,18 +1147,12 @@ msgstr ""
msgid "Create some demo entries"
msgstr "Crear datos de ejemplo"
-#: core/templates/template.html:201 core/templates/template_features.html:121
-#: core/templates/template_no_context.html:88
-msgid "About"
-msgstr "Aviso legal"
-
-#: core/templates/template.html:202 core/templates/template_features.html:125
+#: core/templates/template.html:202 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Términos de servicio"
#: core/templates/template.html:209 core/templates/template.html:210
-#: software/templates/license.html:18 software/templates/license.html:19
msgid "Released under the Affero GPL"
msgstr "Disponible bajo la Affero GPL"
@@ -1607,15 +1513,15 @@ msgstr ""
msgid "Rest day"
msgstr "Día de descanso"
-#: core/views/misc.py:199
+#: core/views/misc.py:184
msgid "Feedback"
msgstr "Comentarios"
-#: core/views/misc.py:218 weight/templates/import_csv_form.html:9
+#: core/views/misc.py:203 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Enviar"
-#: core/views/misc.py:226
+#: core/views/misc.py:211
msgid "Your feedback was successfully sent. Thank you!"
msgstr "Tu comentario ha sido enviado con éxito, ¡gracias!"
@@ -1789,7 +1695,6 @@ msgstr "nombre del ejercicio"
#: exercises/templates/exercise/overview.html:118
#: exercises/templates/muscles/overview.html:114
#: nutrition/templates/ingredient/overview.html:85
-#: software/templates/contribute.html:39
msgid "Only registered users can do this"
msgstr "Sólo usuarios registrados pueden hacer esto"
@@ -2002,7 +1907,7 @@ msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246 software/templates/contribute.html:37
+#: exercises/views/exercises.py:246
msgid "Add exercise"
msgstr "Añadir ejercicio"
@@ -3748,108 +3653,55 @@ msgstr "Añadir una unidad de peso"
msgid "Edit a weight unit to ingredient connection"
msgstr "Editar una conexión unidad de peso - ingrediente"
-#: software/templates/contribute.html:9
+#: software/templates/about_us.html:9
msgid ""
-"wger Workout Manager is build by volunteers,\n"
-"the development process is open and freely accessible to anybody "
-"interested.\n"
-"If you are new to the free software world, we recommend to take a\n"
-"look <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
-"article</a> which summarizes they way open source projects work very well. "
-msgstr ""
-"wger Workout Manager está hecho por voluntarios, el proceso de desarollo es "
-"abierto y es accesible a cualquiera que se interese. Si eres nuevo al mundo "
-"del software libre, te recomendamos que leas <a href=\"http://schlitt.info/"
-"opensource/blog/0541_10_golden_rules_for_starting_with_open_source.html"
-"\">este artículo</a> que resume muy bien como funcionan los proyectos de "
-"código abierto."
-
-#: software/templates/contribute.html:16
-msgid ""
-"Any kind of contribution is appreciated and welcome.\n"
-"Use this opportunity and influence the direction of the\n"
-"project. "
+"Thank you for using wger! wger is a collaborative open source project, made "
+"by fitness enthusiasts from around the world."
+msgstr ""
+
+#: software/templates/about_us.html:18
+msgid "Source code"
msgstr ""
-"Cualquier tipo de contribución es apreciada y bienvenida. Usa esta "
-"oportunidad e influencia la dirección del proyecto."
-#: software/templates/contribute.html:23
-msgid "Use the site"
-msgstr "Usa la página"
+#: software/templates/about_us.html:20
+msgid "Get the source code of this application and its server on github"
+msgstr ""
-#: software/templates/contribute.html:24
-msgid ""
-"Simply use the site and tell your friends\n"
-"how useful it is! ;) . When you find something that you specially liked,\n"
-"could need some improvements or just doesn't work, tell us! This might not "
-"sound\n"
-"like much, but is incredibly important!"
-msgstr ""
-"Simplemente usa la página y dile a tus amigos lo útil que es ;) .\n"
-"Si encuentras algo que te haya gustado especialmente, pueda ser mejorado y "
-"no funcione,\n"
-"¡dínoslo! Esto parece que no es mucho, pero es increíblemente importante."
-
-#: software/templates/contribute.html:31
-msgid "Submit exercises"
-msgstr "Añade ejercicios"
-
-#: software/templates/contribute.html:32
+#: software/templates/about_us.html:25
+msgid "Have a problem or idea?"
+msgstr ""
+
+#: software/templates/about_us.html:27
msgid ""
-"Submit those cool exercises that you absolutely\n"
-"love and do every week but are not in the list yet. If you think some "
-"description\n"
-"is too short or some other detail is missing or could be improved, tell!"
+"Get in touch if something didn't behave as expected or if there is a feature "
+"that you feel is missing."
+msgstr ""
+
+#: software/templates/about_us.html:32
+msgid "Say hi!"
+msgstr ""
+
+#: software/templates/about_us.html:34
+msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
-"Añade esos ejercicios que te encantan y haces cada semana pero todavía no "
-"están en la lista.\n"
-"Si crees que la descripción tiene errores o puede ser mejorada, ¡dinoslo!"
-#: software/templates/contribute.html:44
+#: software/templates/about_us.html:39
#, fuzzy
-#| msgid ""
-#| "Do you want to use wger in your own language?\n"
-#| "Do you think the current translation could be improved?\n"
-#| "The translations are easily managed and edited online, if you are "
-#| "interested,\n"
-#| "go to the transifex site, request access and we will set everything\n"
-#| "up. "
-msgid ""
-"Do you want to use wger in your own language?\n"
-"Do you think the current translation could be improved?\n"
-"The translations are easily managed and edited online, if you are "
-"interested,\n"
-"visit the link and start translating."
-msgstr ""
-"¿Quieres usar wger en tu idioma? ¿Crees que la traducción actual puede ser "
-"mejorada?\n"
-"Las traducciones se hacen confortablemente online, si tienes interés, ve a "
-"la página de transifex,\n"
-"pide accesso y te pondremos todo lo que necesites."
-
-#: software/templates/contribute.html:53
-msgid "Code"
-msgstr "Código"
-
-#: software/templates/contribute.html:54
+#| msgid "Translate"
+msgid "Translation"
+msgstr "Traduce"
+
+#: software/templates/about_us.html:41
msgid ""
-"Obviously, you are highly encouraged to clone the\n"
-"repo and start hacking! Once you are ready, send a pull request and we\n"
-"will show the world. Take a look at the developer guide for more details\n"
-"on this."
-msgstr ""
-"¡Obviamente estás animado a hacer una copia del repositorio y empezar a "
-"programar!\n"
-"Una vez que hayas terminado, manda un pull request. Héchale un vistazo a la "
-"guía para\n"
-"programadores para más detalles."
-
-#: software/templates/contribute.html:66
+"This application is translated on weblate. If you also want to help, click "
+"the link and start translating"
+msgstr ""
+
+#: software/templates/about_us.html:50
msgid "Our goal"
msgstr "Nuestro objetivo"
-#: software/templates/contribute.html:69
+#: software/templates/about_us.html:53
msgid ""
"The goal is to build an awesome\n"
"and flexible fitness manager, along with a comprehensive and complete list "
@@ -3997,107 +3849,6 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr "100%% Libre <br>y <br>Open Source"
-#: software/templates/issues.html:6
-msgid "Reporting a problem"
-msgstr "Informar sobre un problema"
-
-#: software/templates/issues.html:10
-msgid ""
-"\n"
-"No software is perfect. For some severe errors, an email will be "
-"automatically sent, but\n"
-"not always, so I depend on you reporting everything that didn't behave as "
-"expected.\n"
-"Please describe in as much detail as you can what you were doing when the "
-"error\n"
-"happened.\n"
-msgstr ""
-"\n"
-"Ningún programa es perfecto. Para algunos errores graves, un email es "
-"enviado automáticamente, pero\n"
-"no siempre, asi que dependo de ti para avisarme si algo no funciona como "
-"debería.\n"
-"Por favor, describe con tanto detalle como puedas lo que hiciste cuando "
-"ocurrió el \n"
-"error.\n"
-
-#: software/templates/issues.html:21
-msgid "report problem to the issue tracker"
-msgstr "informar sobre un problema en el gestor de incidencias"
-
-#: software/templates/issues.html:25
-msgid "Enhancements"
-msgstr "Mejoras"
-
-#: software/templates/issues.html:27
-msgid ""
-"\n"
-"The issue tracker can also be used to document enhancements to the "
-"software.\n"
-"If you have some suggestions or think a feature is missing, feel\n"
-"free to open a ticket. This can be anything from a slight change to a whole\n"
-"new section of the site. Please keep in mind that not all wishes can be\n"
-"implemented."
-msgstr ""
-"\n"
-"El gestor de incidencias también puede ser usado para documentar mejoras "
-"del\n"
-"programa. Si tienes una sugestión o crees que hay alguna función que falta, "
-"no\n"
-"dudes en abrir una incidencia. Esto puede ser cualquier cosa desde un "
-"cambio\n"
-"pequeño hasta una sección nueva. Por favor, ten en cuenta que no todos los\n"
-"cambios se pueden implementar."
-
-#: software/templates/issues.html:36
-msgid "report wish to the issue tracker"
-msgstr "informar sobre un deseo en el gestor de incidencias"
-
-#: software/templates/issues.html:41
-msgid "No Github account?"
-msgstr "¿No tienes cuenta en github?"
-
-#: software/templates/issues.html:42
-msgid ""
-"Filing an issue requires a github account, if you don't\n"
-"have one and don't want to register, you can also send it to\n"
-"<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
-msgstr ""
-"Crear una incidencia requiere una cuenta en github. Si no tienes una y no "
-"quieres\n"
-"registrarte, puedes hacerlo también a través de la\n"
-"<a href=\"https://groups.google.com/group/wger\">lista de correo</a>."
-
-#: software/templates/license.html:10
-msgid ""
-"wger Workout Manager is Free/Libre Open Source\n"
-"Software (FLOSS)."
-msgstr ""
-"wger Workout Manager es Software Libre (Free/Libre Open Source\n"
-"Software - FLOSS)."
-
-#: software/templates/license.html:22
-msgid ""
-"wger Workout Manager is released under the <strong>Affero GNU\n"
-"General Public License (AGPL) Version 3+</strong> and can (under the "
-"conditions\n"
-"of the license) be used, modified and distributed (also with modifications)\n"
-"without restrictions."
-msgstr ""
-"wger Workout Manager está distribuido bajo la <strong>Affero GNU\n"
-"General Public License (AGPL) versión 3+</strong> y puede (bajo las "
-"condiciones\n"
-"de la licencia) ser usado, modificado y distribuido (también con "
-"modificaciones)\n"
-"sin restricciones."
-
-#: software/templates/license.html:29
-msgid ""
-"A copy the license text is contained in every wger Workout\n"
-"Manager release (LICENSE.txt) and can be read online on the website of\n"
-"<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</a>."
-msgstr ""
-
#: utils/generic_views.py:261
msgid "Yes, delete"
msgstr "Sí, eliminar"
@@ -4278,6 +4029,251 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Responsible for the content of this site as per German law §5 TMG:"
+#~ msgstr ""
+#~ "Responsable del contenido de esta página según la ley alemana §5 TMG:"
+
+#~ msgid "GNUPG-Key:"
+#~ msgstr "Llave de GNUPG:"
+
+#~ msgid "Get in touch"
+#~ msgstr "Contactar"
+
+#~ msgid ""
+#~ "If you want to further help and improve this project,\n"
+#~ "you might also be interested <a href=\"%(contribute)s\">in contributing</"
+#~ "a>."
+#~ msgstr ""
+#~ "Si quieres además ayudar y mejorar este proyecto, a lo mejor estás "
+#~ "interesado <a href=\"%(contribute)s\">en contribuir</a>."
+
+#~ msgid "Feedback form"
+#~ msgstr "Formulário de sugerencias"
+
+#~ msgid ""
+#~ "A simple contact form. Remember that\n"
+#~ "if you want an answer, you need to include some way to contact you."
+#~ msgstr ""
+#~ "Un simple formulario para contactos. Acuérdate de poner alguna forma de "
+#~ "contactarte, si quieres recibir una respuesta."
+
+#~ msgid "Twitter"
+#~ msgstr "Twitter"
+
+#~ msgid ""
+#~ "We are also on twitter. Write us and tell us what\n"
+#~ "you think! Except patches, don't send patches via twitter."
+#~ msgstr ""
+#~ "También estamos en twitter. Escríbenos y dínos lo que piensas.\n"
+#~ "Excepto parches, no nos mandes parches por twitter."
+
+#~ msgid "Discord"
+#~ msgstr "Discord"
+
+#~ msgid ""
+#~ "Use the public group to get support for your\n"
+#~ "local wger installation, discuss issues or your new idea, etc.\n"
+#~ "(no registration needed)"
+#~ msgstr ""
+#~ "Usa el grupo público para obtener ayuda para tu instalación local de "
+#~ "wger, discutir problemas o nuevas ideas, etc. (no es necesario "
+#~ "registrarse)."
+
+#~ msgid "Open feedback form"
+#~ msgstr "Abre formulário de sugerencias"
+
+#~ msgid "tweet to @wger_project"
+#~ msgstr "tweet a @wger_project"
+
+#~ msgid "Go to the discord server"
+#~ msgstr "Ir a servidor de discord"
+
+#~ msgid "Contribute!"
+#~ msgstr "¡Contribuye!"
+
+#~ msgid "Problems and wishes"
+#~ msgstr "Problemas y deseos"
+
+#~ msgid "About"
+#~ msgstr "Aviso legal"
+
+#~ msgid ""
+#~ "wger Workout Manager is build by volunteers,\n"
+#~ "the development process is open and freely accessible to anybody "
+#~ "interested.\n"
+#~ "If you are new to the free software world, we recommend to take a\n"
+#~ "look <a href=\"http://schlitt.info/opensource/"
+#~ "blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
+#~ "article</a> which summarizes they way open source projects work very "
+#~ "well. "
+#~ msgstr ""
+#~ "wger Workout Manager está hecho por voluntarios, el proceso de desarollo "
+#~ "es abierto y es accesible a cualquiera que se interese. Si eres nuevo al "
+#~ "mundo del software libre, te recomendamos que leas <a href=\"http://"
+#~ "schlitt.info/opensource/"
+#~ "blog/0541_10_golden_rules_for_starting_with_open_source.html\">este "
+#~ "artículo</a> que resume muy bien como funcionan los proyectos de código "
+#~ "abierto."
+
+#~ msgid ""
+#~ "Any kind of contribution is appreciated and welcome.\n"
+#~ "Use this opportunity and influence the direction of the\n"
+#~ "project. "
+#~ msgstr ""
+#~ "Cualquier tipo de contribución es apreciada y bienvenida. Usa esta "
+#~ "oportunidad e influencia la dirección del proyecto."
+
+#~ msgid "Use the site"
+#~ msgstr "Usa la página"
+
+#~ msgid ""
+#~ "Simply use the site and tell your friends\n"
+#~ "how useful it is! ;) . When you find something that you specially liked,\n"
+#~ "could need some improvements or just doesn't work, tell us! This might "
+#~ "not sound\n"
+#~ "like much, but is incredibly important!"
+#~ msgstr ""
+#~ "Simplemente usa la página y dile a tus amigos lo útil que es ;) .\n"
+#~ "Si encuentras algo que te haya gustado especialmente, pueda ser mejorado "
+#~ "y no funcione,\n"
+#~ "¡dínoslo! Esto parece que no es mucho, pero es increíblemente importante."
+
+#~ msgid "Submit exercises"
+#~ msgstr "Añade ejercicios"
+
+#~ msgid ""
+#~ "Submit those cool exercises that you absolutely\n"
+#~ "love and do every week but are not in the list yet. If you think some "
+#~ "description\n"
+#~ "is too short or some other detail is missing or could be improved, tell!"
+#~ msgstr ""
+#~ "Añade esos ejercicios que te encantan y haces cada semana pero todavía no "
+#~ "están en la lista.\n"
+#~ "Si crees que la descripción tiene errores o puede ser mejorada, ¡dinoslo!"
+
+#, fuzzy
+#~| msgid ""
+#~| "Do you want to use wger in your own language?\n"
+#~| "Do you think the current translation could be improved?\n"
+#~| "The translations are easily managed and edited online, if you are "
+#~| "interested,\n"
+#~| "go to the transifex site, request access and we will set everything\n"
+#~| "up. "
+#~ msgid ""
+#~ "Do you want to use wger in your own language?\n"
+#~ "Do you think the current translation could be improved?\n"
+#~ "The translations are easily managed and edited online, if you are "
+#~ "interested,\n"
+#~ "visit the link and start translating."
+#~ msgstr ""
+#~ "¿Quieres usar wger en tu idioma? ¿Crees que la traducción actual puede "
+#~ "ser mejorada?\n"
+#~ "Las traducciones se hacen confortablemente online, si tienes interés, ve "
+#~ "a la página de transifex,\n"
+#~ "pide accesso y te pondremos todo lo que necesites."
+
+#~ msgid "Code"
+#~ msgstr "Código"
+
+#~ msgid ""
+#~ "Obviously, you are highly encouraged to clone the\n"
+#~ "repo and start hacking! Once you are ready, send a pull request and we\n"
+#~ "will show the world. Take a look at the developer guide for more details\n"
+#~ "on this."
+#~ msgstr ""
+#~ "¡Obviamente estás animado a hacer una copia del repositorio y empezar a "
+#~ "programar!\n"
+#~ "Una vez que hayas terminado, manda un pull request. Héchale un vistazo a "
+#~ "la guía para\n"
+#~ "programadores para más detalles."
+
+#~ msgid "Reporting a problem"
+#~ msgstr "Informar sobre un problema"
+
+#~ msgid ""
+#~ "\n"
+#~ "No software is perfect. For some severe errors, an email will be "
+#~ "automatically sent, but\n"
+#~ "not always, so I depend on you reporting everything that didn't behave as "
+#~ "expected.\n"
+#~ "Please describe in as much detail as you can what you were doing when the "
+#~ "error\n"
+#~ "happened.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Ningún programa es perfecto. Para algunos errores graves, un email es "
+#~ "enviado automáticamente, pero\n"
+#~ "no siempre, asi que dependo de ti para avisarme si algo no funciona como "
+#~ "debería.\n"
+#~ "Por favor, describe con tanto detalle como puedas lo que hiciste cuando "
+#~ "ocurrió el \n"
+#~ "error.\n"
+
+#~ msgid "report problem to the issue tracker"
+#~ msgstr "informar sobre un problema en el gestor de incidencias"
+
+#~ msgid "Enhancements"
+#~ msgstr "Mejoras"
+
+#~ msgid ""
+#~ "\n"
+#~ "The issue tracker can also be used to document enhancements to the "
+#~ "software.\n"
+#~ "If you have some suggestions or think a feature is missing, feel\n"
+#~ "free to open a ticket. This can be anything from a slight change to a "
+#~ "whole\n"
+#~ "new section of the site. Please keep in mind that not all wishes can be\n"
+#~ "implemented."
+#~ msgstr ""
+#~ "\n"
+#~ "El gestor de incidencias también puede ser usado para documentar mejoras "
+#~ "del\n"
+#~ "programa. Si tienes una sugestión o crees que hay alguna función que "
+#~ "falta, no\n"
+#~ "dudes en abrir una incidencia. Esto puede ser cualquier cosa desde un "
+#~ "cambio\n"
+#~ "pequeño hasta una sección nueva. Por favor, ten en cuenta que no todos "
+#~ "los\n"
+#~ "cambios se pueden implementar."
+
+#~ msgid "report wish to the issue tracker"
+#~ msgstr "informar sobre un deseo en el gestor de incidencias"
+
+#~ msgid "No Github account?"
+#~ msgstr "¿No tienes cuenta en github?"
+
+#~ msgid ""
+#~ "Filing an issue requires a github account, if you don't\n"
+#~ "have one and don't want to register, you can also send it to\n"
+#~ "<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
+#~ msgstr ""
+#~ "Crear una incidencia requiere una cuenta en github. Si no tienes una y no "
+#~ "quieres\n"
+#~ "registrarte, puedes hacerlo también a través de la\n"
+#~ "<a href=\"https://groups.google.com/group/wger\">lista de correo</a>."
+
+#~ msgid ""
+#~ "wger Workout Manager is Free/Libre Open Source\n"
+#~ "Software (FLOSS)."
+#~ msgstr ""
+#~ "wger Workout Manager es Software Libre (Free/Libre Open Source\n"
+#~ "Software - FLOSS)."
+
+#~ msgid ""
+#~ "wger Workout Manager is released under the <strong>Affero GNU\n"
+#~ "General Public License (AGPL) Version 3+</strong> and can (under the "
+#~ "conditions\n"
+#~ "of the license) be used, modified and distributed (also with "
+#~ "modifications)\n"
+#~ "without restrictions."
+#~ msgstr ""
+#~ "wger Workout Manager está distribuido bajo la <strong>Affero GNU\n"
+#~ "General Public License (AGPL) versión 3+</strong> y puede (bajo las "
+#~ "condiciones\n"
+#~ "de la licencia) ser usado, modificado y distribuido (también con "
+#~ "modificaciones)\n"
+#~ "sin restricciones."
+
#~ msgid "Use pauses in workout timer"
#~ msgstr "Usar pausas en el timer de entrenamiento"
diff --git a/wger/locale/fa/LC_MESSAGES/django.po b/wger/locale/fa/LC_MESSAGES/django.po
index 0f9bd60f5..71d28a824 100644
--- a/wger/locale/fa/LC_MESSAGES/django.po
+++ b/wger/locale/fa/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-17 15:00+0200\n"
+"POT-Creation-Date: 2021-08-17 17:23+0200\n"
"PO-Revision-Date: 2021-04-15 07:27+0000\n"
"Last-Translator: Allan Nordhøy <[email protected]>\n"
"Language-Team: Persian <https://hosted.weblate.org/projects/wger/web/fa/>\n"
@@ -42,7 +42,7 @@ msgstr "تمرینات"
msgid "Ingredients"
msgstr "دستور تهیه"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:225
+#: config/templates/language/overview.html:4 core/templates/navigation.html:228
msgid "Languages"
msgstr "زبان ها"
@@ -218,8 +218,8 @@ msgstr "برنامه تمرین من"
msgid "Empty placeholder schedule"
msgstr "برنامه خالی"
-#: core/forms.py:61 core/templates/navigation.html:187
-#: core/templates/navigation.html:191 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:190
+#: core/templates/navigation.html:194 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "ورود"
@@ -296,8 +296,8 @@ msgstr "پسورد نامعتبر"
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:187
-#: core/templates/navigation.html:192 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
+#: core/templates/navigation.html:195 core/templates/template.html:150
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -778,84 +778,10 @@ msgstr "لیست مجوز ها"
msgid "Nothing found"
msgstr "چیزی یافت نشد"
-#: core/templates/misc/about.html:4
-msgid "About us"
-msgstr "درباره ما"
-
-#: core/templates/misc/about.html:8
-msgid "Responsible for the content of this site as per German law §5 TMG:"
-msgstr ""
-
-#: core/templates/misc/about.html:16
-msgid "GNUPG-Key:"
-msgstr "GNUPG-Key:"
-
-#: core/templates/misc/contact.html:4 core/templates/navigation.html:153
-#: core/templates/template_features.html:86
-#: software/templates/contribute.html:28
-msgid "Get in touch"
-msgstr "در ارتباط باشید"
-
-#: core/templates/misc/contact.html:10
-#, python-format
-msgid ""
-"Thank you for your interest. Feel free to use any of the\n"
-"ways below to send feedback you have about any aspect of the site. For\n"
-"support, say hi\n"
-"<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
-"a bug, consider doing it through the <a href=\"%(issues)s\">issue tracker</"
-"a>\n"
-"."
-msgstr ""
-
-#: core/templates/misc/contact.html:20
-#, python-format
-msgid ""
-"If you want to further help and improve this project,\n"
-"you might also be interested <a href=\"%(contribute)s\">in contributing</a>."
-msgstr ""
-
-#: core/templates/misc/contact.html:29
-msgid "Feedback form"
-msgstr "فرم بازخورد"
-
-#: core/templates/misc/contact.html:30
-msgid ""
-"A simple contact form. Remember that\n"
-"if you want an answer, you need to include some way to contact you."
-msgstr ""
-
-#: core/templates/misc/contact.html:35
-msgid "Twitter"
-msgstr "توئیتر"
-
-#: core/templates/misc/contact.html:36
-msgid ""
-"We are also on twitter. Write us and tell us what\n"
-"you think! Except patches, don't send patches via twitter."
-msgstr ""
-
-#: core/templates/misc/contact.html:42
-msgid "Discord"
-msgstr ""
-
-#: core/templates/misc/contact.html:43
-msgid ""
-"Use the public group to get support for your\n"
-"local wger installation, discuss issues or your new idea, etc.\n"
-"(no registration needed)"
-msgstr ""
-
-#: core/templates/misc/contact.html:49
-msgid "Open feedback form"
-msgstr "فرم بازخورد باز شود"
-
-#: core/templates/misc/contact.html:53
-msgid "tweet to @wger_project"
-msgstr ""
-
-#: core/templates/misc/contact.html:56
-msgid "Go to the discord server"
+#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/template_features.html:118
+#: core/templates/template_no_context.html:88
+msgid "Imprint"
msgstr ""
#: core/templates/misc/fragments/shariff_modal.html:6
@@ -943,7 +869,7 @@ msgid "Add new exercise"
msgstr ""
#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:223
+#: core/templates/navigation.html:226
msgid "Administration"
msgstr ""
@@ -1010,68 +936,62 @@ msgid "About this software"
msgstr ""
#: core/templates/navigation.html:151 core/templates/template_features.html:83
-#: software/templates/contribute.html:6
-msgid "Contribute!"
-msgstr ""
-
-#: core/templates/navigation.html:152
-msgid "Problems and wishes"
-msgstr ""
+#: software/templates/about_us.html:5
+msgid "About us"
+msgstr "درباره ما"
-#: core/templates/navigation.html:155 software/templates/features.html:209
+#: core/templates/navigation.html:153 software/templates/features.html:209
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:156 software/templates/license.html:7
-#: utils/models.py:40
+#: core/templates/navigation.html:157 utils/models.py:40
msgid "License"
msgstr ""
-#: core/templates/navigation.html:160
+#: core/templates/navigation.html:163
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:166 software/templates/contribute.html:59
+#: core/templates/navigation.html:169
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:172 core/templates/template.html:193
-#: core/templates/template_features.html:103
-#: software/templates/contribute.html:43 software/templates/contribute.html:50
+#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/template_features.html:100
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:193 core/templates/user/login.html:28
+#: core/templates/navigation.html:196 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:206
+#: core/templates/navigation.html:209
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:213
+#: core/templates/navigation.html:216
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:228
+#: core/templates/navigation.html:231
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:234
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:234 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:237 core/templates/user/list.html:4
+#: core/templates/navigation.html:240 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:238
+#: core/templates/navigation.html:241
msgid "Gyms"
msgstr ""
@@ -1187,18 +1107,12 @@ msgstr ""
msgid "Create some demo entries"
msgstr "چند نمونه پر کنید"
-#: core/templates/template.html:201 core/templates/template_features.html:121
-#: core/templates/template_no_context.html:88
-msgid "About"
-msgstr ""
-
-#: core/templates/template.html:202 core/templates/template_features.html:125
+#: core/templates/template.html:202 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
#: core/templates/template.html:209 core/templates/template.html:210
-#: software/templates/license.html:18 software/templates/license.html:19
msgid "Released under the Affero GPL"
msgstr ""
@@ -1546,15 +1460,15 @@ msgstr ""
msgid "Rest day"
msgstr ""
-#: core/views/misc.py:199
+#: core/views/misc.py:184
msgid "Feedback"
msgstr ""
-#: core/views/misc.py:218 weight/templates/import_csv_form.html:9
+#: core/views/misc.py:203 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr ""
-#: core/views/misc.py:226
+#: core/views/misc.py:211
msgid "Your feedback was successfully sent. Thank you!"
msgstr ""
@@ -1723,7 +1637,6 @@ msgstr ""
#: exercises/templates/exercise/overview.html:118
#: exercises/templates/muscles/overview.html:114
#: nutrition/templates/ingredient/overview.html:85
-#: software/templates/contribute.html:39
msgid "Only registered users can do this"
msgstr ""
@@ -1917,7 +1830,7 @@ msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246 software/templates/contribute.html:37
+#: exercises/views/exercises.py:246
msgid "Add exercise"
msgstr ""
@@ -3549,75 +3462,53 @@ msgstr ""
msgid "Edit a weight unit to ingredient connection"
msgstr ""
-#: software/templates/contribute.html:9
+#: software/templates/about_us.html:9
msgid ""
-"wger Workout Manager is build by volunteers,\n"
-"the development process is open and freely accessible to anybody "
-"interested.\n"
-"If you are new to the free software world, we recommend to take a\n"
-"look <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
-"article</a> which summarizes they way open source projects work very well. "
+"Thank you for using wger! wger is a collaborative open source project, made "
+"by fitness enthusiasts from around the world."
msgstr ""
-#: software/templates/contribute.html:16
-msgid ""
-"Any kind of contribution is appreciated and welcome.\n"
-"Use this opportunity and influence the direction of the\n"
-"project. "
+#: software/templates/about_us.html:18
+msgid "Source code"
msgstr ""
-#: software/templates/contribute.html:23
-msgid "Use the site"
+#: software/templates/about_us.html:20
+msgid "Get the source code of this application and its server on github"
msgstr ""
-#: software/templates/contribute.html:24
-msgid ""
-"Simply use the site and tell your friends\n"
-"how useful it is! ;) . When you find something that you specially liked,\n"
-"could need some improvements or just doesn't work, tell us! This might not "
-"sound\n"
-"like much, but is incredibly important!"
+#: software/templates/about_us.html:25
+msgid "Have a problem or idea?"
msgstr ""
-#: software/templates/contribute.html:31
-msgid "Submit exercises"
+#: software/templates/about_us.html:27
+msgid ""
+"Get in touch if something didn't behave as expected or if there is a feature "
+"that you feel is missing."
msgstr ""
-#: software/templates/contribute.html:32
-msgid ""
-"Submit those cool exercises that you absolutely\n"
-"love and do every week but are not in the list yet. If you think some "
-"description\n"
-"is too short or some other detail is missing or could be improved, tell!"
+#: software/templates/about_us.html:32
+msgid "Say hi!"
msgstr ""
-#: software/templates/contribute.html:44
-msgid ""
-"Do you want to use wger in your own language?\n"
-"Do you think the current translation could be improved?\n"
-"The translations are easily managed and edited online, if you are "
-"interested,\n"
-"visit the link and start translating."
+#: software/templates/about_us.html:34
+msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
-#: software/templates/contribute.html:53
-msgid "Code"
+#: software/templates/about_us.html:39
+msgid "Translation"
msgstr ""
-#: software/templates/contribute.html:54
+#: software/templates/about_us.html:41
msgid ""
-"Obviously, you are highly encouraged to clone the\n"
-"repo and start hacking! Once you are ready, send a pull request and we\n"
-"will show the world. Take a look at the developer guide for more details\n"
-"on this."
+"This application is translated on weblate. If you also want to help, click "
+"the link and start translating"
msgstr ""
-#: software/templates/contribute.html:66
+#: software/templates/about_us.html:50
msgid "Our goal"
msgstr ""
-#: software/templates/contribute.html:69
+#: software/templates/about_us.html:53
msgid ""
"The goal is to build an awesome\n"
"and flexible fitness manager, along with a comprehensive and complete list "
@@ -3752,78 +3643,6 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr ""
-#: software/templates/issues.html:6
-msgid "Reporting a problem"
-msgstr ""
-
-#: software/templates/issues.html:10
-msgid ""
-"\n"
-"No software is perfect. For some severe errors, an email will be "
-"automatically sent, but\n"
-"not always, so I depend on you reporting everything that didn't behave as "
-"expected.\n"
-"Please describe in as much detail as you can what you were doing when the "
-"error\n"
-"happened.\n"
-msgstr ""
-
-#: software/templates/issues.html:21
-msgid "report problem to the issue tracker"
-msgstr ""
-
-#: software/templates/issues.html:25
-msgid "Enhancements"
-msgstr ""
-
-#: software/templates/issues.html:27
-msgid ""
-"\n"
-"The issue tracker can also be used to document enhancements to the "
-"software.\n"
-"If you have some suggestions or think a feature is missing, feel\n"
-"free to open a ticket. This can be anything from a slight change to a whole\n"
-"new section of the site. Please keep in mind that not all wishes can be\n"
-"implemented."
-msgstr ""
-
-#: software/templates/issues.html:36
-msgid "report wish to the issue tracker"
-msgstr ""
-
-#: software/templates/issues.html:41
-msgid "No Github account?"
-msgstr ""
-
-#: software/templates/issues.html:42
-msgid ""
-"Filing an issue requires a github account, if you don't\n"
-"have one and don't want to register, you can also send it to\n"
-"<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
-msgstr ""
-
-#: software/templates/license.html:10
-msgid ""
-"wger Workout Manager is Free/Libre Open Source\n"
-"Software (FLOSS)."
-msgstr ""
-
-#: software/templates/license.html:22
-msgid ""
-"wger Workout Manager is released under the <strong>Affero GNU\n"
-"General Public License (AGPL) Version 3+</strong> and can (under the "
-"conditions\n"
-"of the license) be used, modified and distributed (also with modifications)\n"
-"without restrictions."
-msgstr ""
-
-#: software/templates/license.html:29
-msgid ""
-"A copy the license text is contained in every wger Workout\n"
-"Manager release (LICENSE.txt) and can be read online on the website of\n"
-"<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</a>."
-msgstr ""
-
#: utils/generic_views.py:261
msgid "Yes, delete"
msgstr "بله، حذف"
@@ -3986,3 +3805,18 @@ msgstr ""
#, python-format
msgid "Delete weight entry for the %s"
msgstr ""
+
+#~ msgid "GNUPG-Key:"
+#~ msgstr "GNUPG-Key:"
+
+#~ msgid "Get in touch"
+#~ msgstr "در ارتباط باشید"
+
+#~ msgid "Feedback form"
+#~ msgstr "فرم بازخورد"
+
+#~ msgid "Twitter"
+#~ msgstr "توئیتر"
+
+#~ msgid "Open feedback form"
+#~ msgstr "فرم بازخورد باز شود"
diff --git a/wger/locale/fi/LC_MESSAGES/django.po b/wger/locale/fi/LC_MESSAGES/django.po
index 294783dc5..612dad49c 100644
--- a/wger/locale/fi/LC_MESSAGES/django.po
+++ b/wger/locale/fi/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-17 15:00+0200\n"
+"POT-Creation-Date: 2021-08-17 17:23+0200\n"
"PO-Revision-Date: 2021-05-09 09:11+0000\n"
"Last-Translator: J. Lavoie <[email protected]>\n"
"Language-Team: Finnish <https://hosted.weblate.org/projects/wger/web/fi/>\n"
@@ -42,7 +42,7 @@ msgstr "Harjoitukset"
msgid "Ingredients"
msgstr "Raaka-aineet"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:225
+#: config/templates/language/overview.html:4 core/templates/navigation.html:228
msgid "Languages"
msgstr "Kielet"
@@ -218,8 +218,8 @@ msgstr "Minun hieno harjoitusohjelmani"
msgid "Empty placeholder schedule"
msgstr "Tyhjä tilanvaraaja-aikataulu"
-#: core/forms.py:61 core/templates/navigation.html:187
-#: core/templates/navigation.html:191 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:190
+#: core/templates/navigation.html:194 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Kirjaudu sisään"
@@ -300,8 +300,8 @@ msgstr "Väärä salasana"
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:187
-#: core/templates/navigation.html:192 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
+#: core/templates/navigation.html:195 core/templates/template.html:150
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -780,84 +780,10 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4
-msgid "About us"
-msgstr "Meistä"
-
-#: core/templates/misc/about.html:8
-msgid "Responsible for the content of this site as per German law §5 TMG:"
-msgstr ""
-
-#: core/templates/misc/about.html:16
-msgid "GNUPG-Key:"
-msgstr "GnuPG-avain:"
-
-#: core/templates/misc/contact.html:4 core/templates/navigation.html:153
-#: core/templates/template_features.html:86
-#: software/templates/contribute.html:28
-msgid "Get in touch"
-msgstr ""
-
-#: core/templates/misc/contact.html:10
-#, python-format
-msgid ""
-"Thank you for your interest. Feel free to use any of the\n"
-"ways below to send feedback you have about any aspect of the site. For\n"
-"support, say hi\n"
-"<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
-"a bug, consider doing it through the <a href=\"%(issues)s\">issue tracker</"
-"a>\n"
-"."
-msgstr ""
-
-#: core/templates/misc/contact.html:20
-#, python-format
-msgid ""
-"If you want to further help and improve this project,\n"
-"you might also be interested <a href=\"%(contribute)s\">in contributing</a>."
-msgstr ""
-
-#: core/templates/misc/contact.html:29
-msgid "Feedback form"
-msgstr ""
-
-#: core/templates/misc/contact.html:30
-msgid ""
-"A simple contact form. Remember that\n"
-"if you want an answer, you need to include some way to contact you."
-msgstr ""
-
-#: core/templates/misc/contact.html:35
-msgid "Twitter"
-msgstr "Twitter"
-
-#: core/templates/misc/contact.html:36
-msgid ""
-"We are also on twitter. Write us and tell us what\n"
-"you think! Except patches, don't send patches via twitter."
-msgstr ""
-
-#: core/templates/misc/contact.html:42
-msgid "Discord"
-msgstr ""
-
-#: core/templates/misc/contact.html:43
-msgid ""
-"Use the public group to get support for your\n"
-"local wger installation, discuss issues or your new idea, etc.\n"
-"(no registration needed)"
-msgstr ""
-
-#: core/templates/misc/contact.html:49
-msgid "Open feedback form"
-msgstr ""
-
-#: core/templates/misc/contact.html:53
-msgid "tweet to @wger_project"
-msgstr ""
-
-#: core/templates/misc/contact.html:56
-msgid "Go to the discord server"
+#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/template_features.html:118
+#: core/templates/template_no_context.html:88
+msgid "Imprint"
msgstr ""
#: core/templates/misc/fragments/shariff_modal.html:6
@@ -943,7 +869,7 @@ msgid "Add new exercise"
msgstr ""
#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:223
+#: core/templates/navigation.html:226
msgid "Administration"
msgstr ""
@@ -1010,68 +936,62 @@ msgid "About this software"
msgstr ""
#: core/templates/navigation.html:151 core/templates/template_features.html:83
-#: software/templates/contribute.html:6
-msgid "Contribute!"
-msgstr ""
-
-#: core/templates/navigation.html:152
-msgid "Problems and wishes"
-msgstr ""
+#: software/templates/about_us.html:5
+msgid "About us"
+msgstr "Meistä"
-#: core/templates/navigation.html:155 software/templates/features.html:209
+#: core/templates/navigation.html:153 software/templates/features.html:209
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:156 software/templates/license.html:7
-#: utils/models.py:40
+#: core/templates/navigation.html:157 utils/models.py:40
msgid "License"
msgstr ""
-#: core/templates/navigation.html:160
+#: core/templates/navigation.html:163
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:166 software/templates/contribute.html:59
+#: core/templates/navigation.html:169
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:172 core/templates/template.html:193
-#: core/templates/template_features.html:103
-#: software/templates/contribute.html:43 software/templates/contribute.html:50
+#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/template_features.html:100
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:193 core/templates/user/login.html:28
+#: core/templates/navigation.html:196 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:206
+#: core/templates/navigation.html:209
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:213
+#: core/templates/navigation.html:216
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:228
+#: core/templates/navigation.html:231
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:234
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:234 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:237 core/templates/user/list.html:4
+#: core/templates/navigation.html:240 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:238
+#: core/templates/navigation.html:241
msgid "Gyms"
msgstr ""
@@ -1185,18 +1105,12 @@ msgstr ""
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:201 core/templates/template_features.html:121
-#: core/templates/template_no_context.html:88
-msgid "About"
-msgstr ""
-
-#: core/templates/template.html:202 core/templates/template_features.html:125
+#: core/templates/template.html:202 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Käyttöehdot"
#: core/templates/template.html:209 core/templates/template.html:210
-#: software/templates/license.html:18 software/templates/license.html:19
msgid "Released under the Affero GPL"
msgstr "Julkaistu Affero GPL -lisenssin alla"
@@ -1544,15 +1458,15 @@ msgstr ""
msgid "Rest day"
msgstr "Lepopäivä"
-#: core/views/misc.py:199
+#: core/views/misc.py:184
msgid "Feedback"
msgstr ""
-#: core/views/misc.py:218 weight/templates/import_csv_form.html:9
+#: core/views/misc.py:203 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr ""
-#: core/views/misc.py:226
+#: core/views/misc.py:211
msgid "Your feedback was successfully sent. Thank you!"
msgstr ""
@@ -1721,7 +1635,6 @@ msgstr ""
#: exercises/templates/exercise/overview.html:118
#: exercises/templates/muscles/overview.html:114
#: nutrition/templates/ingredient/overview.html:85
-#: software/templates/contribute.html:39
msgid "Only registered users can do this"
msgstr ""
@@ -1915,7 +1828,7 @@ msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246 software/templates/contribute.html:37
+#: exercises/views/exercises.py:246
msgid "Add exercise"
msgstr ""
@@ -3549,75 +3462,53 @@ msgstr ""
msgid "Edit a weight unit to ingredient connection"
msgstr ""
-#: software/templates/contribute.html:9
+#: software/templates/about_us.html:9
msgid ""
-"wger Workout Manager is build by volunteers,\n"
-"the development process is open and freely accessible to anybody "
-"interested.\n"
-"If you are new to the free software world, we recommend to take a\n"
-"look <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
-"article</a> which summarizes they way open source projects work very well. "
+"Thank you for using wger! wger is a collaborative open source project, made "
+"by fitness enthusiasts from around the world."
msgstr ""
-#: software/templates/contribute.html:16
-msgid ""
-"Any kind of contribution is appreciated and welcome.\n"
-"Use this opportunity and influence the direction of the\n"
-"project. "
+#: software/templates/about_us.html:18
+msgid "Source code"
msgstr ""
-#: software/templates/contribute.html:23
-msgid "Use the site"
+#: software/templates/about_us.html:20
+msgid "Get the source code of this application and its server on github"
msgstr ""
-#: software/templates/contribute.html:24
-msgid ""
-"Simply use the site and tell your friends\n"
-"how useful it is! ;) . When you find something that you specially liked,\n"
-"could need some improvements or just doesn't work, tell us! This might not "
-"sound\n"
-"like much, but is incredibly important!"
+#: software/templates/about_us.html:25
+msgid "Have a problem or idea?"
msgstr ""
-#: software/templates/contribute.html:31
-msgid "Submit exercises"
+#: software/templates/about_us.html:27
+msgid ""
+"Get in touch if something didn't behave as expected or if there is a feature "
+"that you feel is missing."
msgstr ""
-#: software/templates/contribute.html:32
-msgid ""
-"Submit those cool exercises that you absolutely\n"
-"love and do every week but are not in the list yet. If you think some "
-"description\n"
-"is too short or some other detail is missing or could be improved, tell!"
+#: software/templates/about_us.html:32
+msgid "Say hi!"
msgstr ""
-#: software/templates/contribute.html:44
-msgid ""
-"Do you want to use wger in your own language?\n"
-"Do you think the current translation could be improved?\n"
-"The translations are easily managed and edited online, if you are "
-"interested,\n"
-"visit the link and start translating."
+#: software/templates/about_us.html:34
+msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
-#: software/templates/contribute.html:53
-msgid "Code"
+#: software/templates/about_us.html:39
+msgid "Translation"
msgstr ""
-#: software/templates/contribute.html:54
+#: software/templates/about_us.html:41
msgid ""
-"Obviously, you are highly encouraged to clone the\n"
-"repo and start hacking! Once you are ready, send a pull request and we\n"
-"will show the world. Take a look at the developer guide for more details\n"
-"on this."
+"This application is translated on weblate. If you also want to help, click "
+"the link and start translating"
msgstr ""
-#: software/templates/contribute.html:66
+#: software/templates/about_us.html:50
msgid "Our goal"
msgstr ""
-#: software/templates/contribute.html:69
+#: software/templates/about_us.html:53
msgid ""
"The goal is to build an awesome\n"
"and flexible fitness manager, along with a comprehensive and complete list "
@@ -3752,78 +3643,6 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr ""
-#: software/templates/issues.html:6
-msgid "Reporting a problem"
-msgstr ""
-
-#: software/templates/issues.html:10
-msgid ""
-"\n"
-"No software is perfect. For some severe errors, an email will be "
-"automatically sent, but\n"
-"not always, so I depend on you reporting everything that didn't behave as "
-"expected.\n"
-"Please describe in as much detail as you can what you were doing when the "
-"error\n"
-"happened.\n"
-msgstr ""
-
-#: software/templates/issues.html:21
-msgid "report problem to the issue tracker"
-msgstr ""
-
-#: software/templates/issues.html:25
-msgid "Enhancements"
-msgstr ""
-
-#: software/templates/issues.html:27
-msgid ""
-"\n"
-"The issue tracker can also be used to document enhancements to the "
-"software.\n"
-"If you have some suggestions or think a feature is missing, feel\n"
-"free to open a ticket. This can be anything from a slight change to a whole\n"
-"new section of the site. Please keep in mind that not all wishes can be\n"
-"implemented."
-msgstr ""
-
-#: software/templates/issues.html:36
-msgid "report wish to the issue tracker"
-msgstr ""
-
-#: software/templates/issues.html:41
-msgid "No Github account?"
-msgstr ""
-
-#: software/templates/issues.html:42
-msgid ""
-"Filing an issue requires a github account, if you don't\n"
-"have one and don't want to register, you can also send it to\n"
-"<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
-msgstr ""
-
-#: software/templates/license.html:10
-msgid ""
-"wger Workout Manager is Free/Libre Open Source\n"
-"Software (FLOSS)."
-msgstr ""
-
-#: software/templates/license.html:22
-msgid ""
-"wger Workout Manager is released under the <strong>Affero GNU\n"
-"General Public License (AGPL) Version 3+</strong> and can (under the "
-"conditions\n"
-"of the license) be used, modified and distributed (also with modifications)\n"
-"without restrictions."
-msgstr ""
-
-#: software/templates/license.html:29
-msgid ""
-"A copy the license text is contained in every wger Workout\n"
-"Manager release (LICENSE.txt) and can be read online on the website of\n"
-"<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</a>."
-msgstr ""
-
#: utils/generic_views.py:261
msgid "Yes, delete"
msgstr ""
@@ -3987,6 +3806,12 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "GNUPG-Key:"
+#~ msgstr "GnuPG-avain:"
+
+#~ msgid "Twitter"
+#~ msgstr "Twitter"
+
#~ msgid "Use pauses in workout timer"
#~ msgstr "Käytä taukoja treenikellossa"
diff --git a/wger/locale/fr/LC_MESSAGES/django.po b/wger/locale/fr/LC_MESSAGES/django.po
index 789d755db..d8b96cee1 100644
--- a/wger/locale/fr/LC_MESSAGES/django.po
+++ b/wger/locale/fr/LC_MESSAGES/django.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-17 15:00+0200\n"
+"POT-Creation-Date: 2021-08-17 17:23+0200\n"
"PO-Revision-Date: 2021-08-03 07:32+0000\n"
"Last-Translator: Antoine Vibien <[email protected]>\n"
"Language-Team: French <https://hosted.weblate.org/projects/wger/web/fr/>\n"
@@ -55,7 +55,7 @@ msgstr "Exercices"
msgid "Ingredients"
msgstr "Ingrédients"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:225
+#: config/templates/language/overview.html:4 core/templates/navigation.html:228
msgid "Languages"
msgstr "Langues"
@@ -231,8 +231,8 @@ msgstr "Mon programme d’entraînement"
msgid "Empty placeholder schedule"
msgstr "Programme vide de démonstration"
-#: core/forms.py:61 core/templates/navigation.html:187
-#: core/templates/navigation.html:191 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:190
+#: core/templates/navigation.html:194 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Se connecter"
@@ -309,8 +309,8 @@ msgstr "Mot de passe invalide"
msgid "The form is secured with reCAPTCHA"
msgstr "Le formulaire est sécurisé avec reCAPTCHA"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:187
-#: core/templates/navigation.html:192 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
+#: core/templates/navigation.html:195 core/templates/template.html:150
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -809,103 +809,11 @@ msgstr "Liste des licences"
msgid "Nothing found"
msgstr "Rien trouvé"
-#: core/templates/misc/about.html:4
-msgid "About us"
-msgstr "À propos de nous"
-
-#: core/templates/misc/about.html:8
-msgid "Responsible for the content of this site as per German law §5 TMG:"
-msgstr ""
-"Responsable pour le contenu de ce site selon le droit allemand § 5 TMG :"
-
-#: core/templates/misc/about.html:16
-msgid "GNUPG-Key:"
-msgstr "Clé GNUPG :"
-
-#: core/templates/misc/contact.html:4 core/templates/navigation.html:153
-#: core/templates/template_features.html:86
-#: software/templates/contribute.html:28
-msgid "Get in touch"
-msgstr "Prends contact"
-
-#: core/templates/misc/contact.html:10
-#, python-format
-msgid ""
-"Thank you for your interest. Feel free to use any of the\n"
-"ways below to send feedback you have about any aspect of the site. For\n"
-"support, say hi\n"
-"<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
-"a bug, consider doing it through the <a href=\"%(issues)s\">issue tracker</"
-"a>\n"
-"."
-msgstr ""
-"Merci de votre intérêt. N’hésitez pas à utiliser l’une des méthodes ci-"
-"dessous pour envoyer vos commentaires sur n’importe quel aspect du site. "
-"Pour obtenir de l’aide, dites-nous bonjour <a href=\"%(discord)s\"> sur le "
-"canal Discord </a>, pour signaler une erreur, envisagez de le faire via le "
-"<a href=\"%(issues)s\"> suivi des problèmes. </a>."
-
-#: core/templates/misc/contact.html:20
-#, python-format
-msgid ""
-"If you want to further help and improve this project,\n"
-"you might also be interested <a href=\"%(contribute)s\">in contributing</a>."
-msgstr ""
-"Si vous voulez aider et améliorer ce projet, vous pourriez également avoir "
-"envie de <a href=\"%(contribute)s\">contribuer</a>."
-
-#: core/templates/misc/contact.html:29
-msgid "Feedback form"
-msgstr "Formulaire de retour"
-
-#: core/templates/misc/contact.html:30
-msgid ""
-"A simple contact form. Remember that\n"
-"if you want an answer, you need to include some way to contact you."
-msgstr ""
-"Un simple formulaire de contact. Souvenez-vous\n"
-"que si vous voulez une réponse, vous devez fournir un moyen de vous "
-"contacter."
-
-#: core/templates/misc/contact.html:35
-msgid "Twitter"
-msgstr "Twitter"
-
-#: core/templates/misc/contact.html:36
-msgid ""
-"We are also on twitter. Write us and tell us what\n"
-"you think! Except patches, don't send patches via twitter."
-msgstr ""
-"Retrouvez-nous sur twitter. Écrivez-nous et dites-nous\n"
-"ce que vous pensez du site ! Mais pas de patch, n’envoyez pas de patchs par "
-"twitter."
-
-#: core/templates/misc/contact.html:42
-msgid "Discord"
-msgstr "Discord"
-
-#: core/templates/misc/contact.html:43
-msgid ""
-"Use the public group to get support for your\n"
-"local wger installation, discuss issues or your new idea, etc.\n"
-"(no registration needed)"
+#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/template_features.html:118
+#: core/templates/template_no_context.html:88
+msgid "Imprint"
msgstr ""
-"Utilisez le groupe public pour obtenir une assistance pour votre \n"
-"installation locale de wger, discuter de problèmes ou de nouvelles idées, "
-"etc. \n"
-"(aucune inscription nécessaire)"
-
-#: core/templates/misc/contact.html:49
-msgid "Open feedback form"
-msgstr "Ouvrir un formulaire de retour"
-
-#: core/templates/misc/contact.html:53
-msgid "tweet to @wger_project"
-msgstr "tweet à @wger_project"
-
-#: core/templates/misc/contact.html:56
-msgid "Go to the discord server"
-msgstr "Aller au serveur Discord"
#: core/templates/misc/fragments/shariff_modal.html:6
msgid "Share this page"
@@ -998,7 +906,7 @@ msgid "Add new exercise"
msgstr "Ajouter nouvel exercice"
#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:223
+#: core/templates/navigation.html:226
msgid "Administration"
msgstr "Administration"
@@ -1065,68 +973,62 @@ msgid "About this software"
msgstr "À propos de ce logiciel"
#: core/templates/navigation.html:151 core/templates/template_features.html:83
-#: software/templates/contribute.html:6
-msgid "Contribute!"
-msgstr "Contribuez !"
-
-#: core/templates/navigation.html:152
-msgid "Problems and wishes"
-msgstr "Problèmes et souhaits"
+#: software/templates/about_us.html:5
+msgid "About us"
+msgstr "À propos de nous"
-#: core/templates/navigation.html:155 software/templates/features.html:209
+#: core/templates/navigation.html:153 software/templates/features.html:209
msgid "REST API"
msgstr "API REST"
-#: core/templates/navigation.html:156 software/templates/license.html:7
-#: utils/models.py:40
+#: core/templates/navigation.html:157 utils/models.py:40
msgid "License"
msgstr "Licence"
-#: core/templates/navigation.html:160
+#: core/templates/navigation.html:163
msgid "Developer documentation"
msgstr "Documentation du développeur"
-#: core/templates/navigation.html:166 software/templates/contribute.html:59
+#: core/templates/navigation.html:169
msgid "Get the code"
msgstr "Récupérer le code"
-#: core/templates/navigation.html:172 core/templates/template.html:193
-#: core/templates/template_features.html:103
-#: software/templates/contribute.html:43 software/templates/contribute.html:50
+#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/template_features.html:100
msgid "Translate"
msgstr "Traduire"
-#: core/templates/navigation.html:193 core/templates/user/login.html:28
+#: core/templates/navigation.html:196 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Réinitialiser le mot de passe"
-#: core/templates/navigation.html:206
+#: core/templates/navigation.html:209
msgid "My preferences"
msgstr "Mes préférences"
-#: core/templates/navigation.html:213
+#: core/templates/navigation.html:216
msgid "Logout"
msgstr "Se déconnecter"
-#: core/templates/navigation.html:228
+#: core/templates/navigation.html:231
msgid "Licenses"
msgstr "Licences"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:234
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Unités de répétition"
-#: core/templates/navigation.html:234 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Unité de poids"
-#: core/templates/navigation.html:237 core/templates/user/list.html:4
+#: core/templates/navigation.html:240 core/templates/user/list.html:4
msgid "User list"
msgstr "Liste des utilisateurs"
-#: core/templates/navigation.html:238
+#: core/templates/navigation.html:241
msgid "Gyms"
msgstr "Activités"
@@ -1249,18 +1151,12 @@ msgstr ""
msgid "Create some demo entries"
msgstr "Créer des entrées de démo"
-#: core/templates/template.html:201 core/templates/template_features.html:121
-#: core/templates/template_no_context.html:88
-msgid "About"
-msgstr "À propos"
-
-#: core/templates/template.html:202 core/templates/template_features.html:125
+#: core/templates/template.html:202 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Conditions d’utilisation"
#: core/templates/template.html:209 core/templates/template.html:210
-#: software/templates/license.html:18 software/templates/license.html:19
msgid "Released under the Affero GPL"
msgstr "Publié sous licence Affero GPL"
@@ -1624,15 +1520,15 @@ msgstr ""
msgid "Rest day"
msgstr "Jour de repos"
-#: core/views/misc.py:199
+#: core/views/misc.py:184
msgid "Feedback"
msgstr "Remarques"
-#: core/views/misc.py:218 weight/templates/import_csv_form.html:9
+#: core/views/misc.py:203 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Envoyer"
-#: core/views/misc.py:226
+#: core/views/misc.py:211
msgid "Your feedback was successfully sent. Thank you!"
msgstr "Votrecommentaire a été envoyé avec succès. Merci !"
@@ -1807,7 +1703,6 @@ msgstr "nom de l'exercice"
#: exercises/templates/exercise/overview.html:118
#: exercises/templates/muscles/overview.html:114
#: nutrition/templates/ingredient/overview.html:85
-#: software/templates/contribute.html:39
msgid "Only registered users can do this"
msgstr "Seul les utilisateurs enregistrés peuvent faire ça"
@@ -2024,7 +1919,7 @@ msgstr ""
"%(name_original)s est trop similaire à l’exercice existant "
"« %(exercise_name)s »"
-#: exercises/views/exercises.py:246 software/templates/contribute.html:37
+#: exercises/views/exercises.py:246
msgid "Add exercise"
msgstr "Ajouter un exercice"
@@ -3803,101 +3698,55 @@ msgstr "Ajouter une nouvelle unité de poids"
msgid "Edit a weight unit to ingredient connection"
msgstr "Modifier une unité de poids pour l’ingrédient"
-#: software/templates/contribute.html:9
+#: software/templates/about_us.html:9
msgid ""
-"wger Workout Manager is build by volunteers,\n"
-"the development process is open and freely accessible to anybody "
-"interested.\n"
-"If you are new to the free software world, we recommend to take a\n"
-"look <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
-"article</a> which summarizes they way open source projects work very well. "
-msgstr ""
-"wger Workout Manager est créé par des bénévoles, le processus de conception "
-"est ouvert et librement accessible à toute personne intéressée.\n"
-"Si vous êtes nouveau/nouvelle dans le monde du logiciel libre, nous vous "
-"recommandons de jeter un coup d’œil <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\"> cet article</"
-"a> qui résume la manière dont les projets à code source ouvert fonctionnent. "
-
-#: software/templates/contribute.html:16
-msgid ""
-"Any kind of contribution is appreciated and welcome.\n"
-"Use this opportunity and influence the direction of the\n"
-"project. "
+"Thank you for using wger! wger is a collaborative open source project, made "
+"by fitness enthusiasts from around the world."
+msgstr ""
+
+#: software/templates/about_us.html:18
+msgid "Source code"
msgstr ""
-"Toute contribution est appréciée et bienvenue.\n"
-"Profitez de cette occasion et influencez l’orientation du projet. "
-#: software/templates/contribute.html:23
-msgid "Use the site"
-msgstr "Utiliser le site"
+#: software/templates/about_us.html:20
+msgid "Get the source code of this application and its server on github"
+msgstr ""
-#: software/templates/contribute.html:24
-msgid ""
-"Simply use the site and tell your friends\n"
-"how useful it is! ;) . When you find something that you specially liked,\n"
-"could need some improvements or just doesn't work, tell us! This might not "
-"sound\n"
-"like much, but is incredibly important!"
-msgstr ""
-"Simplement utilisez le site et dites à vos amis à quel point il est "
-"utile ! ;) . Lorsque vous trouvez quelque chose que vous avez "
-"particulièrement aimé, il pourrait avoir besoin de quelques améliorations ou "
-"ne pas fonctionner, dites-nous ! Cela pourrait ne pas vous sembler "
-"important, mais c'est extrêmement important !"
-
-#: software/templates/contribute.html:31
-msgid "Submit exercises"
-msgstr "Soumettre des exercices"
-
-#: software/templates/contribute.html:32
-msgid ""
-"Submit those cool exercises that you absolutely\n"
-"love and do every week but are not in the list yet. If you think some "
-"description\n"
-"is too short or some other detail is missing or could be improved, tell!"
+#: software/templates/about_us.html:25
+msgid "Have a problem or idea?"
msgstr ""
-"Proposez des exercices cool que vous aimez absolument et que vous faîtes "
-"chaque semaine mais qui ne sont pas encore dans la liste. Si vous pensez que "
-"certaines description sont trop courtes, si d'autres détails sont manquant "
-"ou sont améliorable, dis-le !"
-#: software/templates/contribute.html:44
+#: software/templates/about_us.html:27
msgid ""
-"Do you want to use wger in your own language?\n"
-"Do you think the current translation could be improved?\n"
-"The translations are easily managed and edited online, if you are "
-"interested,\n"
-"visit the link and start translating."
-msgstr ""
-"Voulez-vous utiliser wger dans votre propre langue ?\n"
-"Pensez-vous que la traduction actuelle pourrait être améliorée ?\n"
-"Les traductions sont facilement gérées et modifiées en ligne, si vous êtes "
-"intéressé·e,\n"
-"visitez le lien et commencez à traduire."
-
-#: software/templates/contribute.html:53
-msgid "Code"
-msgstr "Code"
-
-#: software/templates/contribute.html:54
+"Get in touch if something didn't behave as expected or if there is a feature "
+"that you feel is missing."
+msgstr ""
+
+#: software/templates/about_us.html:32
+msgid "Say hi!"
+msgstr ""
+
+#: software/templates/about_us.html:34
+msgid "If you want to chat with us, hop on the Discord server and get in touch"
+msgstr ""
+
+#: software/templates/about_us.html:39
+#, fuzzy
+#| msgid "Translate"
+msgid "Translation"
+msgstr "Traduire"
+
+#: software/templates/about_us.html:41
msgid ""
-"Obviously, you are highly encouraged to clone the\n"
-"repo and start hacking! Once you are ready, send a pull request and we\n"
-"will show the world. Take a look at the developer guide for more details\n"
-"on this."
+"This application is translated on weblate. If you also want to help, click "
+"the link and start translating"
msgstr ""
-"Évidemment, nous vous encourageons fortement à cloner le repo et commencer "
-"le piratage ! Une fois que vous êtes prêt, envoyez une demande de tirage et "
-"nous montrerons au monde. Jetez un oeil sur le guide du développeur pour "
-"plus de détails sur cela."
-#: software/templates/contribute.html:66
+#: software/templates/about_us.html:50
msgid "Our goal"
msgstr "Notre objectif"
-#: software/templates/contribute.html:69
+#: software/templates/about_us.html:53
msgid ""
"The goal is to build an awesome\n"
"and flexible fitness manager, along with a comprehensive and complete list "
@@ -4073,103 +3922,6 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr "100 %% gratuit <br>et <br>à code ouvert"
-#: software/templates/issues.html:6
-msgid "Reporting a problem"
-msgstr "Signaler un problème"
-
-#: software/templates/issues.html:10
-msgid ""
-"\n"
-"No software is perfect. For some severe errors, an email will be "
-"automatically sent, but\n"
-"not always, so I depend on you reporting everything that didn't behave as "
-"expected.\n"
-"Please describe in as much detail as you can what you were doing when the "
-"error\n"
-"happened.\n"
-msgstr ""
-"\n"
-"Aucun logiciel n’est parfait. Pour quelques graves erreurs, un courriel sera "
-"automatiquement envoyé, mais pas toujours, alors je compte sur vous pour "
-"signaler tout ce qui ne se comportent pas comme prévu.\n"
-"Veuillez donner une description aussi détaillée que possible de ce que vous "
-"faisiez lorsque l’erreur s’est produite.\n"
-
-#: software/templates/issues.html:21
-msgid "report problem to the issue tracker"
-msgstr "signaler le problème dans le gestionnaire d’incidents"
-
-#: software/templates/issues.html:25
-msgid "Enhancements"
-msgstr "Améliorations"
-
-#: software/templates/issues.html:27
-msgid ""
-"\n"
-"The issue tracker can also be used to document enhancements to the "
-"software.\n"
-"If you have some suggestions or think a feature is missing, feel\n"
-"free to open a ticket. This can be anything from a slight change to a whole\n"
-"new section of the site. Please keep in mind that not all wishes can be\n"
-"implemented."
-msgstr ""
-"\n"
-"Le gestionnaire d’incidents peut aussi être utilisé pour répertorier le "
-"améliorations pour le logiciel.\n"
-"Si vous avez quelques suggestions ou vous pensez qu’un élément est manquant, "
-"n’hésitez pas à ouvrir un ticket. Ceci peut être n’importe quoi, d’un léger "
-"changement à une toute nouvelle section du site. Veuillez garder à l'esprit "
-"que tous les souhaits ne peuvent pas être mis en œuvre."
-
-#: software/templates/issues.html:36
-msgid "report wish to the issue tracker"
-msgstr "signaler un souhait dans le gestionnaire d’incidents"
-
-#: software/templates/issues.html:41
-msgid "No Github account?"
-msgstr "Pas de compte Github ?"
-
-#: software/templates/issues.html:42
-msgid ""
-"Filing an issue requires a github account, if you don't\n"
-"have one and don't want to register, you can also send it to\n"
-"<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
-msgstr ""
-"Un problème nécessite un compte Github, si vous n’en avez pas et que vous ne "
-"voulez pas vous inscrire, vous pouvez également l’envoyer à <a href="
-"\"https://groups.google.com/group/wger\"> la liste de diffusion</a>."
-
-#: software/templates/license.html:10
-msgid ""
-"wger Workout Manager is Free/Libre Open Source\n"
-"Software (FLOSS)."
-msgstr ""
-"wger Workout Manager est un logiciel\n"
-"libre et gratuit."
-
-#: software/templates/license.html:22
-msgid ""
-"wger Workout Manager is released under the <strong>Affero GNU\n"
-"General Public License (AGPL) Version 3+</strong> and can (under the "
-"conditions\n"
-"of the license) be used, modified and distributed (also with modifications)\n"
-"without restrictions."
-msgstr ""
-"wger Workout Manager est publié sous <strong> Affero GNU \n"
-"General Public License (AGPL) Version 3+</strong> et peut être utilisé "
-"( sous les conditions de la licence), modifié et distribué (aussi avec des "
-"modifications) sans restrictions."
-
-#: software/templates/license.html:29
-msgid ""
-"A copy the license text is contained in every wger Workout\n"
-"Manager release (LICENSE.txt) and can be read online on the website of\n"
-"<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</a>."
-msgstr ""
-"Une copie du texte de la licence figure dans chaque versions de wger Workout "
-"Manager (LICENSE.txt) et peut être lu en ligne sur le site Web du <a "
-"href='https://www.gnu.org/licenses/agpl-3.0.en.html'>projet GNU</a>."
-
#: utils/generic_views.py:261
msgid "Yes, delete"
msgstr "Oui, supprimer"
@@ -4358,6 +4110,266 @@ msgstr "Supprimé avec succès."
msgid "Delete weight entry for the %s"
msgstr "Supprimer l’entrée de poids pour le %s"
+#~ msgid "Responsible for the content of this site as per German law §5 TMG:"
+#~ msgstr ""
+#~ "Responsable pour le contenu de ce site selon le droit allemand § 5 TMG :"
+
+#~ msgid "GNUPG-Key:"
+#~ msgstr "Clé GNUPG :"
+
+#~ msgid "Get in touch"
+#~ msgstr "Prends contact"
+
+#~ msgid ""
+#~ "Thank you for your interest. Feel free to use any of the\n"
+#~ "ways below to send feedback you have about any aspect of the site. For\n"
+#~ "support, say hi\n"
+#~ "<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
+#~ "a bug, consider doing it through the <a href=\"%(issues)s\">issue "
+#~ "tracker</a>\n"
+#~ "."
+#~ msgstr ""
+#~ "Merci de votre intérêt. N’hésitez pas à utiliser l’une des méthodes ci-"
+#~ "dessous pour envoyer vos commentaires sur n’importe quel aspect du site. "
+#~ "Pour obtenir de l’aide, dites-nous bonjour <a href=\"%(discord)s\"> sur "
+#~ "le canal Discord </a>, pour signaler une erreur, envisagez de le faire "
+#~ "via le <a href=\"%(issues)s\"> suivi des problèmes. </a>."
+
+#~ msgid ""
+#~ "If you want to further help and improve this project,\n"
+#~ "you might also be interested <a href=\"%(contribute)s\">in contributing</"
+#~ "a>."
+#~ msgstr ""
+#~ "Si vous voulez aider et améliorer ce projet, vous pourriez également "
+#~ "avoir envie de <a href=\"%(contribute)s\">contribuer</a>."
+
+#~ msgid "Feedback form"
+#~ msgstr "Formulaire de retour"
+
+#~ msgid ""
+#~ "A simple contact form. Remember that\n"
+#~ "if you want an answer, you need to include some way to contact you."
+#~ msgstr ""
+#~ "Un simple formulaire de contact. Souvenez-vous\n"
+#~ "que si vous voulez une réponse, vous devez fournir un moyen de vous "
+#~ "contacter."
+
+#~ msgid "Twitter"
+#~ msgstr "Twitter"
+
+#~ msgid ""
+#~ "We are also on twitter. Write us and tell us what\n"
+#~ "you think! Except patches, don't send patches via twitter."
+#~ msgstr ""
+#~ "Retrouvez-nous sur twitter. Écrivez-nous et dites-nous\n"
+#~ "ce que vous pensez du site ! Mais pas de patch, n’envoyez pas de patchs "
+#~ "par twitter."
+
+#~ msgid "Discord"
+#~ msgstr "Discord"
+
+#~ msgid ""
+#~ "Use the public group to get support for your\n"
+#~ "local wger installation, discuss issues or your new idea, etc.\n"
+#~ "(no registration needed)"
+#~ msgstr ""
+#~ "Utilisez le groupe public pour obtenir une assistance pour votre \n"
+#~ "installation locale de wger, discuter de problèmes ou de nouvelles idées, "
+#~ "etc. \n"
+#~ "(aucune inscription nécessaire)"
+
+#~ msgid "Open feedback form"
+#~ msgstr "Ouvrir un formulaire de retour"
+
+#~ msgid "tweet to @wger_project"
+#~ msgstr "tweet à @wger_project"
+
+#~ msgid "Go to the discord server"
+#~ msgstr "Aller au serveur Discord"
+
+#~ msgid "Contribute!"
+#~ msgstr "Contribuez !"
+
+#~ msgid "Problems and wishes"
+#~ msgstr "Problèmes et souhaits"
+
+#~ msgid "About"
+#~ msgstr "À propos"
+
+#~ msgid ""
+#~ "wger Workout Manager is build by volunteers,\n"
+#~ "the development process is open and freely accessible to anybody "
+#~ "interested.\n"
+#~ "If you are new to the free software world, we recommend to take a\n"
+#~ "look <a href=\"http://schlitt.info/opensource/"
+#~ "blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
+#~ "article</a> which summarizes they way open source projects work very "
+#~ "well. "
+#~ msgstr ""
+#~ "wger Workout Manager est créé par des bénévoles, le processus de "
+#~ "conception est ouvert et librement accessible à toute personne "
+#~ "intéressée.\n"
+#~ "Si vous êtes nouveau/nouvelle dans le monde du logiciel libre, nous vous "
+#~ "recommandons de jeter un coup d’œil <a href=\"http://schlitt.info/"
+#~ "opensource/blog/0541_10_golden_rules_for_starting_with_open_source.html"
+#~ "\"> cet article</a> qui résume la manière dont les projets à code source "
+#~ "ouvert fonctionnent. "
+
+#~ msgid ""
+#~ "Any kind of contribution is appreciated and welcome.\n"
+#~ "Use this opportunity and influence the direction of the\n"
+#~ "project. "
+#~ msgstr ""
+#~ "Toute contribution est appréciée et bienvenue.\n"
+#~ "Profitez de cette occasion et influencez l’orientation du projet. "
+
+#~ msgid "Use the site"
+#~ msgstr "Utiliser le site"
+
+#~ msgid ""
+#~ "Simply use the site and tell your friends\n"
+#~ "how useful it is! ;) . When you find something that you specially liked,\n"
+#~ "could need some improvements or just doesn't work, tell us! This might "
+#~ "not sound\n"
+#~ "like much, but is incredibly important!"
+#~ msgstr ""
+#~ "Simplement utilisez le site et dites à vos amis à quel point il est "
+#~ "utile ! ;) . Lorsque vous trouvez quelque chose que vous avez "
+#~ "particulièrement aimé, il pourrait avoir besoin de quelques améliorations "
+#~ "ou ne pas fonctionner, dites-nous ! Cela pourrait ne pas vous sembler "
+#~ "important, mais c'est extrêmement important !"
+
+#~ msgid "Submit exercises"
+#~ msgstr "Soumettre des exercices"
+
+#~ msgid ""
+#~ "Submit those cool exercises that you absolutely\n"
+#~ "love and do every week but are not in the list yet. If you think some "
+#~ "description\n"
+#~ "is too short or some other detail is missing or could be improved, tell!"
+#~ msgstr ""
+#~ "Proposez des exercices cool que vous aimez absolument et que vous faîtes "
+#~ "chaque semaine mais qui ne sont pas encore dans la liste. Si vous pensez "
+#~ "que certaines description sont trop courtes, si d'autres détails sont "
+#~ "manquant ou sont améliorable, dis-le !"
+
+#~ msgid ""
+#~ "Do you want to use wger in your own language?\n"
+#~ "Do you think the current translation could be improved?\n"
+#~ "The translations are easily managed and edited online, if you are "
+#~ "interested,\n"
+#~ "visit the link and start translating."
+#~ msgstr ""
+#~ "Voulez-vous utiliser wger dans votre propre langue ?\n"
+#~ "Pensez-vous que la traduction actuelle pourrait être améliorée ?\n"
+#~ "Les traductions sont facilement gérées et modifiées en ligne, si vous "
+#~ "êtes intéressé·e,\n"
+#~ "visitez le lien et commencez à traduire."
+
+#~ msgid "Code"
+#~ msgstr "Code"
+
+#~ msgid ""
+#~ "Obviously, you are highly encouraged to clone the\n"
+#~ "repo and start hacking! Once you are ready, send a pull request and we\n"
+#~ "will show the world. Take a look at the developer guide for more details\n"
+#~ "on this."
+#~ msgstr ""
+#~ "Évidemment, nous vous encourageons fortement à cloner le repo et "
+#~ "commencer le piratage ! Une fois que vous êtes prêt, envoyez une demande "
+#~ "de tirage et nous montrerons au monde. Jetez un oeil sur le guide du "
+#~ "développeur pour plus de détails sur cela."
+
+#~ msgid "Reporting a problem"
+#~ msgstr "Signaler un problème"
+
+#~ msgid ""
+#~ "\n"
+#~ "No software is perfect. For some severe errors, an email will be "
+#~ "automatically sent, but\n"
+#~ "not always, so I depend on you reporting everything that didn't behave as "
+#~ "expected.\n"
+#~ "Please describe in as much detail as you can what you were doing when the "
+#~ "error\n"
+#~ "happened.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Aucun logiciel n’est parfait. Pour quelques graves erreurs, un courriel "
+#~ "sera automatiquement envoyé, mais pas toujours, alors je compte sur vous "
+#~ "pour signaler tout ce qui ne se comportent pas comme prévu.\n"
+#~ "Veuillez donner une description aussi détaillée que possible de ce que "
+#~ "vous faisiez lorsque l’erreur s’est produite.\n"
+
+#~ msgid "report problem to the issue tracker"
+#~ msgstr "signaler le problème dans le gestionnaire d’incidents"
+
+#~ msgid "Enhancements"
+#~ msgstr "Améliorations"
+
+#~ msgid ""
+#~ "\n"
+#~ "The issue tracker can also be used to document enhancements to the "
+#~ "software.\n"
+#~ "If you have some suggestions or think a feature is missing, feel\n"
+#~ "free to open a ticket. This can be anything from a slight change to a "
+#~ "whole\n"
+#~ "new section of the site. Please keep in mind that not all wishes can be\n"
+#~ "implemented."
+#~ msgstr ""
+#~ "\n"
+#~ "Le gestionnaire d’incidents peut aussi être utilisé pour répertorier le "
+#~ "améliorations pour le logiciel.\n"
+#~ "Si vous avez quelques suggestions ou vous pensez qu’un élément est "
+#~ "manquant, n’hésitez pas à ouvrir un ticket. Ceci peut être n’importe "
+#~ "quoi, d’un léger changement à une toute nouvelle section du site. "
+#~ "Veuillez garder à l'esprit que tous les souhaits ne peuvent pas être mis "
+#~ "en œuvre."
+
+#~ msgid "report wish to the issue tracker"
+#~ msgstr "signaler un souhait dans le gestionnaire d’incidents"
+
+#~ msgid "No Github account?"
+#~ msgstr "Pas de compte Github ?"
+
+#~ msgid ""
+#~ "Filing an issue requires a github account, if you don't\n"
+#~ "have one and don't want to register, you can also send it to\n"
+#~ "<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
+#~ msgstr ""
+#~ "Un problème nécessite un compte Github, si vous n’en avez pas et que vous "
+#~ "ne voulez pas vous inscrire, vous pouvez également l’envoyer à <a href="
+#~ "\"https://groups.google.com/group/wger\"> la liste de diffusion</a>."
+
+#~ msgid ""
+#~ "wger Workout Manager is Free/Libre Open Source\n"
+#~ "Software (FLOSS)."
+#~ msgstr ""
+#~ "wger Workout Manager est un logiciel\n"
+#~ "libre et gratuit."
+
+#~ msgid ""
+#~ "wger Workout Manager is released under the <strong>Affero GNU\n"
+#~ "General Public License (AGPL) Version 3+</strong> and can (under the "
+#~ "conditions\n"
+#~ "of the license) be used, modified and distributed (also with "
+#~ "modifications)\n"
+#~ "without restrictions."
+#~ msgstr ""
+#~ "wger Workout Manager est publié sous <strong> Affero GNU \n"
+#~ "General Public License (AGPL) Version 3+</strong> et peut être utilisé "
+#~ "( sous les conditions de la licence), modifié et distribué (aussi avec "
+#~ "des modifications) sans restrictions."
+
+#~ msgid ""
+#~ "A copy the license text is contained in every wger Workout\n"
+#~ "Manager release (LICENSE.txt) and can be read online on the website of\n"
+#~ "<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</"
+#~ "a>."
+#~ msgstr ""
+#~ "Une copie du texte de la licence figure dans chaque versions de wger "
+#~ "Workout Manager (LICENSE.txt) et peut être lu en ligne sur le site Web du "
+#~ "<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>projet GNU</a>."
+
#~ msgid "Use pauses in workout timer"
#~ msgstr "Utiliser des pauses dans le chronomètre de la séance"
diff --git a/wger/locale/hu/LC_MESSAGES/django.po b/wger/locale/hu/LC_MESSAGES/django.po
index 494a67b75..6f1bd9454 100644
--- a/wger/locale/hu/LC_MESSAGES/django.po
+++ b/wger/locale/hu/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-17 15:00+0200\n"
+"POT-Creation-Date: 2021-08-17 17:23+0200\n"
"PO-Revision-Date: 2021-04-15 07:27+0000\n"
"Last-Translator: László Mócsy <[email protected]>\n"
"Language-Team: Hungarian <https://hosted.weblate.org/projects/wger/web/hu/>\n"
@@ -40,7 +40,7 @@ msgstr "Gyakorlatok"
msgid "Ingredients"
msgstr "Összetevők"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:225
+#: config/templates/language/overview.html:4 core/templates/navigation.html:228
msgid "Languages"
msgstr "Nyelvek"
@@ -212,8 +212,8 @@ msgstr "Az én király edzés ütemtervem"
msgid "Empty placeholder schedule"
msgstr "Üres helyfoglaló ütemterv"
-#: core/forms.py:61 core/templates/navigation.html:187
-#: core/templates/navigation.html:191 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:190
+#: core/templates/navigation.html:194 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Bejelentkezés"
@@ -288,8 +288,8 @@ msgstr "Érvénytelen jelszó"
msgid "The form is secured with reCAPTCHA"
msgstr "Ez az űrlap reCAPTCHA-val van biztosítva"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:187
-#: core/templates/navigation.html:192 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
+#: core/templates/navigation.html:195 core/templates/template.html:150
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -762,89 +762,10 @@ msgstr "Licenc lista"
msgid "Nothing found"
msgstr "Nincs találat"
-#: core/templates/misc/about.html:4
-msgid "About us"
-msgstr "Rólunk"
-
-#: core/templates/misc/about.html:8
-msgid "Responsible for the content of this site as per German law §5 TMG:"
-msgstr ""
-
-#: core/templates/misc/about.html:16
-msgid "GNUPG-Key:"
-msgstr "GNUPG-Kulcs:"
-
-#: core/templates/misc/contact.html:4 core/templates/navigation.html:153
-#: core/templates/template_features.html:86
-#: software/templates/contribute.html:28
-msgid "Get in touch"
-msgstr "Lépj kapcsolatba"
-
-#: core/templates/misc/contact.html:10
-#, python-format
-msgid ""
-"Thank you for your interest. Feel free to use any of the\n"
-"ways below to send feedback you have about any aspect of the site. For\n"
-"support, say hi\n"
-"<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
-"a bug, consider doing it through the <a href=\"%(issues)s\">issue tracker</"
-"a>\n"
-"."
-msgstr ""
-
-#: core/templates/misc/contact.html:20
-#, python-format
-msgid ""
-"If you want to further help and improve this project,\n"
-"you might also be interested <a href=\"%(contribute)s\">in contributing</a>."
-msgstr ""
-
-#: core/templates/misc/contact.html:29
-msgid "Feedback form"
-msgstr "Visszajelzés űrlap"
-
-#: core/templates/misc/contact.html:30
-msgid ""
-"A simple contact form. Remember that\n"
-"if you want an answer, you need to include some way to contact you."
-msgstr ""
-"Egy egyszerű kapcsolati űrlap.\n"
-"Amennyiben szeretnél választ kapni, akkor mindenképpen adj meg valami "
-"elérhetőséget."
-
-#: core/templates/misc/contact.html:35
-msgid "Twitter"
-msgstr "Twitter"
-
-#: core/templates/misc/contact.html:36
-msgid ""
-"We are also on twitter. Write us and tell us what\n"
-"you think! Except patches, don't send patches via twitter."
-msgstr ""
-"Twitteren is elérhetőek vagyunk. Írj nekünk és mond el\n"
-"amit gondolsz. Kivéve patchet, ne küldj patchet twitteren keresztül."
-
-#: core/templates/misc/contact.html:42
-msgid "Discord"
-msgstr ""
-
-#: core/templates/misc/contact.html:43
-msgid ""
-"Use the public group to get support for your\n"
-"local wger installation, discuss issues or your new idea, etc.\n"
-"(no registration needed)"
-msgstr ""
-
-#: core/templates/misc/contact.html:49
-msgid "Open feedback form"
-msgstr "Visszajelzési űrlap megnyitása"
-
-#: core/templates/misc/contact.html:53
-msgid "tweet to @wger_project"
-msgstr ""
-
-#: core/templates/misc/contact.html:56
-msgid "Go to the discord server"
+#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/template_features.html:118
+#: core/templates/template_no_context.html:88
+msgid "Imprint"
msgstr ""
#: core/templates/misc/fragments/shariff_modal.html:6
@@ -934,7 +855,7 @@ msgid "Add new exercise"
msgstr "Új gyakorlat hozzáadása"
#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:223
+#: core/templates/navigation.html:226
msgid "Administration"
msgstr "Adminisztráció"
@@ -1001,68 +922,62 @@ msgid "About this software"
msgstr "Erről a szoftverről"
#: core/templates/navigation.html:151 core/templates/template_features.html:83
-#: software/templates/contribute.html:6
-msgid "Contribute!"
-msgstr "Vegyél részt!"
-
-#: core/templates/navigation.html:152
-msgid "Problems and wishes"
-msgstr "Problémák és kívánságok"
+#: software/templates/about_us.html:5
+msgid "About us"
+msgstr "Rólunk"
-#: core/templates/navigation.html:155 software/templates/features.html:209
+#: core/templates/navigation.html:153 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:156 software/templates/license.html:7
-#: utils/models.py:40
+#: core/templates/navigation.html:157 utils/models.py:40
msgid "License"
msgstr "Licenc"
-#: core/templates/navigation.html:160
+#: core/templates/navigation.html:163
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:166 software/templates/contribute.html:59
+#: core/templates/navigation.html:169
msgid "Get the code"
msgstr "Szerezd meg a kódot"
-#: core/templates/navigation.html:172 core/templates/template.html:193
-#: core/templates/template_features.html:103
-#: software/templates/contribute.html:43 software/templates/contribute.html:50
+#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/template_features.html:100
msgid "Translate"
msgstr "Lefordítás"
-#: core/templates/navigation.html:193 core/templates/user/login.html:28
+#: core/templates/navigation.html:196 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Új jelszó igénylése"
-#: core/templates/navigation.html:206
+#: core/templates/navigation.html:209
msgid "My preferences"
msgstr "Beállításaim"
-#: core/templates/navigation.html:213
+#: core/templates/navigation.html:216
msgid "Logout"
msgstr "Kijelentkezés"
-#: core/templates/navigation.html:228
+#: core/templates/navigation.html:231
msgid "Licenses"
msgstr "Licencek"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:234
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:234 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:237 core/templates/user/list.html:4
+#: core/templates/navigation.html:240 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:238
+#: core/templates/navigation.html:241
msgid "Gyms"
msgstr "Edzőtermek"
@@ -1178,18 +1093,12 @@ msgstr ""
msgid "Create some demo entries"
msgstr "Készíts egy pár demó bejegyzést"
-#: core/templates/template.html:201 core/templates/template_features.html:121
-#: core/templates/template_no_context.html:88
-msgid "About"
-msgstr "Impresszum"
-
-#: core/templates/template.html:202 core/templates/template_features.html:125
+#: core/templates/template.html:202 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
#: core/templates/template.html:209 core/templates/template.html:210
-#: software/templates/license.html:18 software/templates/license.html:19
msgid "Released under the Affero GPL"
msgstr "Az Affero GPL licenc alatt lett kiadva"
@@ -1537,15 +1446,15 @@ msgstr ""
msgid "Rest day"
msgstr "Pihenő nap"
-#: core/views/misc.py:199
+#: core/views/misc.py:184
msgid "Feedback"
msgstr "Visszajelzés"
-#: core/views/misc.py:218 weight/templates/import_csv_form.html:9
+#: core/views/misc.py:203 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr ""
-#: core/views/misc.py:226
+#: core/views/misc.py:211
msgid "Your feedback was successfully sent. Thank you!"
msgstr "A visszajelzésed sikeresen elküldtük. Köszönjük!"
@@ -1717,7 +1626,6 @@ msgstr "gyakorlat neve"
#: exercises/templates/exercise/overview.html:118
#: exercises/templates/muscles/overview.html:114
#: nutrition/templates/ingredient/overview.html:85
-#: software/templates/contribute.html:39
msgid "Only registered users can do this"
msgstr "Csak regisztrált felhasználók láthatják"
@@ -1913,7 +1821,7 @@ msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246 software/templates/contribute.html:37
+#: exercises/views/exercises.py:246
msgid "Add exercise"
msgstr "Új gyakorlat hozzáadása"
@@ -3551,75 +3459,55 @@ msgstr ""
msgid "Edit a weight unit to ingredient connection"
msgstr ""
-#: software/templates/contribute.html:9
+#: software/templates/about_us.html:9
msgid ""
-"wger Workout Manager is build by volunteers,\n"
-"the development process is open and freely accessible to anybody "
-"interested.\n"
-"If you are new to the free software world, we recommend to take a\n"
-"look <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
-"article</a> which summarizes they way open source projects work very well. "
+"Thank you for using wger! wger is a collaborative open source project, made "
+"by fitness enthusiasts from around the world."
msgstr ""
-#: software/templates/contribute.html:16
-msgid ""
-"Any kind of contribution is appreciated and welcome.\n"
-"Use this opportunity and influence the direction of the\n"
-"project. "
+#: software/templates/about_us.html:18
+msgid "Source code"
msgstr ""
-#: software/templates/contribute.html:23
-msgid "Use the site"
+#: software/templates/about_us.html:20
+msgid "Get the source code of this application and its server on github"
msgstr ""
-#: software/templates/contribute.html:24
-msgid ""
-"Simply use the site and tell your friends\n"
-"how useful it is! ;) . When you find something that you specially liked,\n"
-"could need some improvements or just doesn't work, tell us! This might not "
-"sound\n"
-"like much, but is incredibly important!"
-msgstr ""
-
-#: software/templates/contribute.html:31
-msgid "Submit exercises"
+#: software/templates/about_us.html:25
+msgid "Have a problem or idea?"
msgstr ""
-#: software/templates/contribute.html:32
+#: software/templates/about_us.html:27
msgid ""
-"Submit those cool exercises that you absolutely\n"
-"love and do every week but are not in the list yet. If you think some "
-"description\n"
-"is too short or some other detail is missing or could be improved, tell!"
+"Get in touch if something didn't behave as expected or if there is a feature "
+"that you feel is missing."
msgstr ""
-#: software/templates/contribute.html:44
-msgid ""
-"Do you want to use wger in your own language?\n"
-"Do you think the current translation could be improved?\n"
-"The translations are easily managed and edited online, if you are "
-"interested,\n"
-"visit the link and start translating."
+#: software/templates/about_us.html:32
+msgid "Say hi!"
msgstr ""
-#: software/templates/contribute.html:53
-msgid "Code"
+#: software/templates/about_us.html:34
+msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
-#: software/templates/contribute.html:54
+#: software/templates/about_us.html:39
+#, fuzzy
+#| msgid "Translate"
+msgid "Translation"
+msgstr "Lefordítás"
+
+#: software/templates/about_us.html:41
msgid ""
-"Obviously, you are highly encouraged to clone the\n"
-"repo and start hacking! Once you are ready, send a pull request and we\n"
-"will show the world. Take a look at the developer guide for more details\n"
-"on this."
+"This application is translated on weblate. If you also want to help, click "
+"the link and start translating"
msgstr ""
-#: software/templates/contribute.html:66
+#: software/templates/about_us.html:50
msgid "Our goal"
msgstr ""
-#: software/templates/contribute.html:69
+#: software/templates/about_us.html:53
msgid ""
"The goal is to build an awesome\n"
"and flexible fitness manager, along with a comprehensive and complete list "
@@ -3754,78 +3642,6 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr ""
-#: software/templates/issues.html:6
-msgid "Reporting a problem"
-msgstr ""
-
-#: software/templates/issues.html:10
-msgid ""
-"\n"
-"No software is perfect. For some severe errors, an email will be "
-"automatically sent, but\n"
-"not always, so I depend on you reporting everything that didn't behave as "
-"expected.\n"
-"Please describe in as much detail as you can what you were doing when the "
-"error\n"
-"happened.\n"
-msgstr ""
-
-#: software/templates/issues.html:21
-msgid "report problem to the issue tracker"
-msgstr ""
-
-#: software/templates/issues.html:25
-msgid "Enhancements"
-msgstr ""
-
-#: software/templates/issues.html:27
-msgid ""
-"\n"
-"The issue tracker can also be used to document enhancements to the "
-"software.\n"
-"If you have some suggestions or think a feature is missing, feel\n"
-"free to open a ticket. This can be anything from a slight change to a whole\n"
-"new section of the site. Please keep in mind that not all wishes can be\n"
-"implemented."
-msgstr ""
-
-#: software/templates/issues.html:36
-msgid "report wish to the issue tracker"
-msgstr ""
-
-#: software/templates/issues.html:41
-msgid "No Github account?"
-msgstr ""
-
-#: software/templates/issues.html:42
-msgid ""
-"Filing an issue requires a github account, if you don't\n"
-"have one and don't want to register, you can also send it to\n"
-"<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
-msgstr ""
-
-#: software/templates/license.html:10
-msgid ""
-"wger Workout Manager is Free/Libre Open Source\n"
-"Software (FLOSS)."
-msgstr ""
-
-#: software/templates/license.html:22
-msgid ""
-"wger Workout Manager is released under the <strong>Affero GNU\n"
-"General Public License (AGPL) Version 3+</strong> and can (under the "
-"conditions\n"
-"of the license) be used, modified and distributed (also with modifications)\n"
-"without restrictions."
-msgstr ""
-
-#: software/templates/license.html:29
-msgid ""
-"A copy the license text is contained in every wger Workout\n"
-"Manager release (LICENSE.txt) and can be read online on the website of\n"
-"<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</a>."
-msgstr ""
-
#: utils/generic_views.py:261
msgid "Yes, delete"
msgstr "Igen, töröld"
@@ -3989,6 +3805,45 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "GNUPG-Key:"
+#~ msgstr "GNUPG-Kulcs:"
+
+#~ msgid "Get in touch"
+#~ msgstr "Lépj kapcsolatba"
+
+#~ msgid "Feedback form"
+#~ msgstr "Visszajelzés űrlap"
+
+#~ msgid ""
+#~ "A simple contact form. Remember that\n"
+#~ "if you want an answer, you need to include some way to contact you."
+#~ msgstr ""
+#~ "Egy egyszerű kapcsolati űrlap.\n"
+#~ "Amennyiben szeretnél választ kapni, akkor mindenképpen adj meg valami "
+#~ "elérhetőséget."
+
+#~ msgid "Twitter"
+#~ msgstr "Twitter"
+
+#~ msgid ""
+#~ "We are also on twitter. Write us and tell us what\n"
+#~ "you think! Except patches, don't send patches via twitter."
+#~ msgstr ""
+#~ "Twitteren is elérhetőek vagyunk. Írj nekünk és mond el\n"
+#~ "amit gondolsz. Kivéve patchet, ne küldj patchet twitteren keresztül."
+
+#~ msgid "Open feedback form"
+#~ msgstr "Visszajelzési űrlap megnyitása"
+
+#~ msgid "Contribute!"
+#~ msgstr "Vegyél részt!"
+
+#~ msgid "Problems and wishes"
+#~ msgstr "Problémák és kívánságok"
+
+#~ msgid "About"
+#~ msgstr "Impresszum"
+
#~ msgid "Use pauses in workout timer"
#~ msgstr "Használjon szüneteket az edzés időzítő"
diff --git a/wger/locale/it/LC_MESSAGES/django.po b/wger/locale/it/LC_MESSAGES/django.po
index 27dd59694..ec565e7da 100644
--- a/wger/locale/it/LC_MESSAGES/django.po
+++ b/wger/locale/it/LC_MESSAGES/django.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-17 15:00+0200\n"
+"POT-Creation-Date: 2021-08-17 17:23+0200\n"
"PO-Revision-Date: 2021-06-18 08:48+0000\n"
"Last-Translator: Roland Geider <[email protected]>\n"
"Language-Team: Italian <https://hosted.weblate.org/projects/wger/web/it/>\n"
@@ -49,7 +49,7 @@ msgstr "Esercizi"
msgid "Ingredients"
msgstr "Ingredienti"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:225
+#: config/templates/language/overview.html:4 core/templates/navigation.html:228
msgid "Languages"
msgstr "Lingue"
@@ -227,8 +227,8 @@ msgstr "Il mio programma di allenamento"
msgid "Empty placeholder schedule"
msgstr "Programma segnaposto vuoto"
-#: core/forms.py:61 core/templates/navigation.html:187
-#: core/templates/navigation.html:191 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:190
+#: core/templates/navigation.html:194 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Entra"
@@ -305,8 +305,8 @@ msgstr "Password non valida"
msgid "The form is secured with reCAPTCHA"
msgstr "Quest formulario è protetto con reCAPTCHA"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:187
-#: core/templates/navigation.html:192 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
+#: core/templates/navigation.html:195 core/templates/template.html:150
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -808,101 +808,11 @@ msgstr "Elenco delle licenze"
msgid "Nothing found"
msgstr "Trovato niente"
-#: core/templates/misc/about.html:4
-msgid "About us"
-msgstr "Chi siamo"
-
-#: core/templates/misc/about.html:8
-msgid "Responsible for the content of this site as per German law §5 TMG:"
-msgstr ""
-"Responsabile per il contenuto di questo sito secondo la legge tedesca §5 TMG:"
-
-#: core/templates/misc/about.html:16
-msgid "GNUPG-Key:"
-msgstr "Chiave GNUPG:"
-
-#: core/templates/misc/contact.html:4 core/templates/navigation.html:153
-#: core/templates/template_features.html:86
-#: software/templates/contribute.html:28
-msgid "Get in touch"
-msgstr "Contatti"
-
-#: core/templates/misc/contact.html:10
-#, python-format
-msgid ""
-"Thank you for your interest. Feel free to use any of the\n"
-"ways below to send feedback you have about any aspect of the site. For\n"
-"support, say hi\n"
-"<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
-"a bug, consider doing it through the <a href=\"%(issues)s\">issue tracker</"
-"a>\n"
-"."
-msgstr ""
-"Grazie per l'interesse. Sentiti libero di usare qualsiasi dei metodi qui "
-"sotto per inviarci le tue opinioni su qualsiasi aspetto del sito. Per avere "
-"aiuto, contattaci sul\n"
-"<a href=\"%(discord)s\">Canale Discord</a>, per segnalare\n"
-"un errore, considera farlo tramite il <a href=\"%(issues)s\">tracker degli "
-"errori</a>"
-
-#: core/templates/misc/contact.html:20
-#, python-format
-msgid ""
-"If you want to further help and improve this project,\n"
-"you might also be interested <a href=\"%(contribute)s\">in contributing</a>."
-msgstr ""
-"Se vuoi aiutare ulteriormente e migliorare questo progetto,\n"
-"potresti anche aver voglia di <a href=\"%(contribute)s\">contribuire</a>."
-
-#: core/templates/misc/contact.html:29
-msgid "Feedback form"
-msgstr "Modulo di feedback"
-
-#: core/templates/misc/contact.html:30
-msgid ""
-"A simple contact form. Remember that\n"
-"if you want an answer, you need to include some way to contact you."
-msgstr ""
-"Un semplice modulo di contatto. Ricordatelo\n"
-"se vuoi una risposta, devi includere un modo per contattarti."
-
-#: core/templates/misc/contact.html:35
-msgid "Twitter"
-msgstr "Twitter"
-
-#: core/templates/misc/contact.html:36
-msgid ""
-"We are also on twitter. Write us and tell us what\n"
-"you think! Except patches, don't send patches via twitter."
-msgstr ""
-"Siamo anche su Twitter. Scrivici e dicci cosa\n"
-"ne pensi! Tranne le patch, non inviare le patch tramite Twitter."
-
-#: core/templates/misc/contact.html:42
-msgid "Discord"
-msgstr "Discord"
-
-#: core/templates/misc/contact.html:43
-msgid ""
-"Use the public group to get support for your\n"
-"local wger installation, discuss issues or your new idea, etc.\n"
-"(no registration needed)"
+#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/template_features.html:118
+#: core/templates/template_no_context.html:88
+msgid "Imprint"
msgstr ""
-"Usa il gruppo pubblico per ottenere supporto per la tua\n"
-"installazione di wger locale, discutere problemi o la tua nuova idea, ecc.\n"
-"(nessuna registrazione necessaria)"
-
-#: core/templates/misc/contact.html:49
-msgid "Open feedback form"
-msgstr "Apri modulo di commento"
-
-#: core/templates/misc/contact.html:53
-msgid "tweet to @wger_project"
-msgstr "tweet a @wger_project"
-
-#: core/templates/misc/contact.html:56
-msgid "Go to the discord server"
-msgstr "Vai al canale Discord"
#: core/templates/misc/fragments/shariff_modal.html:6
msgid "Share this page"
@@ -995,7 +905,7 @@ msgid "Add new exercise"
msgstr "Aggiungi un nuovo esercizio"
#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:223
+#: core/templates/navigation.html:226
msgid "Administration"
msgstr "Amministrazione"
@@ -1062,68 +972,62 @@ msgid "About this software"
msgstr "Informazioni"
#: core/templates/navigation.html:151 core/templates/template_features.html:83
-#: software/templates/contribute.html:6
-msgid "Contribute!"
-msgstr "Contribuisci!"
-
-#: core/templates/navigation.html:152
-msgid "Problems and wishes"
-msgstr "Problemi e desideri"
+#: software/templates/about_us.html:5
+msgid "About us"
+msgstr "Chi siamo"
-#: core/templates/navigation.html:155 software/templates/features.html:209
+#: core/templates/navigation.html:153 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:156 software/templates/license.html:7
-#: utils/models.py:40
+#: core/templates/navigation.html:157 utils/models.py:40
msgid "License"
msgstr "Licenza"
-#: core/templates/navigation.html:160
+#: core/templates/navigation.html:163
msgid "Developer documentation"
msgstr "Documentazione dello sviluppatore"
-#: core/templates/navigation.html:166 software/templates/contribute.html:59
+#: core/templates/navigation.html:169
msgid "Get the code"
msgstr "Ottieni il codice"
-#: core/templates/navigation.html:172 core/templates/template.html:193
-#: core/templates/template_features.html:103
-#: software/templates/contribute.html:43 software/templates/contribute.html:50
+#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/template_features.html:100
msgid "Translate"
msgstr "Traduci"
-#: core/templates/navigation.html:193 core/templates/user/login.html:28
+#: core/templates/navigation.html:196 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Reimposta la password"
-#: core/templates/navigation.html:206
+#: core/templates/navigation.html:209
msgid "My preferences"
msgstr "Preferenze"
-#: core/templates/navigation.html:213
+#: core/templates/navigation.html:216
msgid "Logout"
msgstr "Esci"
-#: core/templates/navigation.html:228
+#: core/templates/navigation.html:231
msgid "Licenses"
msgstr "Licenza"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:234
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Unità di ripetizione"
-#: core/templates/navigation.html:234 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Unità peso"
-#: core/templates/navigation.html:237 core/templates/user/list.html:4
+#: core/templates/navigation.html:240 core/templates/user/list.html:4
msgid "User list"
msgstr "Lista utenti"
-#: core/templates/navigation.html:238
+#: core/templates/navigation.html:241
msgid "Gyms"
msgstr "Palestre"
@@ -1244,18 +1148,12 @@ msgstr ""
msgid "Create some demo entries"
msgstr "Crea alcune voci demo"
-#: core/templates/template.html:201 core/templates/template_features.html:121
-#: core/templates/template_no_context.html:88
-msgid "About"
-msgstr "Informazioni"
-
-#: core/templates/template.html:202 core/templates/template_features.html:125
+#: core/templates/template.html:202 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Termini di servizio"
#: core/templates/template.html:209 core/templates/template.html:210
-#: software/templates/license.html:18 software/templates/license.html:19
msgid "Released under the Affero GPL"
msgstr "Rilasciato sotto la GPL Affero"
@@ -1617,15 +1515,15 @@ msgstr ""
msgid "Rest day"
msgstr "Giorno di riposo"
-#: core/views/misc.py:199
+#: core/views/misc.py:184
msgid "Feedback"
msgstr "Commenti"
-#: core/views/misc.py:218 weight/templates/import_csv_form.html:9
+#: core/views/misc.py:203 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Invia"
-#: core/views/misc.py:226
+#: core/views/misc.py:211
msgid "Your feedback was successfully sent. Thank you!"
msgstr "Il tuo commento è stato mandato con successo. Grazie!"
@@ -1799,7 +1697,6 @@ msgstr "Nome esercizio"
#: exercises/templates/exercise/overview.html:118
#: exercises/templates/muscles/overview.html:114
#: nutrition/templates/ingredient/overview.html:85
-#: software/templates/contribute.html:39
msgid "Only registered users can do this"
msgstr "Soli gli utenti registrato possono fare questo"
@@ -2012,7 +1909,7 @@ msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr "%(name_original)s è troppo simile a «%(exercise_name)s»"
-#: exercises/views/exercises.py:246 software/templates/contribute.html:37
+#: exercises/views/exercises.py:246
msgid "Add exercise"
msgstr "Aggiungi esercizio"
@@ -3797,109 +3694,55 @@ msgstr "Aggiungi una nuova unità di peso"
msgid "Edit a weight unit to ingredient connection"
msgstr "Modifica un'unità di peso collegato all'ingrediente"
-#: software/templates/contribute.html:9
+#: software/templates/about_us.html:9
msgid ""
-"wger Workout Manager is build by volunteers,\n"
-"the development process is open and freely accessible to anybody "
-"interested.\n"
-"If you are new to the free software world, we recommend to take a\n"
-"look <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
-"article</a> which summarizes they way open source projects work very well. "
+"Thank you for using wger! wger is a collaborative open source project, made "
+"by fitness enthusiasts from around the world."
msgstr ""
-"wger Workout Manager è realizzato da volontari,\n"
-"il processo di sviluppo è aperto e liberamente accessibile a chiunque sia "
-"interessato.\n"
-"Se sei nuovo/a nel mondo del software libero, ti consigliamo di prendere "
-"visione\n"
-"di <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">questo\n"
-"articolo</a> che riassume in che modo i progetti con codice sorgente aperto "
-"funzionano molto bene. "
-
-#: software/templates/contribute.html:16
-msgid ""
-"Any kind of contribution is appreciated and welcome.\n"
-"Use this opportunity and influence the direction of the\n"
-"project. "
+
+#: software/templates/about_us.html:18
+msgid "Source code"
msgstr ""
-"Qualsiasi tipo di contributo è apprezzato e benvenuto.\n"
-"Usa questa opportunità e influenza la direzione del\n"
-"progetto."
-#: software/templates/contribute.html:23
-msgid "Use the site"
-msgstr "Usa il sito"
+#: software/templates/about_us.html:20
+msgid "Get the source code of this application and its server on github"
+msgstr ""
-#: software/templates/contribute.html:24
-msgid ""
-"Simply use the site and tell your friends\n"
-"how useful it is! ;) . When you find something that you specially liked,\n"
-"could need some improvements or just doesn't work, tell us! This might not "
-"sound\n"
-"like much, but is incredibly important!"
+#: software/templates/about_us.html:25
+msgid "Have a problem or idea?"
msgstr ""
-"Usa semplicemente il sito e dillo ai tuoi amici\n"
-"quanto è utile! ;). Quando trovi qualcosa che ti è particolarmente "
-"piaciuto,\n"
-"potrebbe aver bisogno di miglioramenti o semplicemente non funziona, dicci! "
-"Questo potrebbe non essere\n"
-"molto, ma è incredibilmente importante!"
-
-#: software/templates/contribute.html:31
-msgid "Submit exercises"
-msgstr "Invia esercizi"
-
-#: software/templates/contribute.html:32
+
+#: software/templates/about_us.html:27
msgid ""
-"Submit those cool exercises that you absolutely\n"
-"love and do every week but are not in the list yet. If you think some "
-"description\n"
-"is too short or some other detail is missing or could be improved, tell!"
+"Get in touch if something didn't behave as expected or if there is a feature "
+"that you feel is missing."
msgstr ""
-"Invia quei fantastici esercizi che assolutamente\n"
-"ami e che fai ogni settimana ma non sono ancora nella lista. Se pensi che "
-"qualche descrizione\n"
-"sia troppo corta o manca qualche altro dettaglio o potrebbe essere "
-"migliorato,basta dire!"
-#: software/templates/contribute.html:44
-msgid ""
-"Do you want to use wger in your own language?\n"
-"Do you think the current translation could be improved?\n"
-"The translations are easily managed and edited online, if you are "
-"interested,\n"
-"visit the link and start translating."
+#: software/templates/about_us.html:32
+msgid "Say hi!"
msgstr ""
-"Vuoi usare il wger nella tua lingua?\n"
-"Pensi che la traduzione attuale possa essere migliorata?\n"
-"Le traduzioni sono facilmente gestibili e modificate online, se sei "
-"interessato,\n"
-"visita il link e comincia a tradurre."
-#: software/templates/contribute.html:53
-msgid "Code"
-msgstr "Codice"
+#: software/templates/about_us.html:34
+msgid "If you want to chat with us, hop on the Discord server and get in touch"
+msgstr ""
-#: software/templates/contribute.html:54
+#: software/templates/about_us.html:39
+#, fuzzy
+#| msgid "Translate"
+msgid "Translation"
+msgstr "Traduci"
+
+#: software/templates/about_us.html:41
msgid ""
-"Obviously, you are highly encouraged to clone the\n"
-"repo and start hacking! Once you are ready, send a pull request and we\n"
-"will show the world. Take a look at the developer guide for more details\n"
-"on this."
+"This application is translated on weblate. If you also want to help, click "
+"the link and start translating"
msgstr ""
-"Ovviamente, sei fortemente incoraggiato a clonare il\n"
-"repo e ad iniziare l'hacking! Una volta che sei pronto, invia una richiesta "
-"di pull e noi\n"
-"ti mostreremo il mondo. Dai un'occhiata alla guida per gli sviluppatori per "
-"maggiori dettagli\n"
-"su questo."
-
-#: software/templates/contribute.html:66
+
+#: software/templates/about_us.html:50
msgid "Our goal"
msgstr "Il nostro obbiettivo"
-#: software/templates/contribute.html:69
+#: software/templates/about_us.html:53
msgid ""
"The goal is to build an awesome\n"
"and flexible fitness manager, along with a comprehensive and complete list "
@@ -4072,109 +3915,6 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr "100%% gratuito <br>e <br>aperto"
-#: software/templates/issues.html:6
-msgid "Reporting a problem"
-msgstr "Segnala un problema"
-
-#: software/templates/issues.html:10
-msgid ""
-"\n"
-"No software is perfect. For some severe errors, an email will be "
-"automatically sent, but\n"
-"not always, so I depend on you reporting everything that didn't behave as "
-"expected.\n"
-"Please describe in as much detail as you can what you were doing when the "
-"error\n"
-"happened.\n"
-msgstr ""
-"\n"
-"Nessun software è perfetto. Per alcuni errori gravi, verrà inviata "
-"automaticamente un'e-mail, ma\n"
-"non sempre, quindi io dipendo da te riportando tutto ciò che non si è "
-"comportato come previsto.\n"
-"Per favore descrivi nel modo più dettagliato possibile ciò che stavi facendo "
-"quando l'errore\n"
-"è accaduto.\n"
-
-#: software/templates/issues.html:21
-msgid "report problem to the issue tracker"
-msgstr "segnala un problema nel tracker dei problemi"
-
-#: software/templates/issues.html:25
-msgid "Enhancements"
-msgstr "Miglioramenti"
-
-#: software/templates/issues.html:27
-msgid ""
-"\n"
-"The issue tracker can also be used to document enhancements to the "
-"software.\n"
-"If you have some suggestions or think a feature is missing, feel\n"
-"free to open a ticket. This can be anything from a slight change to a whole\n"
-"new section of the site. Please keep in mind that not all wishes can be\n"
-"implemented."
-msgstr ""
-"\n"
-"Il tracker dei problemi può anche essere utilizzato per documentare "
-"miglioramenti al software.\n"
-"Se hai qualche suggerimento o pensi che manchi una funzionalità, sentiti\n"
-"libero di aprire un ticket. Questo può essere qualsiasi cosa, da un leggero "
-"cambiamento a tutta\n"
-"una nuova sezione del sito. Si prega di tenere presente che non tutti i "
-"desideri possono essere\n"
-"implementati."
-
-#: software/templates/issues.html:36
-msgid "report wish to the issue tracker"
-msgstr "segnala il tuo desiderio al tracker dei problemi"
-
-#: software/templates/issues.html:41
-msgid "No Github account?"
-msgstr "Nessun account Github?"
-
-#: software/templates/issues.html:42
-msgid ""
-"Filing an issue requires a github account, if you don't\n"
-"have one and don't want to register, you can also send it to\n"
-"<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
-msgstr ""
-"Presentare un problema richiede un account Github, se non ne\n"
-"hai uno e non vuoi registrarti, puoi anche inviarlo alla\n"
-"<a href=\"https://groups.google.com/group/wger\">lista di diffusione</a>."
-
-#: software/templates/license.html:10
-msgid ""
-"wger Workout Manager is Free/Libre Open Source\n"
-"Software (FLOSS)."
-msgstr ""
-"wger Workout Manager è un software\n"
-"libero e gratuito."
-
-#: software/templates/license.html:22
-msgid ""
-"wger Workout Manager is released under the <strong>Affero GNU\n"
-"General Public License (AGPL) Version 3+</strong> and can (under the "
-"conditions\n"
-"of the license) be used, modified and distributed (also with modifications)\n"
-"without restrictions."
-msgstr ""
-"wger Workout Manager è rilasciato sotto <strong>Affero GNU\n"
-"General Public License (AGPL) Versione 3+</strong> e può (in base alle "
-"condizioni\n"
-"della licenza) essere utilizzato, modificato e distribuito (anche con "
-"modifiche)\n"
-"senza restrizioni."
-
-#: software/templates/license.html:29
-msgid ""
-"A copy the license text is contained in every wger Workout\n"
-"Manager release (LICENSE.txt) and can be read online on the website of\n"
-"<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</a>."
-msgstr ""
-"Una copia del testo della licenza è contenuta in ogni allenamento di wger\n"
-"Release Manager (LICENSE.txt) e può essere letto online sul sito Web del\n"
-"<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>progetto GNU</a>."
-
#: utils/generic_views.py:261
msgid "Yes, delete"
msgstr "Sì, elimina"
@@ -4366,6 +4106,278 @@ msgstr "Cancellato con successo"
msgid "Delete weight entry for the %s"
msgstr "Cancellato il peso inserito di %s"
+#~ msgid "Responsible for the content of this site as per German law §5 TMG:"
+#~ msgstr ""
+#~ "Responsabile per il contenuto di questo sito secondo la legge tedesca §5 "
+#~ "TMG:"
+
+#~ msgid "GNUPG-Key:"
+#~ msgstr "Chiave GNUPG:"
+
+#~ msgid "Get in touch"
+#~ msgstr "Contatti"
+
+#~ msgid ""
+#~ "Thank you for your interest. Feel free to use any of the\n"
+#~ "ways below to send feedback you have about any aspect of the site. For\n"
+#~ "support, say hi\n"
+#~ "<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
+#~ "a bug, consider doing it through the <a href=\"%(issues)s\">issue "
+#~ "tracker</a>\n"
+#~ "."
+#~ msgstr ""
+#~ "Grazie per l'interesse. Sentiti libero di usare qualsiasi dei metodi qui "
+#~ "sotto per inviarci le tue opinioni su qualsiasi aspetto del sito. Per "
+#~ "avere aiuto, contattaci sul\n"
+#~ "<a href=\"%(discord)s\">Canale Discord</a>, per segnalare\n"
+#~ "un errore, considera farlo tramite il <a href=\"%(issues)s\">tracker "
+#~ "degli errori</a>"
+
+#~ msgid ""
+#~ "If you want to further help and improve this project,\n"
+#~ "you might also be interested <a href=\"%(contribute)s\">in contributing</"
+#~ "a>."
+#~ msgstr ""
+#~ "Se vuoi aiutare ulteriormente e migliorare questo progetto,\n"
+#~ "potresti anche aver voglia di <a href=\"%(contribute)s\">contribuire</a>."
+
+#~ msgid "Feedback form"
+#~ msgstr "Modulo di feedback"
+
+#~ msgid ""
+#~ "A simple contact form. Remember that\n"
+#~ "if you want an answer, you need to include some way to contact you."
+#~ msgstr ""
+#~ "Un semplice modulo di contatto. Ricordatelo\n"
+#~ "se vuoi una risposta, devi includere un modo per contattarti."
+
+#~ msgid "Twitter"
+#~ msgstr "Twitter"
+
+#~ msgid ""
+#~ "We are also on twitter. Write us and tell us what\n"
+#~ "you think! Except patches, don't send patches via twitter."
+#~ msgstr ""
+#~ "Siamo anche su Twitter. Scrivici e dicci cosa\n"
+#~ "ne pensi! Tranne le patch, non inviare le patch tramite Twitter."
+
+#~ msgid "Discord"
+#~ msgstr "Discord"
+
+#~ msgid ""
+#~ "Use the public group to get support for your\n"
+#~ "local wger installation, discuss issues or your new idea, etc.\n"
+#~ "(no registration needed)"
+#~ msgstr ""
+#~ "Usa il gruppo pubblico per ottenere supporto per la tua\n"
+#~ "installazione di wger locale, discutere problemi o la tua nuova idea, "
+#~ "ecc.\n"
+#~ "(nessuna registrazione necessaria)"
+
+#~ msgid "Open feedback form"
+#~ msgstr "Apri modulo di commento"
+
+#~ msgid "tweet to @wger_project"
+#~ msgstr "tweet a @wger_project"
+
+#~ msgid "Go to the discord server"
+#~ msgstr "Vai al canale Discord"
+
+#~ msgid "Contribute!"
+#~ msgstr "Contribuisci!"
+
+#~ msgid "Problems and wishes"
+#~ msgstr "Problemi e desideri"
+
+#~ msgid "About"
+#~ msgstr "Informazioni"
+
+#~ msgid ""
+#~ "wger Workout Manager is build by volunteers,\n"
+#~ "the development process is open and freely accessible to anybody "
+#~ "interested.\n"
+#~ "If you are new to the free software world, we recommend to take a\n"
+#~ "look <a href=\"http://schlitt.info/opensource/"
+#~ "blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
+#~ "article</a> which summarizes they way open source projects work very "
+#~ "well. "
+#~ msgstr ""
+#~ "wger Workout Manager è realizzato da volontari,\n"
+#~ "il processo di sviluppo è aperto e liberamente accessibile a chiunque sia "
+#~ "interessato.\n"
+#~ "Se sei nuovo/a nel mondo del software libero, ti consigliamo di prendere "
+#~ "visione\n"
+#~ "di <a href=\"http://schlitt.info/opensource/"
+#~ "blog/0541_10_golden_rules_for_starting_with_open_source.html\">questo\n"
+#~ "articolo</a> che riassume in che modo i progetti con codice sorgente "
+#~ "aperto funzionano molto bene. "
+
+#~ msgid ""
+#~ "Any kind of contribution is appreciated and welcome.\n"
+#~ "Use this opportunity and influence the direction of the\n"
+#~ "project. "
+#~ msgstr ""
+#~ "Qualsiasi tipo di contributo è apprezzato e benvenuto.\n"
+#~ "Usa questa opportunità e influenza la direzione del\n"
+#~ "progetto."
+
+#~ msgid "Use the site"
+#~ msgstr "Usa il sito"
+
+#~ msgid ""
+#~ "Simply use the site and tell your friends\n"
+#~ "how useful it is! ;) . When you find something that you specially liked,\n"
+#~ "could need some improvements or just doesn't work, tell us! This might "
+#~ "not sound\n"
+#~ "like much, but is incredibly important!"
+#~ msgstr ""
+#~ "Usa semplicemente il sito e dillo ai tuoi amici\n"
+#~ "quanto è utile! ;). Quando trovi qualcosa che ti è particolarmente "
+#~ "piaciuto,\n"
+#~ "potrebbe aver bisogno di miglioramenti o semplicemente non funziona, "
+#~ "dicci! Questo potrebbe non essere\n"
+#~ "molto, ma è incredibilmente importante!"
+
+#~ msgid "Submit exercises"
+#~ msgstr "Invia esercizi"
+
+#~ msgid ""
+#~ "Submit those cool exercises that you absolutely\n"
+#~ "love and do every week but are not in the list yet. If you think some "
+#~ "description\n"
+#~ "is too short or some other detail is missing or could be improved, tell!"
+#~ msgstr ""
+#~ "Invia quei fantastici esercizi che assolutamente\n"
+#~ "ami e che fai ogni settimana ma non sono ancora nella lista. Se pensi che "
+#~ "qualche descrizione\n"
+#~ "sia troppo corta o manca qualche altro dettaglio o potrebbe essere "
+#~ "migliorato,basta dire!"
+
+#~ msgid ""
+#~ "Do you want to use wger in your own language?\n"
+#~ "Do you think the current translation could be improved?\n"
+#~ "The translations are easily managed and edited online, if you are "
+#~ "interested,\n"
+#~ "visit the link and start translating."
+#~ msgstr ""
+#~ "Vuoi usare il wger nella tua lingua?\n"
+#~ "Pensi che la traduzione attuale possa essere migliorata?\n"
+#~ "Le traduzioni sono facilmente gestibili e modificate online, se sei "
+#~ "interessato,\n"
+#~ "visita il link e comincia a tradurre."
+
+#~ msgid "Code"
+#~ msgstr "Codice"
+
+#~ msgid ""
+#~ "Obviously, you are highly encouraged to clone the\n"
+#~ "repo and start hacking! Once you are ready, send a pull request and we\n"
+#~ "will show the world. Take a look at the developer guide for more details\n"
+#~ "on this."
+#~ msgstr ""
+#~ "Ovviamente, sei fortemente incoraggiato a clonare il\n"
+#~ "repo e ad iniziare l'hacking! Una volta che sei pronto, invia una "
+#~ "richiesta di pull e noi\n"
+#~ "ti mostreremo il mondo. Dai un'occhiata alla guida per gli sviluppatori "
+#~ "per maggiori dettagli\n"
+#~ "su questo."
+
+#~ msgid "Reporting a problem"
+#~ msgstr "Segnala un problema"
+
+#~ msgid ""
+#~ "\n"
+#~ "No software is perfect. For some severe errors, an email will be "
+#~ "automatically sent, but\n"
+#~ "not always, so I depend on you reporting everything that didn't behave as "
+#~ "expected.\n"
+#~ "Please describe in as much detail as you can what you were doing when the "
+#~ "error\n"
+#~ "happened.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Nessun software è perfetto. Per alcuni errori gravi, verrà inviata "
+#~ "automaticamente un'e-mail, ma\n"
+#~ "non sempre, quindi io dipendo da te riportando tutto ciò che non si è "
+#~ "comportato come previsto.\n"
+#~ "Per favore descrivi nel modo più dettagliato possibile ciò che stavi "
+#~ "facendo quando l'errore\n"
+#~ "è accaduto.\n"
+
+#~ msgid "report problem to the issue tracker"
+#~ msgstr "segnala un problema nel tracker dei problemi"
+
+#~ msgid "Enhancements"
+#~ msgstr "Miglioramenti"
+
+#~ msgid ""
+#~ "\n"
+#~ "The issue tracker can also be used to document enhancements to the "
+#~ "software.\n"
+#~ "If you have some suggestions or think a feature is missing, feel\n"
+#~ "free to open a ticket. This can be anything from a slight change to a "
+#~ "whole\n"
+#~ "new section of the site. Please keep in mind that not all wishes can be\n"
+#~ "implemented."
+#~ msgstr ""
+#~ "\n"
+#~ "Il tracker dei problemi può anche essere utilizzato per documentare "
+#~ "miglioramenti al software.\n"
+#~ "Se hai qualche suggerimento o pensi che manchi una funzionalità, sentiti\n"
+#~ "libero di aprire un ticket. Questo può essere qualsiasi cosa, da un "
+#~ "leggero cambiamento a tutta\n"
+#~ "una nuova sezione del sito. Si prega di tenere presente che non tutti i "
+#~ "desideri possono essere\n"
+#~ "implementati."
+
+#~ msgid "report wish to the issue tracker"
+#~ msgstr "segnala il tuo desiderio al tracker dei problemi"
+
+#~ msgid "No Github account?"
+#~ msgstr "Nessun account Github?"
+
+#~ msgid ""
+#~ "Filing an issue requires a github account, if you don't\n"
+#~ "have one and don't want to register, you can also send it to\n"
+#~ "<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
+#~ msgstr ""
+#~ "Presentare un problema richiede un account Github, se non ne\n"
+#~ "hai uno e non vuoi registrarti, puoi anche inviarlo alla\n"
+#~ "<a href=\"https://groups.google.com/group/wger\">lista di diffusione</a>."
+
+#~ msgid ""
+#~ "wger Workout Manager is Free/Libre Open Source\n"
+#~ "Software (FLOSS)."
+#~ msgstr ""
+#~ "wger Workout Manager è un software\n"
+#~ "libero e gratuito."
+
+#~ msgid ""
+#~ "wger Workout Manager is released under the <strong>Affero GNU\n"
+#~ "General Public License (AGPL) Version 3+</strong> and can (under the "
+#~ "conditions\n"
+#~ "of the license) be used, modified and distributed (also with "
+#~ "modifications)\n"
+#~ "without restrictions."
+#~ msgstr ""
+#~ "wger Workout Manager è rilasciato sotto <strong>Affero GNU\n"
+#~ "General Public License (AGPL) Versione 3+</strong> e può (in base alle "
+#~ "condizioni\n"
+#~ "della licenza) essere utilizzato, modificato e distribuito (anche con "
+#~ "modifiche)\n"
+#~ "senza restrizioni."
+
+#~ msgid ""
+#~ "A copy the license text is contained in every wger Workout\n"
+#~ "Manager release (LICENSE.txt) and can be read online on the website of\n"
+#~ "<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</"
+#~ "a>."
+#~ msgstr ""
+#~ "Una copia del testo della licenza è contenuta in ogni allenamento di "
+#~ "wger\n"
+#~ "Release Manager (LICENSE.txt) e può essere letto online sul sito Web del\n"
+#~ "<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>progetto GNU</a>."
+
#~ msgid "Use pauses in workout timer"
#~ msgstr "Utilizza le pause nel timer dell'allenamento"
diff --git a/wger/locale/ja/LC_MESSAGES/django.po b/wger/locale/ja/LC_MESSAGES/django.po
index ea3bfe9a5..d523b7d57 100644
--- a/wger/locale/ja/LC_MESSAGES/django.po
+++ b/wger/locale/ja/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-17 15:00+0200\n"
+"POT-Creation-Date: 2021-08-17 17:23+0200\n"
"PO-Revision-Date: 2021-04-11 18:54+0000\n"
"Last-Translator: rge <[email protected]>\n"
"Language-Team: Japanese (http://www.transifex.com/rge/wger-workout-manager/"
@@ -42,7 +42,7 @@ msgstr "運動"
msgid "Ingredients"
msgstr "材料"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:225
+#: config/templates/language/overview.html:4 core/templates/navigation.html:228
msgid "Languages"
msgstr "言語"
@@ -214,8 +214,8 @@ msgstr ""
msgid "Empty placeholder schedule"
msgstr ""
-#: core/forms.py:61 core/templates/navigation.html:187
-#: core/templates/navigation.html:191 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:190
+#: core/templates/navigation.html:194 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "ログイン"
@@ -290,8 +290,8 @@ msgstr "パスワードは無効です。"
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:187
-#: core/templates/navigation.html:192 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
+#: core/templates/navigation.html:195 core/templates/template.html:150
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -759,84 +759,10 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4
-msgid "About us"
-msgstr ""
-
-#: core/templates/misc/about.html:8
-msgid "Responsible for the content of this site as per German law §5 TMG:"
-msgstr ""
-
-#: core/templates/misc/about.html:16
-msgid "GNUPG-Key:"
-msgstr ""
-
-#: core/templates/misc/contact.html:4 core/templates/navigation.html:153
-#: core/templates/template_features.html:86
-#: software/templates/contribute.html:28
-msgid "Get in touch"
-msgstr ""
-
-#: core/templates/misc/contact.html:10
-#, python-format
-msgid ""
-"Thank you for your interest. Feel free to use any of the\n"
-"ways below to send feedback you have about any aspect of the site. For\n"
-"support, say hi\n"
-"<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
-"a bug, consider doing it through the <a href=\"%(issues)s\">issue tracker</"
-"a>\n"
-"."
-msgstr ""
-
-#: core/templates/misc/contact.html:20
-#, python-format
-msgid ""
-"If you want to further help and improve this project,\n"
-"you might also be interested <a href=\"%(contribute)s\">in contributing</a>."
-msgstr ""
-
-#: core/templates/misc/contact.html:29
-msgid "Feedback form"
-msgstr ""
-
-#: core/templates/misc/contact.html:30
-msgid ""
-"A simple contact form. Remember that\n"
-"if you want an answer, you need to include some way to contact you."
-msgstr ""
-
-#: core/templates/misc/contact.html:35
-msgid "Twitter"
-msgstr "Twitter"
-
-#: core/templates/misc/contact.html:36
-msgid ""
-"We are also on twitter. Write us and tell us what\n"
-"you think! Except patches, don't send patches via twitter."
-msgstr ""
-
-#: core/templates/misc/contact.html:42
-msgid "Discord"
-msgstr ""
-
-#: core/templates/misc/contact.html:43
-msgid ""
-"Use the public group to get support for your\n"
-"local wger installation, discuss issues or your new idea, etc.\n"
-"(no registration needed)"
-msgstr ""
-
-#: core/templates/misc/contact.html:49
-msgid "Open feedback form"
-msgstr ""
-
-#: core/templates/misc/contact.html:53
-msgid "tweet to @wger_project"
-msgstr ""
-
-#: core/templates/misc/contact.html:56
-msgid "Go to the discord server"
+#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/template_features.html:118
+#: core/templates/template_no_context.html:88
+msgid "Imprint"
msgstr ""
#: core/templates/misc/fragments/shariff_modal.html:6
@@ -922,7 +848,7 @@ msgid "Add new exercise"
msgstr ""
#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:223
+#: core/templates/navigation.html:226
msgid "Administration"
msgstr ""
@@ -989,68 +915,62 @@ msgid "About this software"
msgstr ""
#: core/templates/navigation.html:151 core/templates/template_features.html:83
-#: software/templates/contribute.html:6
-msgid "Contribute!"
-msgstr ""
-
-#: core/templates/navigation.html:152
-msgid "Problems and wishes"
+#: software/templates/about_us.html:5
+msgid "About us"
msgstr ""
-#: core/templates/navigation.html:155 software/templates/features.html:209
+#: core/templates/navigation.html:153 software/templates/features.html:209
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:156 software/templates/license.html:7
-#: utils/models.py:40
+#: core/templates/navigation.html:157 utils/models.py:40
msgid "License"
msgstr "ライセンス"
-#: core/templates/navigation.html:160
+#: core/templates/navigation.html:163
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:166 software/templates/contribute.html:59
+#: core/templates/navigation.html:169
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:172 core/templates/template.html:193
-#: core/templates/template_features.html:103
-#: software/templates/contribute.html:43 software/templates/contribute.html:50
+#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/template_features.html:100
msgid "Translate"
msgstr "翻訳"
-#: core/templates/navigation.html:193 core/templates/user/login.html:28
+#: core/templates/navigation.html:196 core/templates/user/login.html:28
msgid "Reset password"
msgstr "パスワード再設定"
-#: core/templates/navigation.html:206
+#: core/templates/navigation.html:209
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:213
+#: core/templates/navigation.html:216
msgid "Logout"
msgstr "ロッグアウト"
-#: core/templates/navigation.html:228
+#: core/templates/navigation.html:231
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:234
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:234 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:237 core/templates/user/list.html:4
+#: core/templates/navigation.html:240 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:238
+#: core/templates/navigation.html:241
msgid "Gyms"
msgstr ""
@@ -1164,18 +1084,12 @@ msgstr ""
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:201 core/templates/template_features.html:121
-#: core/templates/template_no_context.html:88
-msgid "About"
-msgstr ""
-
-#: core/templates/template.html:202 core/templates/template_features.html:125
+#: core/templates/template.html:202 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "使用条件"
#: core/templates/template.html:209 core/templates/template.html:210
-#: software/templates/license.html:18 software/templates/license.html:19
msgid "Released under the Affero GPL"
msgstr ""
@@ -1523,15 +1437,15 @@ msgstr ""
msgid "Rest day"
msgstr ""
-#: core/views/misc.py:199
+#: core/views/misc.py:184
msgid "Feedback"
msgstr ""
-#: core/views/misc.py:218 weight/templates/import_csv_form.html:9
+#: core/views/misc.py:203 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr ""
-#: core/views/misc.py:226
+#: core/views/misc.py:211
msgid "Your feedback was successfully sent. Thank you!"
msgstr ""
@@ -1700,7 +1614,6 @@ msgstr ""
#: exercises/templates/exercise/overview.html:118
#: exercises/templates/muscles/overview.html:114
#: nutrition/templates/ingredient/overview.html:85
-#: software/templates/contribute.html:39
msgid "Only registered users can do this"
msgstr ""
@@ -1894,7 +1807,7 @@ msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246 software/templates/contribute.html:37
+#: exercises/views/exercises.py:246
msgid "Add exercise"
msgstr ""
@@ -3523,75 +3436,55 @@ msgstr ""
msgid "Edit a weight unit to ingredient connection"
msgstr ""
-#: software/templates/contribute.html:9
+#: software/templates/about_us.html:9
msgid ""
-"wger Workout Manager is build by volunteers,\n"
-"the development process is open and freely accessible to anybody "
-"interested.\n"
-"If you are new to the free software world, we recommend to take a\n"
-"look <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
-"article</a> which summarizes they way open source projects work very well. "
+"Thank you for using wger! wger is a collaborative open source project, made "
+"by fitness enthusiasts from around the world."
msgstr ""
-#: software/templates/contribute.html:16
-msgid ""
-"Any kind of contribution is appreciated and welcome.\n"
-"Use this opportunity and influence the direction of the\n"
-"project. "
+#: software/templates/about_us.html:18
+msgid "Source code"
msgstr ""
-#: software/templates/contribute.html:23
-msgid "Use the site"
+#: software/templates/about_us.html:20
+msgid "Get the source code of this application and its server on github"
msgstr ""
-#: software/templates/contribute.html:24
-msgid ""
-"Simply use the site and tell your friends\n"
-"how useful it is! ;) . When you find something that you specially liked,\n"
-"could need some improvements or just doesn't work, tell us! This might not "
-"sound\n"
-"like much, but is incredibly important!"
+#: software/templates/about_us.html:25
+msgid "Have a problem or idea?"
msgstr ""
-#: software/templates/contribute.html:31
-msgid "Submit exercises"
-msgstr ""
-
-#: software/templates/contribute.html:32
+#: software/templates/about_us.html:27
msgid ""
-"Submit those cool exercises that you absolutely\n"
-"love and do every week but are not in the list yet. If you think some "
-"description\n"
-"is too short or some other detail is missing or could be improved, tell!"
+"Get in touch if something didn't behave as expected or if there is a feature "
+"that you feel is missing."
msgstr ""
-#: software/templates/contribute.html:44
-msgid ""
-"Do you want to use wger in your own language?\n"
-"Do you think the current translation could be improved?\n"
-"The translations are easily managed and edited online, if you are "
-"interested,\n"
-"visit the link and start translating."
+#: software/templates/about_us.html:32
+msgid "Say hi!"
msgstr ""
-#: software/templates/contribute.html:53
-msgid "Code"
+#: software/templates/about_us.html:34
+msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
-#: software/templates/contribute.html:54
+#: software/templates/about_us.html:39
+#, fuzzy
+#| msgid "Translate"
+msgid "Translation"
+msgstr "翻訳"
+
+#: software/templates/about_us.html:41
msgid ""
-"Obviously, you are highly encouraged to clone the\n"
-"repo and start hacking! Once you are ready, send a pull request and we\n"
-"will show the world. Take a look at the developer guide for more details\n"
-"on this."
+"This application is translated on weblate. If you also want to help, click "
+"the link and start translating"
msgstr ""
-#: software/templates/contribute.html:66
+#: software/templates/about_us.html:50
msgid "Our goal"
msgstr ""
-#: software/templates/contribute.html:69
+#: software/templates/about_us.html:53
msgid ""
"The goal is to build an awesome\n"
"and flexible fitness manager, along with a comprehensive and complete list "
@@ -3726,78 +3619,6 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr ""
-#: software/templates/issues.html:6
-msgid "Reporting a problem"
-msgstr ""
-
-#: software/templates/issues.html:10
-msgid ""
-"\n"
-"No software is perfect. For some severe errors, an email will be "
-"automatically sent, but\n"
-"not always, so I depend on you reporting everything that didn't behave as "
-"expected.\n"
-"Please describe in as much detail as you can what you were doing when the "
-"error\n"
-"happened.\n"
-msgstr ""
-
-#: software/templates/issues.html:21
-msgid "report problem to the issue tracker"
-msgstr ""
-
-#: software/templates/issues.html:25
-msgid "Enhancements"
-msgstr ""
-
-#: software/templates/issues.html:27
-msgid ""
-"\n"
-"The issue tracker can also be used to document enhancements to the "
-"software.\n"
-"If you have some suggestions or think a feature is missing, feel\n"
-"free to open a ticket. This can be anything from a slight change to a whole\n"
-"new section of the site. Please keep in mind that not all wishes can be\n"
-"implemented."
-msgstr ""
-
-#: software/templates/issues.html:36
-msgid "report wish to the issue tracker"
-msgstr ""
-
-#: software/templates/issues.html:41
-msgid "No Github account?"
-msgstr ""
-
-#: software/templates/issues.html:42
-msgid ""
-"Filing an issue requires a github account, if you don't\n"
-"have one and don't want to register, you can also send it to\n"
-"<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
-msgstr ""
-
-#: software/templates/license.html:10
-msgid ""
-"wger Workout Manager is Free/Libre Open Source\n"
-"Software (FLOSS)."
-msgstr ""
-
-#: software/templates/license.html:22
-msgid ""
-"wger Workout Manager is released under the <strong>Affero GNU\n"
-"General Public License (AGPL) Version 3+</strong> and can (under the "
-"conditions\n"
-"of the license) be used, modified and distributed (also with modifications)\n"
-"without restrictions."
-msgstr ""
-
-#: software/templates/license.html:29
-msgid ""
-"A copy the license text is contained in every wger Workout\n"
-"Manager release (LICENSE.txt) and can be read online on the website of\n"
-"<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</a>."
-msgstr ""
-
#: utils/generic_views.py:261
msgid "Yes, delete"
msgstr ""
@@ -3961,6 +3782,9 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Twitter"
+#~ msgstr "Twitter"
+
#~ msgid "Last 3 months"
#~ msgstr "過去3ヶ月"
diff --git a/wger/locale/ko/LC_MESSAGES/django.po b/wger/locale/ko/LC_MESSAGES/django.po
index d60285ed2..2b1f6e3e7 100644
--- a/wger/locale/ko/LC_MESSAGES/django.po
+++ b/wger/locale/ko/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-17 15:00+0200\n"
+"POT-Creation-Date: 2021-08-17 17:23+0200\n"
"PO-Revision-Date: 2021-04-15 07:27+0000\n"
"Last-Translator: Allan Nordhøy <[email protected]>\n"
"Language-Team: Korean <https://hosted.weblate.org/projects/wger/web/ko/>\n"
@@ -41,7 +41,7 @@ msgstr "운동"
msgid "Ingredients"
msgstr "영양성분"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:225
+#: config/templates/language/overview.html:4 core/templates/navigation.html:228
msgid "Languages"
msgstr "언어"
@@ -213,8 +213,8 @@ msgstr ""
msgid "Empty placeholder schedule"
msgstr ""
-#: core/forms.py:61 core/templates/navigation.html:187
-#: core/templates/navigation.html:191 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:190
+#: core/templates/navigation.html:194 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "로그인"
@@ -291,8 +291,8 @@ msgstr "유효하지 않은 비밀번호"
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:187
-#: core/templates/navigation.html:192 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
+#: core/templates/navigation.html:195 core/templates/template.html:150
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -762,84 +762,10 @@ msgstr "라이센스 리스트"
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4
-msgid "About us"
-msgstr ""
-
-#: core/templates/misc/about.html:8
-msgid "Responsible for the content of this site as per German law §5 TMG:"
-msgstr ""
-
-#: core/templates/misc/about.html:16
-msgid "GNUPG-Key:"
-msgstr ""
-
-#: core/templates/misc/contact.html:4 core/templates/navigation.html:153
-#: core/templates/template_features.html:86
-#: software/templates/contribute.html:28
-msgid "Get in touch"
-msgstr ""
-
-#: core/templates/misc/contact.html:10
-#, python-format
-msgid ""
-"Thank you for your interest. Feel free to use any of the\n"
-"ways below to send feedback you have about any aspect of the site. For\n"
-"support, say hi\n"
-"<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
-"a bug, consider doing it through the <a href=\"%(issues)s\">issue tracker</"
-"a>\n"
-"."
-msgstr ""
-
-#: core/templates/misc/contact.html:20
-#, python-format
-msgid ""
-"If you want to further help and improve this project,\n"
-"you might also be interested <a href=\"%(contribute)s\">in contributing</a>."
-msgstr ""
-
-#: core/templates/misc/contact.html:29
-msgid "Feedback form"
-msgstr ""
-
-#: core/templates/misc/contact.html:30
-msgid ""
-"A simple contact form. Remember that\n"
-"if you want an answer, you need to include some way to contact you."
-msgstr ""
-
-#: core/templates/misc/contact.html:35
-msgid "Twitter"
-msgstr ""
-
-#: core/templates/misc/contact.html:36
-msgid ""
-"We are also on twitter. Write us and tell us what\n"
-"you think! Except patches, don't send patches via twitter."
-msgstr ""
-
-#: core/templates/misc/contact.html:42
-msgid "Discord"
-msgstr ""
-
-#: core/templates/misc/contact.html:43
-msgid ""
-"Use the public group to get support for your\n"
-"local wger installation, discuss issues or your new idea, etc.\n"
-"(no registration needed)"
-msgstr ""
-
-#: core/templates/misc/contact.html:49
-msgid "Open feedback form"
-msgstr ""
-
-#: core/templates/misc/contact.html:53
-msgid "tweet to @wger_project"
-msgstr ""
-
-#: core/templates/misc/contact.html:56
-msgid "Go to the discord server"
+#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/template_features.html:118
+#: core/templates/template_no_context.html:88
+msgid "Imprint"
msgstr ""
#: core/templates/misc/fragments/shariff_modal.html:6
@@ -929,7 +855,7 @@ msgid "Add new exercise"
msgstr "새 Exercise 추가"
#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:223
+#: core/templates/navigation.html:226
msgid "Administration"
msgstr ""
@@ -996,68 +922,62 @@ msgid "About this software"
msgstr ""
#: core/templates/navigation.html:151 core/templates/template_features.html:83
-#: software/templates/contribute.html:6
-msgid "Contribute!"
-msgstr ""
-
-#: core/templates/navigation.html:152
-msgid "Problems and wishes"
+#: software/templates/about_us.html:5
+msgid "About us"
msgstr ""
-#: core/templates/navigation.html:155 software/templates/features.html:209
+#: core/templates/navigation.html:153 software/templates/features.html:209
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:156 software/templates/license.html:7
-#: utils/models.py:40
+#: core/templates/navigation.html:157 utils/models.py:40
msgid "License"
msgstr ""
-#: core/templates/navigation.html:160
+#: core/templates/navigation.html:163
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:166 software/templates/contribute.html:59
+#: core/templates/navigation.html:169
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:172 core/templates/template.html:193
-#: core/templates/template_features.html:103
-#: software/templates/contribute.html:43 software/templates/contribute.html:50
+#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/template_features.html:100
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:193 core/templates/user/login.html:28
+#: core/templates/navigation.html:196 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:206
+#: core/templates/navigation.html:209
msgid "My preferences"
msgstr "내 환경설정"
-#: core/templates/navigation.html:213
+#: core/templates/navigation.html:216
msgid "Logout"
msgstr "로그아웃"
-#: core/templates/navigation.html:228
+#: core/templates/navigation.html:231
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:234
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:234 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "무게 단위"
-#: core/templates/navigation.html:237 core/templates/user/list.html:4
+#: core/templates/navigation.html:240 core/templates/user/list.html:4
msgid "User list"
msgstr "사용자 리스트"
-#: core/templates/navigation.html:238
+#: core/templates/navigation.html:241
msgid "Gyms"
msgstr "Gyms"
@@ -1171,18 +1091,12 @@ msgstr ""
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:201 core/templates/template_features.html:121
-#: core/templates/template_no_context.html:88
-msgid "About"
-msgstr ""
-
-#: core/templates/template.html:202 core/templates/template_features.html:125
+#: core/templates/template.html:202 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
#: core/templates/template.html:209 core/templates/template.html:210
-#: software/templates/license.html:18 software/templates/license.html:19
msgid "Released under the Affero GPL"
msgstr ""
@@ -1533,15 +1447,15 @@ msgstr ""
msgid "Rest day"
msgstr "휴식"
-#: core/views/misc.py:199
+#: core/views/misc.py:184
msgid "Feedback"
msgstr ""
-#: core/views/misc.py:218 weight/templates/import_csv_form.html:9
+#: core/views/misc.py:203 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr ""
-#: core/views/misc.py:226
+#: core/views/misc.py:211
msgid "Your feedback was successfully sent. Thank you!"
msgstr ""
@@ -1710,7 +1624,6 @@ msgstr ""
#: exercises/templates/exercise/overview.html:118
#: exercises/templates/muscles/overview.html:114
#: nutrition/templates/ingredient/overview.html:85
-#: software/templates/contribute.html:39
msgid "Only registered users can do this"
msgstr ""
@@ -1910,7 +1823,7 @@ msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246 software/templates/contribute.html:37
+#: exercises/views/exercises.py:246
msgid "Add exercise"
msgstr "Exercise 추가"
@@ -3559,75 +3472,53 @@ msgstr "새 무게 단위 추가"
msgid "Edit a weight unit to ingredient connection"
msgstr ""
-#: software/templates/contribute.html:9
+#: software/templates/about_us.html:9
msgid ""
-"wger Workout Manager is build by volunteers,\n"
-"the development process is open and freely accessible to anybody "
-"interested.\n"
-"If you are new to the free software world, we recommend to take a\n"
-"look <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
-"article</a> which summarizes they way open source projects work very well. "
+"Thank you for using wger! wger is a collaborative open source project, made "
+"by fitness enthusiasts from around the world."
msgstr ""
-#: software/templates/contribute.html:16
-msgid ""
-"Any kind of contribution is appreciated and welcome.\n"
-"Use this opportunity and influence the direction of the\n"
-"project. "
+#: software/templates/about_us.html:18
+msgid "Source code"
msgstr ""
-#: software/templates/contribute.html:23
-msgid "Use the site"
+#: software/templates/about_us.html:20
+msgid "Get the source code of this application and its server on github"
msgstr ""
-#: software/templates/contribute.html:24
-msgid ""
-"Simply use the site and tell your friends\n"
-"how useful it is! ;) . When you find something that you specially liked,\n"
-"could need some improvements or just doesn't work, tell us! This might not "
-"sound\n"
-"like much, but is incredibly important!"
+#: software/templates/about_us.html:25
+msgid "Have a problem or idea?"
msgstr ""
-#: software/templates/contribute.html:31
-msgid "Submit exercises"
+#: software/templates/about_us.html:27
+msgid ""
+"Get in touch if something didn't behave as expected or if there is a feature "
+"that you feel is missing."
msgstr ""
-#: software/templates/contribute.html:32
-msgid ""
-"Submit those cool exercises that you absolutely\n"
-"love and do every week but are not in the list yet. If you think some "
-"description\n"
-"is too short or some other detail is missing or could be improved, tell!"
+#: software/templates/about_us.html:32
+msgid "Say hi!"
msgstr ""
-#: software/templates/contribute.html:44
-msgid ""
-"Do you want to use wger in your own language?\n"
-"Do you think the current translation could be improved?\n"
-"The translations are easily managed and edited online, if you are "
-"interested,\n"
-"visit the link and start translating."
+#: software/templates/about_us.html:34
+msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
-#: software/templates/contribute.html:53
-msgid "Code"
+#: software/templates/about_us.html:39
+msgid "Translation"
msgstr ""
-#: software/templates/contribute.html:54
+#: software/templates/about_us.html:41
msgid ""
-"Obviously, you are highly encouraged to clone the\n"
-"repo and start hacking! Once you are ready, send a pull request and we\n"
-"will show the world. Take a look at the developer guide for more details\n"
-"on this."
+"This application is translated on weblate. If you also want to help, click "
+"the link and start translating"
msgstr ""
-#: software/templates/contribute.html:66
+#: software/templates/about_us.html:50
msgid "Our goal"
msgstr ""
-#: software/templates/contribute.html:69
+#: software/templates/about_us.html:53
msgid ""
"The goal is to build an awesome\n"
"and flexible fitness manager, along with a comprehensive and complete list "
@@ -3767,78 +3658,6 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr ""
-#: software/templates/issues.html:6
-msgid "Reporting a problem"
-msgstr ""
-
-#: software/templates/issues.html:10
-msgid ""
-"\n"
-"No software is perfect. For some severe errors, an email will be "
-"automatically sent, but\n"
-"not always, so I depend on you reporting everything that didn't behave as "
-"expected.\n"
-"Please describe in as much detail as you can what you were doing when the "
-"error\n"
-"happened.\n"
-msgstr ""
-
-#: software/templates/issues.html:21
-msgid "report problem to the issue tracker"
-msgstr ""
-
-#: software/templates/issues.html:25
-msgid "Enhancements"
-msgstr ""
-
-#: software/templates/issues.html:27
-msgid ""
-"\n"
-"The issue tracker can also be used to document enhancements to the "
-"software.\n"
-"If you have some suggestions or think a feature is missing, feel\n"
-"free to open a ticket. This can be anything from a slight change to a whole\n"
-"new section of the site. Please keep in mind that not all wishes can be\n"
-"implemented."
-msgstr ""
-
-#: software/templates/issues.html:36
-msgid "report wish to the issue tracker"
-msgstr ""
-
-#: software/templates/issues.html:41
-msgid "No Github account?"
-msgstr ""
-
-#: software/templates/issues.html:42
-msgid ""
-"Filing an issue requires a github account, if you don't\n"
-"have one and don't want to register, you can also send it to\n"
-"<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
-msgstr ""
-
-#: software/templates/license.html:10
-msgid ""
-"wger Workout Manager is Free/Libre Open Source\n"
-"Software (FLOSS)."
-msgstr ""
-
-#: software/templates/license.html:22
-msgid ""
-"wger Workout Manager is released under the <strong>Affero GNU\n"
-"General Public License (AGPL) Version 3+</strong> and can (under the "
-"conditions\n"
-"of the license) be used, modified and distributed (also with modifications)\n"
-"without restrictions."
-msgstr ""
-
-#: software/templates/license.html:29
-msgid ""
-"A copy the license text is contained in every wger Workout\n"
-"Manager release (LICENSE.txt) and can be read online on the website of\n"
-"<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</a>."
-msgstr ""
-
#: utils/generic_views.py:261
msgid "Yes, delete"
msgstr ""
diff --git a/wger/locale/nl/LC_MESSAGES/django.po b/wger/locale/nl/LC_MESSAGES/django.po
index 1a897cf17..0f2292100 100644
--- a/wger/locale/nl/LC_MESSAGES/django.po
+++ b/wger/locale/nl/LC_MESSAGES/django.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-17 15:00+0200\n"
+"POT-Creation-Date: 2021-08-17 17:23+0200\n"
"PO-Revision-Date: 2021-04-17 13:26+0000\n"
"Last-Translator: David <[email protected]>\n"
"Language-Team: Dutch <https://hosted.weblate.org/projects/wger/web/nl/>\n"
@@ -48,7 +48,7 @@ msgstr "Oefeningen"
msgid "Ingredients"
msgstr "Ingrediënten"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:225
+#: config/templates/language/overview.html:4 core/templates/navigation.html:228
msgid "Languages"
msgstr "Talen"
@@ -225,8 +225,8 @@ msgstr "Mijn hip workoutschema"
msgid "Empty placeholder schedule"
msgstr "Leeg tijdelijk schema"
-#: core/forms.py:61 core/templates/navigation.html:187
-#: core/templates/navigation.html:191 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:190
+#: core/templates/navigation.html:194 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Aanmelden"
@@ -303,8 +303,8 @@ msgstr "Ongeldig wachtwoord"
msgid "The form is secured with reCAPTCHA"
msgstr "Dit formulier is beveiligd met reCAPTCHA"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:187
-#: core/templates/navigation.html:192 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
+#: core/templates/navigation.html:195 core/templates/template.html:150
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -803,104 +803,11 @@ msgstr "Licentielijst"
msgid "Nothing found"
msgstr "Niets gevonden"
-#: core/templates/misc/about.html:4
-msgid "About us"
-msgstr "Over ons"
-
-#: core/templates/misc/about.html:8
-msgid "Responsible for the content of this site as per German law §5 TMG:"
-msgstr ""
-"Verantwoordelijke voor de inhoud van deze site volgens Duitse wet §5 TMG:"
-
-#: core/templates/misc/about.html:16
-msgid "GNUPG-Key:"
-msgstr "GNUPG-Sleutel:"
-
-#: core/templates/misc/contact.html:4 core/templates/navigation.html:153
-#: core/templates/template_features.html:86
-#: software/templates/contribute.html:28
-msgid "Get in touch"
-msgstr "Contacteer"
-
-#: core/templates/misc/contact.html:10
-#, python-format
-msgid ""
-"Thank you for your interest. Feel free to use any of the\n"
-"ways below to send feedback you have about any aspect of the site. For\n"
-"support, say hi\n"
-"<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
-"a bug, consider doing it through the <a href=\"%(issues)s\">issue tracker</"
-"a>\n"
-"."
-msgstr ""
-"Bedankt voor je interesse. Voel je vrij om één\n"
-"van de manieren hieronder te gebruiken om feedback te sturen over eender "
-"welk aspect van de site.\n"
-"Voor ondersteuning kan je hallo zeggen in het <a href=\"%(discord)s"
-"\">Discord-kanaal</a>,\n"
-"om een fout te melden kan je dit doen in onze <a href=\"%(issues)s\">issue "
-"tracker</a>."
-
-#: core/templates/misc/contact.html:20
-#, python-format
-msgid ""
-"If you want to further help and improve this project,\n"
-"you might also be interested <a href=\"%(contribute)s\">in contributing</a>."
-msgstr ""
-"Als je dit project verder wil helpen en verbeteren,\n"
-"kan je mogelijk ook geïnteresserd zijn om <a href=\"%(contribute)s\">bij te "
-"dragen</a>."
-
-#: core/templates/misc/contact.html:29
-msgid "Feedback form"
-msgstr "Feedbackformulier"
-
-#: core/templates/misc/contact.html:30
-msgid ""
-"A simple contact form. Remember that\n"
-"if you want an answer, you need to include some way to contact you."
-msgstr ""
-"Een eenvoudig contactformulier. Onthoud dat,\n"
-"als je een antwoord wenst, je een manier moet invullen waarop we je kunnen "
-"contacteren."
-
-#: core/templates/misc/contact.html:35
-msgid "Twitter"
-msgstr "Twitter"
-
-#: core/templates/misc/contact.html:36
-msgid ""
-"We are also on twitter. Write us and tell us what\n"
-"you think! Except patches, don't send patches via twitter."
-msgstr ""
-"We zitten ook op twitter. Schrijf ons en vertel ons\n"
-"je mening! Behalve patches, verstuur geen patches via twitter."
-
-#: core/templates/misc/contact.html:42
-msgid "Discord"
-msgstr "Discord"
-
-#: core/templates/misc/contact.html:43
-msgid ""
-"Use the public group to get support for your\n"
-"local wger installation, discuss issues or your new idea, etc.\n"
-"(no registration needed)"
+#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/template_features.html:118
+#: core/templates/template_no_context.html:88
+msgid "Imprint"
msgstr ""
-"Gebruik de publieke groep om ondersteuning te vinden voor je\n"
-"lokale wger-installatie, fouten of je nieuwe idee te bespreken, etc.\n"
-"(geen registratie vereist)"
-
-#: core/templates/misc/contact.html:49
-msgid "Open feedback form"
-msgstr "Open feedbackformulier"
-
-#: core/templates/misc/contact.html:53
-msgid "tweet to @wger_project"
-msgstr "tweet naar @wger_project"
-
-#: core/templates/misc/contact.html:56
-msgid "Go to the discord server"
-msgstr "Ga naar Discord-server"
#: core/templates/misc/fragments/shariff_modal.html:6
msgid "Share this page"
@@ -994,7 +901,7 @@ msgid "Add new exercise"
msgstr "Creëer oefening"
#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:223
+#: core/templates/navigation.html:226
msgid "Administration"
msgstr "Administratie"
@@ -1061,68 +968,62 @@ msgid "About this software"
msgstr "Over deze software"
#: core/templates/navigation.html:151 core/templates/template_features.html:83
-#: software/templates/contribute.html:6
-msgid "Contribute!"
-msgstr "Draag bij!"
-
-#: core/templates/navigation.html:152
-msgid "Problems and wishes"
-msgstr "Problemen en wensen"
+#: software/templates/about_us.html:5
+msgid "About us"
+msgstr "Over ons"
-#: core/templates/navigation.html:155 software/templates/features.html:209
+#: core/templates/navigation.html:153 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:156 software/templates/license.html:7
-#: utils/models.py:40
+#: core/templates/navigation.html:157 utils/models.py:40
msgid "License"
msgstr "Licentie"
-#: core/templates/navigation.html:160
+#: core/templates/navigation.html:163
msgid "Developer documentation"
msgstr "Developer documentatie"
-#: core/templates/navigation.html:166 software/templates/contribute.html:59
+#: core/templates/navigation.html:169
msgid "Get the code"
msgstr "Download de code"
-#: core/templates/navigation.html:172 core/templates/template.html:193
-#: core/templates/template_features.html:103
-#: software/templates/contribute.html:43 software/templates/contribute.html:50
+#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/template_features.html:100
msgid "Translate"
msgstr "Vertaal"
-#: core/templates/navigation.html:193 core/templates/user/login.html:28
+#: core/templates/navigation.html:196 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Reset wachtwoord"
-#: core/templates/navigation.html:206
+#: core/templates/navigation.html:209
msgid "My preferences"
msgstr "Mijn voorkeuren"
-#: core/templates/navigation.html:213
+#: core/templates/navigation.html:216
msgid "Logout"
msgstr "Afmelden"
-#: core/templates/navigation.html:228
+#: core/templates/navigation.html:231
msgid "Licenses"
msgstr "Licenties"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:234
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Herhalingen"
-#: core/templates/navigation.html:234 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Gewichteenheden"
-#: core/templates/navigation.html:237 core/templates/user/list.html:4
+#: core/templates/navigation.html:240 core/templates/user/list.html:4
msgid "User list"
msgstr "Gebruikerslijst"
-#: core/templates/navigation.html:238
+#: core/templates/navigation.html:241
msgid "Gyms"
msgstr "Gyms"
@@ -1242,18 +1143,12 @@ msgstr ""
msgid "Create some demo entries"
msgstr "Maak wat demo-ingaven aan"
-#: core/templates/template.html:201 core/templates/template_features.html:121
-#: core/templates/template_no_context.html:88
-msgid "About"
-msgstr "Over"
-
-#: core/templates/template.html:202 core/templates/template_features.html:125
+#: core/templates/template.html:202 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Algemene voorwaarden"
#: core/templates/template.html:209 core/templates/template.html:210
-#: software/templates/license.html:18 software/templates/license.html:19
msgid "Released under the Affero GPL"
msgstr "Uitgebracht onder de Affero GPL"
@@ -1612,15 +1507,15 @@ msgstr ""
msgid "Rest day"
msgstr "Rustdag"
-#: core/views/misc.py:199
+#: core/views/misc.py:184
msgid "Feedback"
msgstr "Feedback"
-#: core/views/misc.py:218 weight/templates/import_csv_form.html:9
+#: core/views/misc.py:203 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Insturen"
-#: core/views/misc.py:226
+#: core/views/misc.py:211
msgid "Your feedback was successfully sent. Thank you!"
msgstr "Je feedback werd met succes verzonden. Bedankt!"
@@ -1794,7 +1689,6 @@ msgstr "naam oefening"
#: exercises/templates/exercise/overview.html:118
#: exercises/templates/muscles/overview.html:114
#: nutrition/templates/ingredient/overview.html:85
-#: software/templates/contribute.html:39
msgid "Only registered users can do this"
msgstr "Enkel geregistreerde gebruikers kunnen dit"
@@ -2008,7 +1902,7 @@ msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246 software/templates/contribute.html:37
+#: exercises/views/exercises.py:246
msgid "Add exercise"
msgstr "Creëer oefening"
@@ -3762,113 +3656,55 @@ msgstr "Voeg gewichteenheid toe"
msgid "Edit a weight unit to ingredient connection"
msgstr "Bewerk verbinding gewichteenheid en ingrediënt"
-#: software/templates/contribute.html:9
+#: software/templates/about_us.html:9
msgid ""
-"wger Workout Manager is build by volunteers,\n"
-"the development process is open and freely accessible to anybody "
-"interested.\n"
-"If you are new to the free software world, we recommend to take a\n"
-"look <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
-"article</a> which summarizes they way open source projects work very well. "
-msgstr ""
-"wger Workout Manager is gebouwd door vrijwilligers. Het ontwikkelproces is "
-"transparant en vrij toegankelijk voor alle geïnteresseerden. Als je nieuw "
-"bent in de wereld van gratis software, raden we je aan een kijkje te nemen "
-"naar <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">dit artikel</"
-"a>\n"
-"waarin wordt samengevat hoe het ontwikkelen van een open-source project goed "
-"kan verlopen."
-
-#: software/templates/contribute.html:16
-msgid ""
-"Any kind of contribution is appreciated and welcome.\n"
-"Use this opportunity and influence the direction of the\n"
-"project. "
+"Thank you for using wger! wger is a collaborative open source project, made "
+"by fitness enthusiasts from around the world."
msgstr ""
-"Elke bijdrage wordt geapprecieerd en is welkom.\n"
-"Gebruik deze kans en beïnvloed de richting van het project."
-#: software/templates/contribute.html:23
-msgid "Use the site"
-msgstr "Gebruik de site"
+#: software/templates/about_us.html:18
+msgid "Source code"
+msgstr ""
-#: software/templates/contribute.html:24
-msgid ""
-"Simply use the site and tell your friends\n"
-"how useful it is! ;) . When you find something that you specially liked,\n"
-"could need some improvements or just doesn't work, tell us! This might not "
-"sound\n"
-"like much, but is incredibly important!"
-msgstr ""
-"Gebruik gewoonweg de site en vertel je vrienden\n"
-"hoe nuttig deze is! ;-). Wanneer je iets ontdekt dat je bijzonder leuk "
-"vond,\n"
-"dat wat verbetering nodig heeft of gewoon niet functioneert, vertel het ons! "
-"Dit klinkt misschien\n"
-"niet erg belangrijk, maar dat is het enorm!"
-
-#: software/templates/contribute.html:31
-msgid "Submit exercises"
-msgstr "Oefeningen indienen"
-
-#: software/templates/contribute.html:32
+#: software/templates/about_us.html:20
+msgid "Get the source code of this application and its server on github"
+msgstr ""
+
+#: software/templates/about_us.html:25
+msgid "Have a problem or idea?"
+msgstr ""
+
+#: software/templates/about_us.html:27
msgid ""
-"Submit those cool exercises that you absolutely\n"
-"love and do every week but are not in the list yet. If you think some "
-"description\n"
-"is too short or some other detail is missing or could be improved, tell!"
-msgstr ""
-"Dien die coole oefeningen in waar je absoluut\n"
-"van houdt en die je elke week uitoefent, maar die nog niet op de lijst "
-"staan. Als je denkt dat een beschrijving\n"
-"te kort is of dat er een detail ontbreekt of verbeterd kan worden, vertel "
-"het ons!"
-
-#: software/templates/contribute.html:44
+"Get in touch if something didn't behave as expected or if there is a feature "
+"that you feel is missing."
+msgstr ""
+
+#: software/templates/about_us.html:32
+msgid "Say hi!"
+msgstr ""
+
+#: software/templates/about_us.html:34
+msgid "If you want to chat with us, hop on the Discord server and get in touch"
+msgstr ""
+
+#: software/templates/about_us.html:39
#, fuzzy
-#| msgid ""
-#| "Do you want to use wger in your own language?\n"
-#| "Do you think the current translation could be improved?\n"
-#| "The translations are easily managed and edited online, if you are "
-#| "interested,\n"
-#| "go to the transifex site, request access and we will set everything\n"
-#| "up. "
-msgid ""
-"Do you want to use wger in your own language?\n"
-"Do you think the current translation could be improved?\n"
-"The translations are easily managed and edited online, if you are "
-"interested,\n"
-"visit the link and start translating."
-msgstr ""
-"Wil je wger gebruiken in je eigen taal?\n"
-"Vind je dat de huidige vertaling kan worden verbeterd?\n"
-"De vertalingen worden en eenvoudig online bewerkt en beheerd. Als je\n"
-"interesse zou hebben, ga naar de transifex-site, vraag toegang aan wij\n"
-"zorgen voor de rest."
-
-#: software/templates/contribute.html:53
-msgid "Code"
-msgstr "Code"
-
-#: software/templates/contribute.html:54
+#| msgid "Translate"
+msgid "Translation"
+msgstr "Vertaal"
+
+#: software/templates/about_us.html:41
msgid ""
-"Obviously, you are highly encouraged to clone the\n"
-"repo and start hacking! Once you are ready, send a pull request and we\n"
-"will show the world. Take a look at the developer guide for more details\n"
-"on this."
+"This application is translated on weblate. If you also want to help, click "
+"the link and start translating"
msgstr ""
-"Uiteraard moedigen we je graag aan de repository te klonen en te beginnen "
-"hacken!\n"
-"Wanneer je klaar bent stuur je een pull request en tonen we je werk aan de "
-"wereld. Bekijk de ontwikkelaarshandleiding voor meer informatie hierover."
-#: software/templates/contribute.html:66
+#: software/templates/about_us.html:50
msgid "Our goal"
msgstr "Ons doel"
-#: software/templates/contribute.html:69
+#: software/templates/about_us.html:53
msgid ""
"The goal is to build an awesome\n"
"and flexible fitness manager, along with a comprehensive and complete list "
@@ -4008,105 +3844,6 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr "100%%Gratis<br>en<br>Open Source"
-#: software/templates/issues.html:6
-msgid "Reporting a problem"
-msgstr "Een probleem melden"
-
-#: software/templates/issues.html:10
-msgid ""
-"\n"
-"No software is perfect. For some severe errors, an email will be "
-"automatically sent, but\n"
-"not always, so I depend on you reporting everything that didn't behave as "
-"expected.\n"
-"Please describe in as much detail as you can what you were doing when the "
-"error\n"
-"happened.\n"
-msgstr ""
-"\n"
-"Geen software is perfect. Voor bepaalde ernstige fouten zal automatisch een "
-"e-mail \n"
-"worden verstuurd, maar niet altijd, dus ik reken op jou om alles te "
-"rapporteren dat \n"
-"niet werkte zoals verwacht. Gelieve zo gedetailleerd mogelijk te beschrijven "
-"wat je aan,\n"
-"het doen was toen de fout zich voordeed.\n"
-
-#: software/templates/issues.html:21
-msgid "report problem to the issue tracker"
-msgstr "probleem melden aan de issue tracker"
-
-#: software/templates/issues.html:25
-msgid "Enhancements"
-msgstr "Verbeteringen"
-
-#: software/templates/issues.html:27
-msgid ""
-"\n"
-"The issue tracker can also be used to document enhancements to the "
-"software.\n"
-"If you have some suggestions or think a feature is missing, feel\n"
-"free to open a ticket. This can be anything from a slight change to a whole\n"
-"new section of the site. Please keep in mind that not all wishes can be\n"
-"implemented."
-msgstr ""
-"\n"
-"De issue tracker kan ook gebruikt worden om verbeteren aan de software in\n"
-"kaart te brengen. Als je suggesties hebt of vindt dat een functie ontbreekt "
-"kan je\n"
-"altijd een ticket openen. Dit kan over alles gaan, van de kleinste "
-"verandering tot\n"
-"een gans nieuwe sectie op de site. Houd in gedachte dat niet alle wensen "
-"kunnen\n"
-"worden geïmplementeerd."
-
-#: software/templates/issues.html:36
-msgid "report wish to the issue tracker"
-msgstr "wens rapporteren aan de issue tracker"
-
-#: software/templates/issues.html:41
-msgid "No Github account?"
-msgstr "Geen Github account?"
-
-#: software/templates/issues.html:42
-msgid ""
-"Filing an issue requires a github account, if you don't\n"
-"have one and don't want to register, you can also send it to\n"
-"<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
-msgstr ""
-"Een issue indienen vereist een github-account. Als je er geen hebt en\n"
-"niet wil registereren, kan je het ook insturen naar de <a href=\"https://"
-"groups.google.com/group/wger\">mailinglijst</a>."
-
-#: software/templates/license.html:10
-msgid ""
-"wger Workout Manager is Free/Libre Open Source\n"
-"Software (FLOSS)."
-msgstr ""
-"wger Workout Manager is Free/Libre Open Source\n"
-"Software (FLOSS)."
-
-#: software/templates/license.html:22
-msgid ""
-"wger Workout Manager is released under the <strong>Affero GNU\n"
-"General Public License (AGPL) Version 3+</strong> and can (under the "
-"conditions\n"
-"of the license) be used, modified and distributed (also with modifications)\n"
-"without restrictions."
-msgstr ""
-"wger Workout Manager wordt uitgebracht onder de <strong>Affero GNU\n"
-"General Public License (AGPL) Version 3+</strong> licentie en kan (onder "
-"de \n"
-"voorwaarden van de licentie) worden gebruikt, aangepast en verspreid \n"
-"(ook met aanpassingen) zonder restricties."
-
-#: software/templates/license.html:29
-msgid ""
-"A copy the license text is contained in every wger Workout\n"
-"Manager release (LICENSE.txt) and can be read online on the website of\n"
-"<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</a>."
-msgstr ""
-
#: utils/generic_views.py:261
msgid "Yes, delete"
msgstr "Ja, verwijder"
@@ -4289,6 +4026,273 @@ msgstr "Met succes verwijderd."
msgid "Delete weight entry for the %s"
msgstr "Verwijder gewichtsingave voor de %s"
+#~ msgid "Responsible for the content of this site as per German law §5 TMG:"
+#~ msgstr ""
+#~ "Verantwoordelijke voor de inhoud van deze site volgens Duitse wet §5 TMG:"
+
+#~ msgid "GNUPG-Key:"
+#~ msgstr "GNUPG-Sleutel:"
+
+#~ msgid "Get in touch"
+#~ msgstr "Contacteer"
+
+#~ msgid ""
+#~ "Thank you for your interest. Feel free to use any of the\n"
+#~ "ways below to send feedback you have about any aspect of the site. For\n"
+#~ "support, say hi\n"
+#~ "<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
+#~ "a bug, consider doing it through the <a href=\"%(issues)s\">issue "
+#~ "tracker</a>\n"
+#~ "."
+#~ msgstr ""
+#~ "Bedankt voor je interesse. Voel je vrij om één\n"
+#~ "van de manieren hieronder te gebruiken om feedback te sturen over eender "
+#~ "welk aspect van de site.\n"
+#~ "Voor ondersteuning kan je hallo zeggen in het <a href=\"%(discord)s"
+#~ "\">Discord-kanaal</a>,\n"
+#~ "om een fout te melden kan je dit doen in onze <a href=\"%(issues)s"
+#~ "\">issue tracker</a>."
+
+#~ msgid ""
+#~ "If you want to further help and improve this project,\n"
+#~ "you might also be interested <a href=\"%(contribute)s\">in contributing</"
+#~ "a>."
+#~ msgstr ""
+#~ "Als je dit project verder wil helpen en verbeteren,\n"
+#~ "kan je mogelijk ook geïnteresserd zijn om <a href=\"%(contribute)s\">bij "
+#~ "te dragen</a>."
+
+#~ msgid "Feedback form"
+#~ msgstr "Feedbackformulier"
+
+#~ msgid ""
+#~ "A simple contact form. Remember that\n"
+#~ "if you want an answer, you need to include some way to contact you."
+#~ msgstr ""
+#~ "Een eenvoudig contactformulier. Onthoud dat,\n"
+#~ "als je een antwoord wenst, je een manier moet invullen waarop we je "
+#~ "kunnen contacteren."
+
+#~ msgid "Twitter"
+#~ msgstr "Twitter"
+
+#~ msgid ""
+#~ "We are also on twitter. Write us and tell us what\n"
+#~ "you think! Except patches, don't send patches via twitter."
+#~ msgstr ""
+#~ "We zitten ook op twitter. Schrijf ons en vertel ons\n"
+#~ "je mening! Behalve patches, verstuur geen patches via twitter."
+
+#~ msgid "Discord"
+#~ msgstr "Discord"
+
+#~ msgid ""
+#~ "Use the public group to get support for your\n"
+#~ "local wger installation, discuss issues or your new idea, etc.\n"
+#~ "(no registration needed)"
+#~ msgstr ""
+#~ "Gebruik de publieke groep om ondersteuning te vinden voor je\n"
+#~ "lokale wger-installatie, fouten of je nieuwe idee te bespreken, etc.\n"
+#~ "(geen registratie vereist)"
+
+#~ msgid "Open feedback form"
+#~ msgstr "Open feedbackformulier"
+
+#~ msgid "tweet to @wger_project"
+#~ msgstr "tweet naar @wger_project"
+
+#~ msgid "Go to the discord server"
+#~ msgstr "Ga naar Discord-server"
+
+#~ msgid "Contribute!"
+#~ msgstr "Draag bij!"
+
+#~ msgid "Problems and wishes"
+#~ msgstr "Problemen en wensen"
+
+#~ msgid "About"
+#~ msgstr "Over"
+
+#~ msgid ""
+#~ "wger Workout Manager is build by volunteers,\n"
+#~ "the development process is open and freely accessible to anybody "
+#~ "interested.\n"
+#~ "If you are new to the free software world, we recommend to take a\n"
+#~ "look <a href=\"http://schlitt.info/opensource/"
+#~ "blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
+#~ "article</a> which summarizes they way open source projects work very "
+#~ "well. "
+#~ msgstr ""
+#~ "wger Workout Manager is gebouwd door vrijwilligers. Het ontwikkelproces "
+#~ "is transparant en vrij toegankelijk voor alle geïnteresseerden. Als je "
+#~ "nieuw bent in de wereld van gratis software, raden we je aan een kijkje "
+#~ "te nemen naar <a href=\"http://schlitt.info/opensource/"
+#~ "blog/0541_10_golden_rules_for_starting_with_open_source.html\">dit "
+#~ "artikel</a>\n"
+#~ "waarin wordt samengevat hoe het ontwikkelen van een open-source project "
+#~ "goed kan verlopen."
+
+#~ msgid ""
+#~ "Any kind of contribution is appreciated and welcome.\n"
+#~ "Use this opportunity and influence the direction of the\n"
+#~ "project. "
+#~ msgstr ""
+#~ "Elke bijdrage wordt geapprecieerd en is welkom.\n"
+#~ "Gebruik deze kans en beïnvloed de richting van het project."
+
+#~ msgid "Use the site"
+#~ msgstr "Gebruik de site"
+
+#~ msgid ""
+#~ "Simply use the site and tell your friends\n"
+#~ "how useful it is! ;) . When you find something that you specially liked,\n"
+#~ "could need some improvements or just doesn't work, tell us! This might "
+#~ "not sound\n"
+#~ "like much, but is incredibly important!"
+#~ msgstr ""
+#~ "Gebruik gewoonweg de site en vertel je vrienden\n"
+#~ "hoe nuttig deze is! ;-). Wanneer je iets ontdekt dat je bijzonder leuk "
+#~ "vond,\n"
+#~ "dat wat verbetering nodig heeft of gewoon niet functioneert, vertel het "
+#~ "ons! Dit klinkt misschien\n"
+#~ "niet erg belangrijk, maar dat is het enorm!"
+
+#~ msgid "Submit exercises"
+#~ msgstr "Oefeningen indienen"
+
+#~ msgid ""
+#~ "Submit those cool exercises that you absolutely\n"
+#~ "love and do every week but are not in the list yet. If you think some "
+#~ "description\n"
+#~ "is too short or some other detail is missing or could be improved, tell!"
+#~ msgstr ""
+#~ "Dien die coole oefeningen in waar je absoluut\n"
+#~ "van houdt en die je elke week uitoefent, maar die nog niet op de lijst "
+#~ "staan. Als je denkt dat een beschrijving\n"
+#~ "te kort is of dat er een detail ontbreekt of verbeterd kan worden, vertel "
+#~ "het ons!"
+
+#, fuzzy
+#~| msgid ""
+#~| "Do you want to use wger in your own language?\n"
+#~| "Do you think the current translation could be improved?\n"
+#~| "The translations are easily managed and edited online, if you are "
+#~| "interested,\n"
+#~| "go to the transifex site, request access and we will set everything\n"
+#~| "up. "
+#~ msgid ""
+#~ "Do you want to use wger in your own language?\n"
+#~ "Do you think the current translation could be improved?\n"
+#~ "The translations are easily managed and edited online, if you are "
+#~ "interested,\n"
+#~ "visit the link and start translating."
+#~ msgstr ""
+#~ "Wil je wger gebruiken in je eigen taal?\n"
+#~ "Vind je dat de huidige vertaling kan worden verbeterd?\n"
+#~ "De vertalingen worden en eenvoudig online bewerkt en beheerd. Als je\n"
+#~ "interesse zou hebben, ga naar de transifex-site, vraag toegang aan wij\n"
+#~ "zorgen voor de rest."
+
+#~ msgid "Code"
+#~ msgstr "Code"
+
+#~ msgid ""
+#~ "Obviously, you are highly encouraged to clone the\n"
+#~ "repo and start hacking! Once you are ready, send a pull request and we\n"
+#~ "will show the world. Take a look at the developer guide for more details\n"
+#~ "on this."
+#~ msgstr ""
+#~ "Uiteraard moedigen we je graag aan de repository te klonen en te beginnen "
+#~ "hacken!\n"
+#~ "Wanneer je klaar bent stuur je een pull request en tonen we je werk aan "
+#~ "de wereld. Bekijk de ontwikkelaarshandleiding voor meer informatie "
+#~ "hierover."
+
+#~ msgid "Reporting a problem"
+#~ msgstr "Een probleem melden"
+
+#~ msgid ""
+#~ "\n"
+#~ "No software is perfect. For some severe errors, an email will be "
+#~ "automatically sent, but\n"
+#~ "not always, so I depend on you reporting everything that didn't behave as "
+#~ "expected.\n"
+#~ "Please describe in as much detail as you can what you were doing when the "
+#~ "error\n"
+#~ "happened.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Geen software is perfect. Voor bepaalde ernstige fouten zal automatisch "
+#~ "een e-mail \n"
+#~ "worden verstuurd, maar niet altijd, dus ik reken op jou om alles te "
+#~ "rapporteren dat \n"
+#~ "niet werkte zoals verwacht. Gelieve zo gedetailleerd mogelijk te "
+#~ "beschrijven wat je aan,\n"
+#~ "het doen was toen de fout zich voordeed.\n"
+
+#~ msgid "report problem to the issue tracker"
+#~ msgstr "probleem melden aan de issue tracker"
+
+#~ msgid "Enhancements"
+#~ msgstr "Verbeteringen"
+
+#~ msgid ""
+#~ "\n"
+#~ "The issue tracker can also be used to document enhancements to the "
+#~ "software.\n"
+#~ "If you have some suggestions or think a feature is missing, feel\n"
+#~ "free to open a ticket. This can be anything from a slight change to a "
+#~ "whole\n"
+#~ "new section of the site. Please keep in mind that not all wishes can be\n"
+#~ "implemented."
+#~ msgstr ""
+#~ "\n"
+#~ "De issue tracker kan ook gebruikt worden om verbeteren aan de software "
+#~ "in\n"
+#~ "kaart te brengen. Als je suggesties hebt of vindt dat een functie "
+#~ "ontbreekt kan je\n"
+#~ "altijd een ticket openen. Dit kan over alles gaan, van de kleinste "
+#~ "verandering tot\n"
+#~ "een gans nieuwe sectie op de site. Houd in gedachte dat niet alle wensen "
+#~ "kunnen\n"
+#~ "worden geïmplementeerd."
+
+#~ msgid "report wish to the issue tracker"
+#~ msgstr "wens rapporteren aan de issue tracker"
+
+#~ msgid "No Github account?"
+#~ msgstr "Geen Github account?"
+
+#~ msgid ""
+#~ "Filing an issue requires a github account, if you don't\n"
+#~ "have one and don't want to register, you can also send it to\n"
+#~ "<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
+#~ msgstr ""
+#~ "Een issue indienen vereist een github-account. Als je er geen hebt en\n"
+#~ "niet wil registereren, kan je het ook insturen naar de <a href=\"https://"
+#~ "groups.google.com/group/wger\">mailinglijst</a>."
+
+#~ msgid ""
+#~ "wger Workout Manager is Free/Libre Open Source\n"
+#~ "Software (FLOSS)."
+#~ msgstr ""
+#~ "wger Workout Manager is Free/Libre Open Source\n"
+#~ "Software (FLOSS)."
+
+#~ msgid ""
+#~ "wger Workout Manager is released under the <strong>Affero GNU\n"
+#~ "General Public License (AGPL) Version 3+</strong> and can (under the "
+#~ "conditions\n"
+#~ "of the license) be used, modified and distributed (also with "
+#~ "modifications)\n"
+#~ "without restrictions."
+#~ msgstr ""
+#~ "wger Workout Manager wordt uitgebracht onder de <strong>Affero GNU\n"
+#~ "General Public License (AGPL) Version 3+</strong> licentie en kan (onder "
+#~ "de \n"
+#~ "voorwaarden van de licentie) worden gebruikt, aangepast en verspreid \n"
+#~ "(ook met aanpassingen) zonder restricties."
+
#~ msgid "Use pauses in workout timer"
#~ msgstr "Gebruik pauzes in workout-timer"
diff --git a/wger/locale/no/LC_MESSAGES/django.po b/wger/locale/no/LC_MESSAGES/django.po
index feb139b2f..92e1ca91c 100644
--- a/wger/locale/no/LC_MESSAGES/django.po
+++ b/wger/locale/no/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-17 15:00+0200\n"
+"POT-Creation-Date: 2021-08-17 17:23+0200\n"
"PO-Revision-Date: 2021-04-15 07:27+0000\n"
"Last-Translator: Allan Nordhøy <[email protected]>\n"
"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/wger/"
@@ -47,7 +47,7 @@ msgstr "Øvelser"
msgid "Ingredients"
msgstr "Ingredienser"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:225
+#: config/templates/language/overview.html:4 core/templates/navigation.html:228
msgid "Languages"
msgstr "Språk"
@@ -223,8 +223,8 @@ msgstr "Mitt kule treningsprogram"
msgid "Empty placeholder schedule"
msgstr "Tom plassholder for timeplanen"
-#: core/forms.py:61 core/templates/navigation.html:187
-#: core/templates/navigation.html:191 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:190
+#: core/templates/navigation.html:194 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Logg inn"
@@ -297,8 +297,8 @@ msgstr "Ugyldig passord"
msgid "The form is secured with reCAPTCHA"
msgstr "Skjemaet er sikret med reCAPTCHA"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:187
-#: core/templates/navigation.html:192 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
+#: core/templates/navigation.html:195 core/templates/template.html:150
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -795,103 +795,11 @@ msgstr "Lisensliste"
msgid "Nothing found"
msgstr "Ingenting funnet"
-#: core/templates/misc/about.html:4
-msgid "About us"
-msgstr "Om oss"
-
-#: core/templates/misc/about.html:8
-msgid "Responsible for the content of this site as per German law §5 TMG:"
-msgstr "Ansvarlig for innholdet på dette nettstedet som per tysk lov §5 TMG:"
-
-#: core/templates/misc/about.html:16
-msgid "GNUPG-Key:"
-msgstr "GNUPG-Kode:"
-
-#: core/templates/misc/contact.html:4 core/templates/navigation.html:153
-#: core/templates/template_features.html:86
-#: software/templates/contribute.html:28
-msgid "Get in touch"
-msgstr "Ta kontakt"
-
-#: core/templates/misc/contact.html:10
-#, python-format
-msgid ""
-"Thank you for your interest. Feel free to use any of the\n"
-"ways below to send feedback you have about any aspect of the site. For\n"
-"support, say hi\n"
-"<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
-"a bug, consider doing it through the <a href=\"%(issues)s\">issue tracker</"
-"a>\n"
-"."
-msgstr ""
-"Takk for din interesse. Bruk gjerne noen av\n"
-"måtene nedenfor for å sende tilbakemelding om ethvert aspekt av nettstedet. "
-"For\n"
-"støtte, si hei\n"
-" <a href=\"%(discord)s\"> på diskord-kanalen </a>, for å rapportere\n"
-"en feil, bør du vurdere å gjøre det gjennom <a href=\"%(issues)s\"> issue "
-"tracker </a>\n"
-"."
-
-#: core/templates/misc/contact.html:20
-#, python-format
-msgid ""
-"If you want to further help and improve this project,\n"
-"you might also be interested <a href=\"%(contribute)s\">in contributing</a>."
-msgstr ""
-"Hvis du ønsker å ytterligere hjelpe og forbedre dette prosjektet,\n"
-"kan det hende du også er interessert i å <a href=\"%(contribute)s\">bidra</"
-"a>."
-
-#: core/templates/misc/contact.html:29
-msgid "Feedback form"
-msgstr "Tilbakemeldings-skjema"
-
-#: core/templates/misc/contact.html:30
-msgid ""
-"A simple contact form. Remember that\n"
-"if you want an answer, you need to include some way to contact you."
-msgstr ""
-"Et enkelt kontaktskjema . Husk\n"
-"hvis du vil ha et svar, må du inkludere noen måte å kontakte deg."
-
-#: core/templates/misc/contact.html:35
-msgid "Twitter"
-msgstr "Twitter"
-
-#: core/templates/misc/contact.html:36
-msgid ""
-"We are also on twitter. Write us and tell us what\n"
-"you think! Except patches, don't send patches via twitter."
-msgstr ""
-"Vi er også på twitter. Skriv til oss og fortell oss hva\n"
-"du tror! Bortsett fra problemer, ikke sende problemer via twitter."
-
-#: core/templates/misc/contact.html:42
-msgid "Discord"
-msgstr "Discord"
-
-#: core/templates/misc/contact.html:43
-msgid ""
-"Use the public group to get support for your\n"
-"local wger installation, discuss issues or your new idea, etc.\n"
-"(no registration needed)"
+#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/template_features.html:118
+#: core/templates/template_no_context.html:88
+msgid "Imprint"
msgstr ""
-"Bruk fellesgruppen for å få støtte til din\n"
-"lokale wger installasjon, diskuter problemer eller nye ideer.\n"
-"(Ingen registrering nødvendig)"
-
-#: core/templates/misc/contact.html:49
-msgid "Open feedback form"
-msgstr "Åpne tilbakemeldingsskjema"
-
-#: core/templates/misc/contact.html:53
-msgid "tweet to @wger_project"
-msgstr "tweet to @wger_project"
-
-#: core/templates/misc/contact.html:56
-msgid "Go to the discord server"
-msgstr "Gå til discord serveren"
#: core/templates/misc/fragments/shariff_modal.html:6
msgid "Share this page"
@@ -982,7 +890,7 @@ msgid "Add new exercise"
msgstr "Legg til ny øvelse"
#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:223
+#: core/templates/navigation.html:226
msgid "Administration"
msgstr "Administrasjon"
@@ -1049,68 +957,62 @@ msgid "About this software"
msgstr "Om denne programvaren"
#: core/templates/navigation.html:151 core/templates/template_features.html:83
-#: software/templates/contribute.html:6
-msgid "Contribute!"
-msgstr "Bidra!"
-
-#: core/templates/navigation.html:152
-msgid "Problems and wishes"
-msgstr "Problemer og ønsker"
+#: software/templates/about_us.html:5
+msgid "About us"
+msgstr "Om oss"
-#: core/templates/navigation.html:155 software/templates/features.html:209
+#: core/templates/navigation.html:153 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:156 software/templates/license.html:7
-#: utils/models.py:40
+#: core/templates/navigation.html:157 utils/models.py:40
msgid "License"
msgstr "Lisens"
-#: core/templates/navigation.html:160
+#: core/templates/navigation.html:163
msgid "Developer documentation"
msgstr "Utvikler dokumentasjon"
-#: core/templates/navigation.html:166 software/templates/contribute.html:59
+#: core/templates/navigation.html:169
msgid "Get the code"
msgstr "Få koden"
-#: core/templates/navigation.html:172 core/templates/template.html:193
-#: core/templates/template_features.html:103
-#: software/templates/contribute.html:43 software/templates/contribute.html:50
+#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/template_features.html:100
msgid "Translate"
msgstr "Oversett"
-#: core/templates/navigation.html:193 core/templates/user/login.html:28
+#: core/templates/navigation.html:196 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Tilbakestill passord"
-#: core/templates/navigation.html:206
+#: core/templates/navigation.html:209
msgid "My preferences"
msgstr "Mine innstillinger"
-#: core/templates/navigation.html:213
+#: core/templates/navigation.html:216
msgid "Logout"
msgstr "Logg ut"
-#: core/templates/navigation.html:228
+#: core/templates/navigation.html:231
msgid "Licenses"
msgstr "Lisenser"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:234
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Repetisjonsenheter"
-#: core/templates/navigation.html:234 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Vektenheter"
-#: core/templates/navigation.html:237 core/templates/user/list.html:4
+#: core/templates/navigation.html:240 core/templates/user/list.html:4
msgid "User list"
msgstr "Brukerliste"
-#: core/templates/navigation.html:238
+#: core/templates/navigation.html:241
msgid "Gyms"
msgstr "Treningsstudioer"
@@ -1228,18 +1130,12 @@ msgstr "Du bruker en gjestekonto, data du fyller ut vil slettes etter en uke."
msgid "Create some demo entries"
msgstr "Lag noen demo oppføringer"
-#: core/templates/template.html:201 core/templates/template_features.html:121
-#: core/templates/template_no_context.html:88
-msgid "About"
-msgstr "Om"
-
-#: core/templates/template.html:202 core/templates/template_features.html:125
+#: core/templates/template.html:202 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Vilkår for bruk"
#: core/templates/template.html:209 core/templates/template.html:210
-#: software/templates/license.html:18 software/templates/license.html:19
msgid "Released under the Affero GPL"
msgstr "Utgitt under Affero GPL"
@@ -1599,15 +1495,15 @@ msgstr ""
msgid "Rest day"
msgstr "Hviledag"
-#: core/views/misc.py:199
+#: core/views/misc.py:184
msgid "Feedback"
msgstr "Tilbakemelding"
-#: core/views/misc.py:218 weight/templates/import_csv_form.html:9
+#: core/views/misc.py:203 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Send"
-#: core/views/misc.py:226
+#: core/views/misc.py:211
msgid "Your feedback was successfully sent. Thank you!"
msgstr "Din tilbakemelding har blitt sendt. Takk!"
@@ -1781,7 +1677,6 @@ msgstr "Navn på øvelsen"
#: exercises/templates/exercise/overview.html:118
#: exercises/templates/muscles/overview.html:114
#: nutrition/templates/ingredient/overview.html:85
-#: software/templates/contribute.html:39
msgid "Only registered users can do this"
msgstr "Kun registrerte brukere kan utføre dette"
@@ -1994,7 +1889,7 @@ msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr "%(name_original)s er for likt eksisterende øvelse «%(exercise_name)s»"
-#: exercises/views/exercises.py:246 software/templates/contribute.html:37
+#: exercises/views/exercises.py:246
msgid "Add exercise"
msgstr "Legg til øvelse"
@@ -3756,104 +3651,55 @@ msgstr "Legg til en ny vektenhet"
msgid "Edit a weight unit to ingredient connection"
msgstr "Endre en vektenhet til ingrediens tilkobling"
-#: software/templates/contribute.html:9
+#: software/templates/about_us.html:9
msgid ""
-"wger Workout Manager is build by volunteers,\n"
-"the development process is open and freely accessible to anybody "
-"interested.\n"
-"If you are new to the free software world, we recommend to take a\n"
-"look <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
-"article</a> which summarizes they way open source projects work very well. "
+"Thank you for using wger! wger is a collaborative open source project, made "
+"by fitness enthusiasts from around the world."
msgstr ""
-"wger Workout Manager er bygget av frivillige,\n"
-"utviklingsprosessen er åpen og fritt tilgjengelig for alle som er "
-"interessert.\n"
-"Hvis du er ny på fri programvare verden, anbefaler vi å ta en\n"
-"titt på <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">denne "
-"artikkelen</a> som oppsummerer måten friprog-prosjekter fungerer veldig bra. "
-
-#: software/templates/contribute.html:16
-msgid ""
-"Any kind of contribution is appreciated and welcome.\n"
-"Use this opportunity and influence the direction of the\n"
-"project. "
-msgstr ""
-"Enhver form for bidrag er verdsatt og ønsket velkommen.\n"
-"Bruk denne muligheten og påvirke retningen av\n"
-"prosjektet."
-#: software/templates/contribute.html:23
-msgid "Use the site"
-msgstr "Bruk nettstedet"
+#: software/templates/about_us.html:18
+msgid "Source code"
+msgstr ""
-#: software/templates/contribute.html:24
-msgid ""
-"Simply use the site and tell your friends\n"
-"how useful it is! ;) . When you find something that you specially liked,\n"
-"could need some improvements or just doesn't work, tell us! This might not "
-"sound\n"
-"like much, but is incredibly important!"
+#: software/templates/about_us.html:20
+msgid "Get the source code of this application and its server on github"
msgstr ""
-"Bruk dette området og fortelle dine venner\n"
-"hvor nyttig det er! ;). Når du finner noe du liker spesielt,\n"
-"kansje kunne trenge noen forbedringer eller bare ikke fungerer, fortell oss! "
-"Dette høres kanskje ikke\n"
-"mye ut, men er utrolig viktig!"
-#: software/templates/contribute.html:31
-msgid "Submit exercises"
-msgstr "Send inn øvelser"
+#: software/templates/about_us.html:25
+msgid "Have a problem or idea?"
+msgstr ""
-#: software/templates/contribute.html:32
+#: software/templates/about_us.html:27
msgid ""
-"Submit those cool exercises that you absolutely\n"
-"love and do every week but are not in the list yet. If you think some "
-"description\n"
-"is too short or some other detail is missing or could be improved, tell!"
+"Get in touch if something didn't behave as expected or if there is a feature "
+"that you feel is missing."
msgstr ""
-"Send inn dine kule øvelser som du absolutt\n"
-"elsker og gjøre hver uke, men som ikke er på listen ennå. Hvis du tror noen "
-"beskrivelser\n"
-"er for korte eller annen detalj mangler eller kan forbedres, fortell oss!"
-#: software/templates/contribute.html:44
-msgid ""
-"Do you want to use wger in your own language?\n"
-"Do you think the current translation could be improved?\n"
-"The translations are easily managed and edited online, if you are "
-"interested,\n"
-"visit the link and start translating."
+#: software/templates/about_us.html:32
+msgid "Say hi!"
msgstr ""
-"Ønsker du å bruke wger på ditt eget språk?\n"
-"Tror du dagens oversettelse kan forbedres?\n"
-"Oversettelsene er enkel å håndtere og redigeres på nettet, hvis du er "
-"interessert,\n"
-"besøk lenken og begynn å oversette."
-#: software/templates/contribute.html:53
-msgid "Code"
-msgstr "Kode"
+#: software/templates/about_us.html:34
+msgid "If you want to chat with us, hop on the Discord server and get in touch"
+msgstr ""
-#: software/templates/contribute.html:54
+#: software/templates/about_us.html:39
+#, fuzzy
+#| msgid "Translate"
+msgid "Translation"
+msgstr "Oversett"
+
+#: software/templates/about_us.html:41
msgid ""
-"Obviously, you are highly encouraged to clone the\n"
-"repo and start hacking! Once you are ready, send a pull request and we\n"
-"will show the world. Take a look at the developer guide for more details\n"
-"on this."
+"This application is translated on weblate. If you also want to help, click "
+"the link and start translating"
msgstr ""
-"Selvfølgelig er du svært oppmuntret til å klone\n"
-"repoet og begynne hackingen! Når du er klar, kan du sende en pull "
-"forespørsel og vi\n"
-"vil vise verden. Ta en titt på utviklerveiledningen for mer informasjon\n"
-"på dette."
-#: software/templates/contribute.html:66
+#: software/templates/about_us.html:50
msgid "Our goal"
msgstr "Vårt mål"
-#: software/templates/contribute.html:69
+#: software/templates/about_us.html:53
msgid ""
"The goal is to build an awesome\n"
"and flexible fitness manager, along with a comprehensive and complete list "
@@ -4024,107 +3870,6 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr "100%% Fri <br> og <br> Åpen Kildekode"
-#: software/templates/issues.html:6
-msgid "Reporting a problem"
-msgstr "Rapporter et problem"
-
-#: software/templates/issues.html:10
-msgid ""
-"\n"
-"No software is perfect. For some severe errors, an email will be "
-"automatically sent, but\n"
-"not always, so I depend on you reporting everything that didn't behave as "
-"expected.\n"
-"Please describe in as much detail as you can what you were doing when the "
-"error\n"
-"happened.\n"
-msgstr ""
-"\n"
-"Ingen programvare er perfekt. For alvorlige feil, vil en e-post sendes "
-"automatisk, men\n"
-"ikke alltid, så jeg er avhengig av deg til å rapportere alt som ikke "
-"oppfører seg som forventet.\n"
-"Beskriv så detaljert hva du gjorde da feilen\n"
-"skjedde.\n"
-
-#: software/templates/issues.html:21
-msgid "report problem to the issue tracker"
-msgstr "Rapporter problemet til problemsøkeren"
-
-#: software/templates/issues.html:25
-msgid "Enhancements"
-msgstr "Forbedringer"
-
-#: software/templates/issues.html:27
-msgid ""
-"\n"
-"The issue tracker can also be used to document enhancements to the "
-"software.\n"
-"If you have some suggestions or think a feature is missing, feel\n"
-"free to open a ticket. This can be anything from a slight change to a whole\n"
-"new section of the site. Please keep in mind that not all wishes can be\n"
-"implemented."
-msgstr ""
-"\n"
-"Problem tracker kan også brukes til å dokumentere forbedringer til "
-"programvaren.\n"
-"Hvis du har noen forslag eller tror det mangler en funksjon, føl deg\n"
-"fri til å åpne en ticket. Dette kan være alt fra en liten endring til en "
-"hel\n"
-"ny del av siden. Vær spesielt oppmerksom på at ikke alle ønsker kan bli\n"
-"implementert."
-
-#: software/templates/issues.html:36
-msgid "report wish to the issue tracker"
-msgstr "Rapporter ønsker til problemsøkeren"
-
-#: software/templates/issues.html:41
-msgid "No Github account?"
-msgstr "Ingen Github konto?"
-
-#: software/templates/issues.html:42
-msgid ""
-"Filing an issue requires a github account, if you don't\n"
-"have one and don't want to register, you can also send it to\n"
-"<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
-msgstr ""
-"For å rapportere en feil kreves en github konto. Om du ikke har\n"
-"en, eller ikke ønsker å opprette en, kan du sende inn feilen til følgende <a "
-"href=\"https://groups.google.com/group/wger\">epostliste</a>. "
-
-#: software/templates/license.html:10
-msgid ""
-"wger Workout Manager is Free/Libre Open Source\n"
-"Software (FLOSS)."
-msgstr ""
-"wger Workout Manager er gratis/Libre Åpen kilde\n"
-"Programvare (FOSS)."
-
-#: software/templates/license.html:22
-msgid ""
-"wger Workout Manager is released under the <strong>Affero GNU\n"
-"General Public License (AGPL) Version 3+</strong> and can (under the "
-"conditions\n"
-"of the license) be used, modified and distributed (also with modifications)\n"
-"without restrictions."
-msgstr ""
-"wger Workout Manager er utgitt under <strong>Affero GNU\n"
-"General Public License (AGPL) Versjon 3 +</strong> og kan (i henhold til "
-"vilkårene\n"
-"av lisensen) anvendes, modifiseres og distribueres (også med "
-"modifikasjoner)\n"
-"uten restriksjoner."
-
-#: software/templates/license.html:29
-msgid ""
-"A copy the license text is contained in every wger Workout\n"
-"Manager release (LICENSE.txt) and can be read online on the website of\n"
-"<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</a>."
-msgstr ""
-"En kopi av lisenseteksten finnes i hver wger Workout\n"
-"Manager utgivelse (LICENSE.txt) og kan leses online på nettstedet til\n"
-" <a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>GNU prosjektet </a>."
-
#: utils/generic_views.py:261
msgid "Yes, delete"
msgstr "Ja, slett det"
@@ -4316,6 +4061,273 @@ msgstr "Slettet."
msgid "Delete weight entry for the %s"
msgstr "Slett vektoppføring for %s"
+#~ msgid "Responsible for the content of this site as per German law §5 TMG:"
+#~ msgstr ""
+#~ "Ansvarlig for innholdet på dette nettstedet som per tysk lov §5 TMG:"
+
+#~ msgid "GNUPG-Key:"
+#~ msgstr "GNUPG-Kode:"
+
+#~ msgid "Get in touch"
+#~ msgstr "Ta kontakt"
+
+#~ msgid ""
+#~ "Thank you for your interest. Feel free to use any of the\n"
+#~ "ways below to send feedback you have about any aspect of the site. For\n"
+#~ "support, say hi\n"
+#~ "<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
+#~ "a bug, consider doing it through the <a href=\"%(issues)s\">issue "
+#~ "tracker</a>\n"
+#~ "."
+#~ msgstr ""
+#~ "Takk for din interesse. Bruk gjerne noen av\n"
+#~ "måtene nedenfor for å sende tilbakemelding om ethvert aspekt av "
+#~ "nettstedet. For\n"
+#~ "støtte, si hei\n"
+#~ " <a href=\"%(discord)s\"> på diskord-kanalen </a>, for å rapportere\n"
+#~ "en feil, bør du vurdere å gjøre det gjennom <a href=\"%(issues)s\"> issue "
+#~ "tracker </a>\n"
+#~ "."
+
+#~ msgid ""
+#~ "If you want to further help and improve this project,\n"
+#~ "you might also be interested <a href=\"%(contribute)s\">in contributing</"
+#~ "a>."
+#~ msgstr ""
+#~ "Hvis du ønsker å ytterligere hjelpe og forbedre dette prosjektet,\n"
+#~ "kan det hende du også er interessert i å <a href=\"%(contribute)s"
+#~ "\">bidra</a>."
+
+#~ msgid "Feedback form"
+#~ msgstr "Tilbakemeldings-skjema"
+
+#~ msgid ""
+#~ "A simple contact form. Remember that\n"
+#~ "if you want an answer, you need to include some way to contact you."
+#~ msgstr ""
+#~ "Et enkelt kontaktskjema . Husk\n"
+#~ "hvis du vil ha et svar, må du inkludere noen måte å kontakte deg."
+
+#~ msgid "Twitter"
+#~ msgstr "Twitter"
+
+#~ msgid ""
+#~ "We are also on twitter. Write us and tell us what\n"
+#~ "you think! Except patches, don't send patches via twitter."
+#~ msgstr ""
+#~ "Vi er også på twitter. Skriv til oss og fortell oss hva\n"
+#~ "du tror! Bortsett fra problemer, ikke sende problemer via twitter."
+
+#~ msgid "Discord"
+#~ msgstr "Discord"
+
+#~ msgid ""
+#~ "Use the public group to get support for your\n"
+#~ "local wger installation, discuss issues or your new idea, etc.\n"
+#~ "(no registration needed)"
+#~ msgstr ""
+#~ "Bruk fellesgruppen for å få støtte til din\n"
+#~ "lokale wger installasjon, diskuter problemer eller nye ideer.\n"
+#~ "(Ingen registrering nødvendig)"
+
+#~ msgid "Open feedback form"
+#~ msgstr "Åpne tilbakemeldingsskjema"
+
+#~ msgid "tweet to @wger_project"
+#~ msgstr "tweet to @wger_project"
+
+#~ msgid "Go to the discord server"
+#~ msgstr "Gå til discord serveren"
+
+#~ msgid "Contribute!"
+#~ msgstr "Bidra!"
+
+#~ msgid "Problems and wishes"
+#~ msgstr "Problemer og ønsker"
+
+#~ msgid "About"
+#~ msgstr "Om"
+
+#~ msgid ""
+#~ "wger Workout Manager is build by volunteers,\n"
+#~ "the development process is open and freely accessible to anybody "
+#~ "interested.\n"
+#~ "If you are new to the free software world, we recommend to take a\n"
+#~ "look <a href=\"http://schlitt.info/opensource/"
+#~ "blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
+#~ "article</a> which summarizes they way open source projects work very "
+#~ "well. "
+#~ msgstr ""
+#~ "wger Workout Manager er bygget av frivillige,\n"
+#~ "utviklingsprosessen er åpen og fritt tilgjengelig for alle som er "
+#~ "interessert.\n"
+#~ "Hvis du er ny på fri programvare verden, anbefaler vi å ta en\n"
+#~ "titt på <a href=\"http://schlitt.info/opensource/"
+#~ "blog/0541_10_golden_rules_for_starting_with_open_source.html\">denne "
+#~ "artikkelen</a> som oppsummerer måten friprog-prosjekter fungerer veldig "
+#~ "bra. "
+
+#~ msgid ""
+#~ "Any kind of contribution is appreciated and welcome.\n"
+#~ "Use this opportunity and influence the direction of the\n"
+#~ "project. "
+#~ msgstr ""
+#~ "Enhver form for bidrag er verdsatt og ønsket velkommen.\n"
+#~ "Bruk denne muligheten og påvirke retningen av\n"
+#~ "prosjektet."
+
+#~ msgid "Use the site"
+#~ msgstr "Bruk nettstedet"
+
+#~ msgid ""
+#~ "Simply use the site and tell your friends\n"
+#~ "how useful it is! ;) . When you find something that you specially liked,\n"
+#~ "could need some improvements or just doesn't work, tell us! This might "
+#~ "not sound\n"
+#~ "like much, but is incredibly important!"
+#~ msgstr ""
+#~ "Bruk dette området og fortelle dine venner\n"
+#~ "hvor nyttig det er! ;). Når du finner noe du liker spesielt,\n"
+#~ "kansje kunne trenge noen forbedringer eller bare ikke fungerer, fortell "
+#~ "oss! Dette høres kanskje ikke\n"
+#~ "mye ut, men er utrolig viktig!"
+
+#~ msgid "Submit exercises"
+#~ msgstr "Send inn øvelser"
+
+#~ msgid ""
+#~ "Submit those cool exercises that you absolutely\n"
+#~ "love and do every week but are not in the list yet. If you think some "
+#~ "description\n"
+#~ "is too short or some other detail is missing or could be improved, tell!"
+#~ msgstr ""
+#~ "Send inn dine kule øvelser som du absolutt\n"
+#~ "elsker og gjøre hver uke, men som ikke er på listen ennå. Hvis du tror "
+#~ "noen beskrivelser\n"
+#~ "er for korte eller annen detalj mangler eller kan forbedres, fortell oss!"
+
+#~ msgid ""
+#~ "Do you want to use wger in your own language?\n"
+#~ "Do you think the current translation could be improved?\n"
+#~ "The translations are easily managed and edited online, if you are "
+#~ "interested,\n"
+#~ "visit the link and start translating."
+#~ msgstr ""
+#~ "Ønsker du å bruke wger på ditt eget språk?\n"
+#~ "Tror du dagens oversettelse kan forbedres?\n"
+#~ "Oversettelsene er enkel å håndtere og redigeres på nettet, hvis du er "
+#~ "interessert,\n"
+#~ "besøk lenken og begynn å oversette."
+
+#~ msgid "Code"
+#~ msgstr "Kode"
+
+#~ msgid ""
+#~ "Obviously, you are highly encouraged to clone the\n"
+#~ "repo and start hacking! Once you are ready, send a pull request and we\n"
+#~ "will show the world. Take a look at the developer guide for more details\n"
+#~ "on this."
+#~ msgstr ""
+#~ "Selvfølgelig er du svært oppmuntret til å klone\n"
+#~ "repoet og begynne hackingen! Når du er klar, kan du sende en pull "
+#~ "forespørsel og vi\n"
+#~ "vil vise verden. Ta en titt på utviklerveiledningen for mer informasjon\n"
+#~ "på dette."
+
+#~ msgid "Reporting a problem"
+#~ msgstr "Rapporter et problem"
+
+#~ msgid ""
+#~ "\n"
+#~ "No software is perfect. For some severe errors, an email will be "
+#~ "automatically sent, but\n"
+#~ "not always, so I depend on you reporting everything that didn't behave as "
+#~ "expected.\n"
+#~ "Please describe in as much detail as you can what you were doing when the "
+#~ "error\n"
+#~ "happened.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Ingen programvare er perfekt. For alvorlige feil, vil en e-post sendes "
+#~ "automatisk, men\n"
+#~ "ikke alltid, så jeg er avhengig av deg til å rapportere alt som ikke "
+#~ "oppfører seg som forventet.\n"
+#~ "Beskriv så detaljert hva du gjorde da feilen\n"
+#~ "skjedde.\n"
+
+#~ msgid "report problem to the issue tracker"
+#~ msgstr "Rapporter problemet til problemsøkeren"
+
+#~ msgid "Enhancements"
+#~ msgstr "Forbedringer"
+
+#~ msgid ""
+#~ "\n"
+#~ "The issue tracker can also be used to document enhancements to the "
+#~ "software.\n"
+#~ "If you have some suggestions or think a feature is missing, feel\n"
+#~ "free to open a ticket. This can be anything from a slight change to a "
+#~ "whole\n"
+#~ "new section of the site. Please keep in mind that not all wishes can be\n"
+#~ "implemented."
+#~ msgstr ""
+#~ "\n"
+#~ "Problem tracker kan også brukes til å dokumentere forbedringer til "
+#~ "programvaren.\n"
+#~ "Hvis du har noen forslag eller tror det mangler en funksjon, føl deg\n"
+#~ "fri til å åpne en ticket. Dette kan være alt fra en liten endring til en "
+#~ "hel\n"
+#~ "ny del av siden. Vær spesielt oppmerksom på at ikke alle ønsker kan bli\n"
+#~ "implementert."
+
+#~ msgid "report wish to the issue tracker"
+#~ msgstr "Rapporter ønsker til problemsøkeren"
+
+#~ msgid "No Github account?"
+#~ msgstr "Ingen Github konto?"
+
+#~ msgid ""
+#~ "Filing an issue requires a github account, if you don't\n"
+#~ "have one and don't want to register, you can also send it to\n"
+#~ "<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
+#~ msgstr ""
+#~ "For å rapportere en feil kreves en github konto. Om du ikke har\n"
+#~ "en, eller ikke ønsker å opprette en, kan du sende inn feilen til følgende "
+#~ "<a href=\"https://groups.google.com/group/wger\">epostliste</a>. "
+
+#~ msgid ""
+#~ "wger Workout Manager is Free/Libre Open Source\n"
+#~ "Software (FLOSS)."
+#~ msgstr ""
+#~ "wger Workout Manager er gratis/Libre Åpen kilde\n"
+#~ "Programvare (FOSS)."
+
+#~ msgid ""
+#~ "wger Workout Manager is released under the <strong>Affero GNU\n"
+#~ "General Public License (AGPL) Version 3+</strong> and can (under the "
+#~ "conditions\n"
+#~ "of the license) be used, modified and distributed (also with "
+#~ "modifications)\n"
+#~ "without restrictions."
+#~ msgstr ""
+#~ "wger Workout Manager er utgitt under <strong>Affero GNU\n"
+#~ "General Public License (AGPL) Versjon 3 +</strong> og kan (i henhold til "
+#~ "vilkårene\n"
+#~ "av lisensen) anvendes, modifiseres og distribueres (også med "
+#~ "modifikasjoner)\n"
+#~ "uten restriksjoner."
+
+#~ msgid ""
+#~ "A copy the license text is contained in every wger Workout\n"
+#~ "Manager release (LICENSE.txt) and can be read online on the website of\n"
+#~ "<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</"
+#~ "a>."
+#~ msgstr ""
+#~ "En kopi av lisenseteksten finnes i hver wger Workout\n"
+#~ "Manager utgivelse (LICENSE.txt) og kan leses online på nettstedet til\n"
+#~ " <a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>GNU prosjektet </"
+#~ "a>."
+
#~ msgid "Use pauses in workout timer"
#~ msgstr "Bruk pauser i treningstidtaker"
diff --git a/wger/locale/os/LC_MESSAGES/django.po b/wger/locale/os/LC_MESSAGES/django.po
index 0acad6da1..a3d523120 100644
--- a/wger/locale/os/LC_MESSAGES/django.po
+++ b/wger/locale/os/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-17 15:00+0200\n"
+"POT-Creation-Date: 2021-08-17 17:23+0200\n"
"PO-Revision-Date: 2021-04-11 18:54+0000\n"
"Last-Translator: rge <[email protected]>\n"
"Language-Team: Ossetic (http://www.transifex.com/rge/wger-workout-manager/"
@@ -39,7 +39,7 @@ msgstr "Фӕлтӕрӕнтӕ"
msgid "Ingredients"
msgstr ""
-#: config/templates/language/overview.html:4 core/templates/navigation.html:225
+#: config/templates/language/overview.html:4 core/templates/navigation.html:228
msgid "Languages"
msgstr ""
@@ -211,8 +211,8 @@ msgstr ""
msgid "Empty placeholder schedule"
msgstr ""
-#: core/forms.py:61 core/templates/navigation.html:187
-#: core/templates/navigation.html:191 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:190
+#: core/templates/navigation.html:194 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr ""
@@ -285,8 +285,8 @@ msgstr ""
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:187
-#: core/templates/navigation.html:192 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
+#: core/templates/navigation.html:195 core/templates/template.html:150
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -754,84 +754,10 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4
-msgid "About us"
-msgstr ""
-
-#: core/templates/misc/about.html:8
-msgid "Responsible for the content of this site as per German law §5 TMG:"
-msgstr ""
-
-#: core/templates/misc/about.html:16
-msgid "GNUPG-Key:"
-msgstr ""
-
-#: core/templates/misc/contact.html:4 core/templates/navigation.html:153
-#: core/templates/template_features.html:86
-#: software/templates/contribute.html:28
-msgid "Get in touch"
-msgstr ""
-
-#: core/templates/misc/contact.html:10
-#, python-format
-msgid ""
-"Thank you for your interest. Feel free to use any of the\n"
-"ways below to send feedback you have about any aspect of the site. For\n"
-"support, say hi\n"
-"<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
-"a bug, consider doing it through the <a href=\"%(issues)s\">issue tracker</"
-"a>\n"
-"."
-msgstr ""
-
-#: core/templates/misc/contact.html:20
-#, python-format
-msgid ""
-"If you want to further help and improve this project,\n"
-"you might also be interested <a href=\"%(contribute)s\">in contributing</a>."
-msgstr ""
-
-#: core/templates/misc/contact.html:29
-msgid "Feedback form"
-msgstr ""
-
-#: core/templates/misc/contact.html:30
-msgid ""
-"A simple contact form. Remember that\n"
-"if you want an answer, you need to include some way to contact you."
-msgstr ""
-
-#: core/templates/misc/contact.html:35
-msgid "Twitter"
-msgstr "Twitter"
-
-#: core/templates/misc/contact.html:36
-msgid ""
-"We are also on twitter. Write us and tell us what\n"
-"you think! Except patches, don't send patches via twitter."
-msgstr ""
-
-#: core/templates/misc/contact.html:42
-msgid "Discord"
-msgstr ""
-
-#: core/templates/misc/contact.html:43
-msgid ""
-"Use the public group to get support for your\n"
-"local wger installation, discuss issues or your new idea, etc.\n"
-"(no registration needed)"
-msgstr ""
-
-#: core/templates/misc/contact.html:49
-msgid "Open feedback form"
-msgstr ""
-
-#: core/templates/misc/contact.html:53
-msgid "tweet to @wger_project"
-msgstr ""
-
-#: core/templates/misc/contact.html:56
-msgid "Go to the discord server"
+#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/template_features.html:118
+#: core/templates/template_no_context.html:88
+msgid "Imprint"
msgstr ""
#: core/templates/misc/fragments/shariff_modal.html:6
@@ -917,7 +843,7 @@ msgid "Add new exercise"
msgstr "Ног фӕлтӕрӕн бафтауын"
#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:223
+#: core/templates/navigation.html:226
msgid "Administration"
msgstr "Администраци"
@@ -984,68 +910,62 @@ msgid "About this software"
msgstr ""
#: core/templates/navigation.html:151 core/templates/template_features.html:83
-#: software/templates/contribute.html:6
-msgid "Contribute!"
-msgstr ""
-
-#: core/templates/navigation.html:152
-msgid "Problems and wishes"
+#: software/templates/about_us.html:5
+msgid "About us"
msgstr ""
-#: core/templates/navigation.html:155 software/templates/features.html:209
+#: core/templates/navigation.html:153 software/templates/features.html:209
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:156 software/templates/license.html:7
-#: utils/models.py:40
+#: core/templates/navigation.html:157 utils/models.py:40
msgid "License"
msgstr ""
-#: core/templates/navigation.html:160
+#: core/templates/navigation.html:163
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:166 software/templates/contribute.html:59
+#: core/templates/navigation.html:169
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:172 core/templates/template.html:193
-#: core/templates/template_features.html:103
-#: software/templates/contribute.html:43 software/templates/contribute.html:50
+#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/template_features.html:100
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:193 core/templates/user/login.html:28
+#: core/templates/navigation.html:196 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:206
+#: core/templates/navigation.html:209
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:213
+#: core/templates/navigation.html:216
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:228
+#: core/templates/navigation.html:231
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:234
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:234 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:237 core/templates/user/list.html:4
+#: core/templates/navigation.html:240 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:238
+#: core/templates/navigation.html:241
msgid "Gyms"
msgstr ""
@@ -1159,18 +1079,12 @@ msgstr ""
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:201 core/templates/template_features.html:121
-#: core/templates/template_no_context.html:88
-msgid "About"
-msgstr ""
-
-#: core/templates/template.html:202 core/templates/template_features.html:125
+#: core/templates/template.html:202 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
#: core/templates/template.html:209 core/templates/template.html:210
-#: software/templates/license.html:18 software/templates/license.html:19
msgid "Released under the Affero GPL"
msgstr ""
@@ -1518,15 +1432,15 @@ msgstr ""
msgid "Rest day"
msgstr ""
-#: core/views/misc.py:199
+#: core/views/misc.py:184
msgid "Feedback"
msgstr ""
-#: core/views/misc.py:218 weight/templates/import_csv_form.html:9
+#: core/views/misc.py:203 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr ""
-#: core/views/misc.py:226
+#: core/views/misc.py:211
msgid "Your feedback was successfully sent. Thank you!"
msgstr ""
@@ -1695,7 +1609,6 @@ msgstr "фӕлтӕрӕны ном"
#: exercises/templates/exercise/overview.html:118
#: exercises/templates/muscles/overview.html:114
#: nutrition/templates/ingredient/overview.html:85
-#: software/templates/contribute.html:39
msgid "Only registered users can do this"
msgstr ""
@@ -1889,7 +1802,7 @@ msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246 software/templates/contribute.html:37
+#: exercises/views/exercises.py:246
msgid "Add exercise"
msgstr ""
@@ -3515,75 +3428,53 @@ msgstr ""
msgid "Edit a weight unit to ingredient connection"
msgstr ""
-#: software/templates/contribute.html:9
+#: software/templates/about_us.html:9
msgid ""
-"wger Workout Manager is build by volunteers,\n"
-"the development process is open and freely accessible to anybody "
-"interested.\n"
-"If you are new to the free software world, we recommend to take a\n"
-"look <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
-"article</a> which summarizes they way open source projects work very well. "
+"Thank you for using wger! wger is a collaborative open source project, made "
+"by fitness enthusiasts from around the world."
msgstr ""
-#: software/templates/contribute.html:16
-msgid ""
-"Any kind of contribution is appreciated and welcome.\n"
-"Use this opportunity and influence the direction of the\n"
-"project. "
+#: software/templates/about_us.html:18
+msgid "Source code"
msgstr ""
-#: software/templates/contribute.html:23
-msgid "Use the site"
+#: software/templates/about_us.html:20
+msgid "Get the source code of this application and its server on github"
msgstr ""
-#: software/templates/contribute.html:24
-msgid ""
-"Simply use the site and tell your friends\n"
-"how useful it is! ;) . When you find something that you specially liked,\n"
-"could need some improvements or just doesn't work, tell us! This might not "
-"sound\n"
-"like much, but is incredibly important!"
+#: software/templates/about_us.html:25
+msgid "Have a problem or idea?"
msgstr ""
-#: software/templates/contribute.html:31
-msgid "Submit exercises"
+#: software/templates/about_us.html:27
+msgid ""
+"Get in touch if something didn't behave as expected or if there is a feature "
+"that you feel is missing."
msgstr ""
-#: software/templates/contribute.html:32
-msgid ""
-"Submit those cool exercises that you absolutely\n"
-"love and do every week but are not in the list yet. If you think some "
-"description\n"
-"is too short or some other detail is missing or could be improved, tell!"
+#: software/templates/about_us.html:32
+msgid "Say hi!"
msgstr ""
-#: software/templates/contribute.html:44
-msgid ""
-"Do you want to use wger in your own language?\n"
-"Do you think the current translation could be improved?\n"
-"The translations are easily managed and edited online, if you are "
-"interested,\n"
-"visit the link and start translating."
+#: software/templates/about_us.html:34
+msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
-#: software/templates/contribute.html:53
-msgid "Code"
+#: software/templates/about_us.html:39
+msgid "Translation"
msgstr ""
-#: software/templates/contribute.html:54
+#: software/templates/about_us.html:41
msgid ""
-"Obviously, you are highly encouraged to clone the\n"
-"repo and start hacking! Once you are ready, send a pull request and we\n"
-"will show the world. Take a look at the developer guide for more details\n"
-"on this."
+"This application is translated on weblate. If you also want to help, click "
+"the link and start translating"
msgstr ""
-#: software/templates/contribute.html:66
+#: software/templates/about_us.html:50
msgid "Our goal"
msgstr ""
-#: software/templates/contribute.html:69
+#: software/templates/about_us.html:53
msgid ""
"The goal is to build an awesome\n"
"and flexible fitness manager, along with a comprehensive and complete list "
@@ -3718,78 +3609,6 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr ""
-#: software/templates/issues.html:6
-msgid "Reporting a problem"
-msgstr ""
-
-#: software/templates/issues.html:10
-msgid ""
-"\n"
-"No software is perfect. For some severe errors, an email will be "
-"automatically sent, but\n"
-"not always, so I depend on you reporting everything that didn't behave as "
-"expected.\n"
-"Please describe in as much detail as you can what you were doing when the "
-"error\n"
-"happened.\n"
-msgstr ""
-
-#: software/templates/issues.html:21
-msgid "report problem to the issue tracker"
-msgstr ""
-
-#: software/templates/issues.html:25
-msgid "Enhancements"
-msgstr ""
-
-#: software/templates/issues.html:27
-msgid ""
-"\n"
-"The issue tracker can also be used to document enhancements to the "
-"software.\n"
-"If you have some suggestions or think a feature is missing, feel\n"
-"free to open a ticket. This can be anything from a slight change to a whole\n"
-"new section of the site. Please keep in mind that not all wishes can be\n"
-"implemented."
-msgstr ""
-
-#: software/templates/issues.html:36
-msgid "report wish to the issue tracker"
-msgstr ""
-
-#: software/templates/issues.html:41
-msgid "No Github account?"
-msgstr ""
-
-#: software/templates/issues.html:42
-msgid ""
-"Filing an issue requires a github account, if you don't\n"
-"have one and don't want to register, you can also send it to\n"
-"<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
-msgstr ""
-
-#: software/templates/license.html:10
-msgid ""
-"wger Workout Manager is Free/Libre Open Source\n"
-"Software (FLOSS)."
-msgstr ""
-
-#: software/templates/license.html:22
-msgid ""
-"wger Workout Manager is released under the <strong>Affero GNU\n"
-"General Public License (AGPL) Version 3+</strong> and can (under the "
-"conditions\n"
-"of the license) be used, modified and distributed (also with modifications)\n"
-"without restrictions."
-msgstr ""
-
-#: software/templates/license.html:29
-msgid ""
-"A copy the license text is contained in every wger Workout\n"
-"Manager release (LICENSE.txt) and can be read online on the website of\n"
-"<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</a>."
-msgstr ""
-
#: utils/generic_views.py:261
msgid "Yes, delete"
msgstr ""
@@ -3952,3 +3771,6 @@ msgstr ""
#, python-format
msgid "Delete weight entry for the %s"
msgstr ""
+
+#~ msgid "Twitter"
+#~ msgstr "Twitter"
diff --git a/wger/locale/pl/LC_MESSAGES/django.po b/wger/locale/pl/LC_MESSAGES/django.po
index 74caa006f..a8f19df34 100644
--- a/wger/locale/pl/LC_MESSAGES/django.po
+++ b/wger/locale/pl/LC_MESSAGES/django.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-17 15:00+0200\n"
+"POT-Creation-Date: 2021-08-17 17:23+0200\n"
"PO-Revision-Date: 2021-06-03 21:32+0000\n"
"Last-Translator: Henio Szewczyk <[email protected]>\n"
"Language-Team: Polish <https://hosted.weblate.org/projects/wger/web/pl/>\n"
@@ -49,7 +49,7 @@ msgstr "Ćwiczenia"
msgid "Ingredients"
msgstr "Składniki"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:225
+#: config/templates/language/overview.html:4 core/templates/navigation.html:228
msgid "Languages"
msgstr "Języki"
@@ -226,8 +226,8 @@ msgstr "Mój fajny harmonogram treningu"
msgid "Empty placeholder schedule"
msgstr "Pusty zapychacz harmonogramu"
-#: core/forms.py:61 core/templates/navigation.html:187
-#: core/templates/navigation.html:191 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:190
+#: core/templates/navigation.html:194 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Zaloguj"
@@ -304,8 +304,8 @@ msgstr "Hasło nieprawidłowe"
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:187
-#: core/templates/navigation.html:192 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
+#: core/templates/navigation.html:195 core/templates/template.html:150
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -794,94 +794,10 @@ msgstr "Lista licencji"
msgid "Nothing found"
msgstr "Nic nie znaleziono"
-#: core/templates/misc/about.html:4
-msgid "About us"
-msgstr "O nas"
-
-#: core/templates/misc/about.html:8
-msgid "Responsible for the content of this site as per German law §5 TMG:"
-msgstr "Za treść tej strony odpowiada niemieckie prawo §5 TMG:"
-
-#: core/templates/misc/about.html:16
-msgid "GNUPG-Key:"
-msgstr "Klucz GNUPG:"
-
-#: core/templates/misc/contact.html:4 core/templates/navigation.html:153
-#: core/templates/template_features.html:86
-#: software/templates/contribute.html:28
-msgid "Get in touch"
-msgstr "Skontaktuj się"
-
-#: core/templates/misc/contact.html:10
-#, python-format
-msgid ""
-"Thank you for your interest. Feel free to use any of the\n"
-"ways below to send feedback you have about any aspect of the site. For\n"
-"support, say hi\n"
-"<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
-"a bug, consider doing it through the <a href=\"%(issues)s\">issue tracker</"
-"a>\n"
-"."
-msgstr ""
-
-#: core/templates/misc/contact.html:20
-#, python-format
-msgid ""
-"If you want to further help and improve this project,\n"
-"you might also be interested <a href=\"%(contribute)s\">in contributing</a>."
-msgstr ""
-"Jeżeli chcesz, by ten projekt się rozwijał\n"
-"możesz być zainteresowany <a href=\"%(contribute)s\">wspieraniem go</a>."
-
-#: core/templates/misc/contact.html:29
-msgid "Feedback form"
-msgstr "Formularz Facebooka"
-
-#: core/templates/misc/contact.html:30
-msgid ""
-"A simple contact form. Remember that\n"
-"if you want an answer, you need to include some way to contact you."
-msgstr ""
-"Prosty formularz kontaktowy, Pamiętaj jednak,\n"
-"że jeśli oczekujesz odpowiedzi, musisz zostawić jakąś formę do kontaktu."
-
-#: core/templates/misc/contact.html:35
-msgid "Twitter"
-msgstr "Twitter"
-
-#: core/templates/misc/contact.html:36
-msgid ""
-"We are also on twitter. Write us and tell us what\n"
-"you think! Except patches, don't send patches via twitter."
-msgstr ""
-"Jesteśmy także na Twitterze.\n"
-"Napisz do nas i powiedz co myślisz! Z wyjątkiem łatek, nie wysyłaj łatek "
-"przez Twittera."
-
-#: core/templates/misc/contact.html:42
-msgid "Discord"
-msgstr ""
-
-#: core/templates/misc/contact.html:43
-msgid ""
-"Use the public group to get support for your\n"
-"local wger installation, discuss issues or your new idea, etc.\n"
-"(no registration needed)"
-msgstr ""
-"Użyj grupy publicznej by otrzymać wparcie w\n"
-"samodzielnej instalacji wger, problemach bądź realizacji Twoich pomysłów\n"
-"(rejestracja niewymagana)"
-
-#: core/templates/misc/contact.html:49
-msgid "Open feedback form"
-msgstr "Otwórz formularz kontaktowy"
-
-#: core/templates/misc/contact.html:53
-msgid "tweet to @wger_project"
-msgstr ""
-
-#: core/templates/misc/contact.html:56
-msgid "Go to the discord server"
+#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/template_features.html:118
+#: core/templates/template_no_context.html:88
+msgid "Imprint"
msgstr ""
#: core/templates/misc/fragments/shariff_modal.html:6
@@ -975,7 +891,7 @@ msgid "Add new exercise"
msgstr "Dodaj nowe ćwiczenie"
#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:223
+#: core/templates/navigation.html:226
msgid "Administration"
msgstr "Zarządzanie"
@@ -1042,68 +958,62 @@ msgid "About this software"
msgstr "O tym programie"
#: core/templates/navigation.html:151 core/templates/template_features.html:83
-#: software/templates/contribute.html:6
-msgid "Contribute!"
-msgstr "Wspomóż!"
-
-#: core/templates/navigation.html:152
-msgid "Problems and wishes"
-msgstr "Problemy i życzenia"
+#: software/templates/about_us.html:5
+msgid "About us"
+msgstr "O nas"
-#: core/templates/navigation.html:155 software/templates/features.html:209
+#: core/templates/navigation.html:153 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:156 software/templates/license.html:7
-#: utils/models.py:40
+#: core/templates/navigation.html:157 utils/models.py:40
msgid "License"
msgstr "Licencja"
-#: core/templates/navigation.html:160
+#: core/templates/navigation.html:163
msgid "Developer documentation"
msgstr "Dokumentacja"
-#: core/templates/navigation.html:166 software/templates/contribute.html:59
+#: core/templates/navigation.html:169
msgid "Get the code"
msgstr "Pobierz kod źródłowy"
-#: core/templates/navigation.html:172 core/templates/template.html:193
-#: core/templates/template_features.html:103
-#: software/templates/contribute.html:43 software/templates/contribute.html:50
+#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/template_features.html:100
msgid "Translate"
msgstr "Tłumacz"
-#: core/templates/navigation.html:193 core/templates/user/login.html:28
+#: core/templates/navigation.html:196 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Resetuj hasło"
-#: core/templates/navigation.html:206
+#: core/templates/navigation.html:209
msgid "My preferences"
msgstr "Moje preferencje"
-#: core/templates/navigation.html:213
+#: core/templates/navigation.html:216
msgid "Logout"
msgstr "Wyloguj"
-#: core/templates/navigation.html:228
+#: core/templates/navigation.html:231
msgid "Licenses"
msgstr "Licencje"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:234
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Jednostki potwórzeń"
-#: core/templates/navigation.html:234 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Jednostki wagi"
-#: core/templates/navigation.html:237 core/templates/user/list.html:4
+#: core/templates/navigation.html:240 core/templates/user/list.html:4
msgid "User list"
msgstr "Lista użytkowników"
-#: core/templates/navigation.html:238
+#: core/templates/navigation.html:241
msgid "Gyms"
msgstr "Siłownie"
@@ -1223,18 +1133,12 @@ msgstr ""
msgid "Create some demo entries"
msgstr "Utwórz kilka przykładowych wpisów"
-#: core/templates/template.html:201 core/templates/template_features.html:121
-#: core/templates/template_no_context.html:88
-msgid "About"
-msgstr "O nas"
-
-#: core/templates/template.html:202 core/templates/template_features.html:125
+#: core/templates/template.html:202 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Warunki świadczenia usługi"
#: core/templates/template.html:209 core/templates/template.html:210
-#: software/templates/license.html:18 software/templates/license.html:19
msgid "Released under the Affero GPL"
msgstr "Udostępnione na licencji Affero GPL"
@@ -1593,15 +1497,15 @@ msgstr ""
msgid "Rest day"
msgstr "Dzień odpoczynku"
-#: core/views/misc.py:199
+#: core/views/misc.py:184
msgid "Feedback"
msgstr "Opinia"
-#: core/views/misc.py:218 weight/templates/import_csv_form.html:9
+#: core/views/misc.py:203 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Zapisz"
-#: core/views/misc.py:226
+#: core/views/misc.py:211
msgid "Your feedback was successfully sent. Thank you!"
msgstr "Twoja opinia została poprawnie wysłana. Dziękujemy!"
@@ -1774,7 +1678,6 @@ msgstr "nazwa ćwiczenia"
#: exercises/templates/exercise/overview.html:118
#: exercises/templates/muscles/overview.html:114
#: nutrition/templates/ingredient/overview.html:85
-#: software/templates/contribute.html:39
msgid "Only registered users can do this"
msgstr "Tylko zarejestrowani użytkownicy mogą wykonać tą akcję"
@@ -1985,7 +1888,7 @@ msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246 software/templates/contribute.html:37
+#: exercises/views/exercises.py:246
msgid "Add exercise"
msgstr "Dodaj ćwiczenie"
@@ -3757,106 +3660,55 @@ msgstr "Dodaj nową jednostkę wagi"
msgid "Edit a weight unit to ingredient connection"
msgstr "Edytuj powiązanie jednostki wagi i skladnika"
-#: software/templates/contribute.html:9
-msgid ""
-"wger Workout Manager is build by volunteers,\n"
-"the development process is open and freely accessible to anybody "
-"interested.\n"
-"If you are new to the free software world, we recommend to take a\n"
-"look <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
-"article</a> which summarizes they way open source projects work very well. "
-msgstr ""
-"wger jest budowany przez wolontariuszy,\n"
-"proces rozwoju jest otwarty i dostępny dla wszystkich zainteresowanych.\n"
-"Jeżeli jesteś nowy w świecie otwartego oprogramowania, polecamy zapoznać się "
-"z\n"
-"<a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">tym\n"
-"artykułem</a>, który podsumowuje jak funkcjonują tego rodzaju projekty. "
-
-#: software/templates/contribute.html:16
+#: software/templates/about_us.html:9
msgid ""
-"Any kind of contribution is appreciated and welcome.\n"
-"Use this opportunity and influence the direction of the\n"
-"project. "
+"Thank you for using wger! wger is a collaborative open source project, made "
+"by fitness enthusiasts from around the world."
msgstr ""
-"Dziękujemy za wszelki wkład w rozwój.\n"
-"Skorzystaj z tej okazji by wpłynąć na kierunek rozwoju \n"
-"projektu. "
-#: software/templates/contribute.html:23
-msgid "Use the site"
-msgstr "Korzystaj ze strony"
+#: software/templates/about_us.html:18
+msgid "Source code"
+msgstr ""
-#: software/templates/contribute.html:24
-msgid ""
-"Simply use the site and tell your friends\n"
-"how useful it is! ;) . When you find something that you specially liked,\n"
-"could need some improvements or just doesn't work, tell us! This might not "
-"sound\n"
-"like much, but is incredibly important!"
-msgstr ""
-"Po prostu skorzystaj ze strony i powiedz znajomym\n"
-"jakie to przydatne! ;) . Kiedy znajdziesz coś, co szczególnie Ci się "
-"spodobało,\n"
-"może wymagać pewnych ulepszeń lub po prostu nie działa, powiedz nam! To może "
-"nie brzmieć\n"
-"lubi dużo, ale jest niesamowicie ważny!"
-
-#: software/templates/contribute.html:31
-msgid "Submit exercises"
-msgstr "Dodaj ćwiczenia"
-
-#: software/templates/contribute.html:32
-msgid ""
-"Submit those cool exercises that you absolutely\n"
-"love and do every week but are not in the list yet. If you think some "
-"description\n"
-"is too short or some other detail is missing or could be improved, tell!"
+#: software/templates/about_us.html:20
+msgid "Get the source code of this application and its server on github"
+msgstr ""
+
+#: software/templates/about_us.html:25
+msgid "Have a problem or idea?"
msgstr ""
-"Dodaj fajne ćwiczenia, które\n"
-"uwielbiasz i robisz każdego tygodnia, ale których nie znalazłeś jeszcze na "
-"liście. Jeżeli uważasz, że opis któregoś z ćwiczeń\n"
-"jest zbyt krótki, albo czegoś mu brakuje, powiedz!"
-#: software/templates/contribute.html:44
+#: software/templates/about_us.html:27
msgid ""
-"Do you want to use wger in your own language?\n"
-"Do you think the current translation could be improved?\n"
-"The translations are easily managed and edited online, if you are "
-"interested,\n"
-"visit the link and start translating."
-msgstr ""
-"Chcesz używać wgera w swoim języku ojczystym?\n"
-"Myślisz, że można poprawić obecne tłumaczenie?\n"
-"Tłumaczeniami można łatwo zarządzać i edytować je online, więc jeśli jesteś "
-"zainteresowany,\n"
-"wejdź na stronę transifex, poproś o dostęp, a my ustawimy wszystko dla "
-"Ciebie."
-
-#: software/templates/contribute.html:53
-msgid "Code"
-msgstr "Kod"
-
-#: software/templates/contribute.html:54
+"Get in touch if something didn't behave as expected or if there is a feature "
+"that you feel is missing."
+msgstr ""
+
+#: software/templates/about_us.html:32
+msgid "Say hi!"
+msgstr ""
+
+#: software/templates/about_us.html:34
+msgid "If you want to chat with us, hop on the Discord server and get in touch"
+msgstr ""
+
+#: software/templates/about_us.html:39
+#, fuzzy
+#| msgid "Translate"
+msgid "Translation"
+msgstr "Tłumacz"
+
+#: software/templates/about_us.html:41
msgid ""
-"Obviously, you are highly encouraged to clone the\n"
-"repo and start hacking! Once you are ready, send a pull request and we\n"
-"will show the world. Take a look at the developer guide for more details\n"
-"on this."
-msgstr ""
-"Oczywiście, mocno zachęcamy do sklonowania\n"
-"repozytorium i modyfikacji! Gdy tylko uda Ci się coś dodać, wyślij pull "
-"requesta, a my\n"
-"pokażemy go światu. Przeczytaj poradnik programisty, by poznać\n"
-"szczegóły."
-
-#: software/templates/contribute.html:66
+"This application is translated on weblate. If you also want to help, click "
+"the link and start translating"
+msgstr ""
+
+#: software/templates/about_us.html:50
msgid "Our goal"
msgstr "Nasz cel"
-#: software/templates/contribute.html:69
+#: software/templates/about_us.html:53
msgid ""
"The goal is to build an awesome\n"
"and flexible fitness manager, along with a comprehensive and complete list "
@@ -4026,106 +3878,6 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr "100%% Darmo <br>i <br>Open Source"
-#: software/templates/issues.html:6
-msgid "Reporting a problem"
-msgstr "Zgłaszanie problemu"
-
-#: software/templates/issues.html:10
-msgid ""
-"\n"
-"No software is perfect. For some severe errors, an email will be "
-"automatically sent, but\n"
-"not always, so I depend on you reporting everything that didn't behave as "
-"expected.\n"
-"Please describe in as much detail as you can what you were doing when the "
-"error\n"
-"happened.\n"
-msgstr ""
-"\n"
-"Nie ma idealnego oprogramowania. Wiele błędów jest raportowanych "
-"automatycznie, ale\n"
-"nie zawsze tak się dzieje, dlatego właśnie liczymy na Ciebie gdy coś nie "
-"zadziała poprawnie. \n"
-"Opisz w szczegółach co jest nie tak, a także co robiłeś gdy pojawił się\n"
-"błąd.\n"
-
-#: software/templates/issues.html:21
-msgid "report problem to the issue tracker"
-msgstr "zaraportuj problem do issue trackera"
-
-#: software/templates/issues.html:25
-msgid "Enhancements"
-msgstr "Usprawnienia"
-
-#: software/templates/issues.html:27
-msgid ""
-"\n"
-"The issue tracker can also be used to document enhancements to the "
-"software.\n"
-"If you have some suggestions or think a feature is missing, feel\n"
-"free to open a ticket. This can be anything from a slight change to a whole\n"
-"new section of the site. Please keep in mind that not all wishes can be\n"
-"implemented."
-msgstr ""
-"\n"
-"Issue tracker pozwala także na dokumentację ulepszeń oprogramowania.\n"
-"Jeżeli masz jakieś sugestie albo uważasz, że brakuje funkcjonalności, po "
-"prostu\n"
-"stwórz nowy wątek. Może to być cokolwiek, od drobnej zmiany aż do nowej\n"
-"sekcji strony. Pamiętaj, że nie wszystko może zostać\n"
-"zaimplementowane."
-
-#: software/templates/issues.html:36
-msgid "report wish to the issue tracker"
-msgstr "Zaproponuj coś na issue trackerze"
-
-#: software/templates/issues.html:41
-msgid "No Github account?"
-msgstr "Brak konta Github?"
-
-#: software/templates/issues.html:42
-msgid ""
-"Filing an issue requires a github account, if you don't\n"
-"have one and don't want to register, you can also send it to\n"
-"<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
-msgstr ""
-"Dodanie informacji o problemie wymaga konta w serwisie GitHub. Jeżeli go "
-"nie\n"
-"posiadasz i nie chcesz go zakładać, możesz również wysłać informację na\n"
-"<a href=\"https://groups.google.com/group/wger\">grupę dyskusyjną</a>."
-
-#: software/templates/license.html:10
-msgid ""
-"wger Workout Manager is Free/Libre Open Source\n"
-"Software (FLOSS)."
-msgstr ""
-"wger jest Darmowym i Wolno Źródłowym\n"
-"Oprogramowaniem (FLOSS)."
-
-#: software/templates/license.html:22
-msgid ""
-"wger Workout Manager is released under the <strong>Affero GNU\n"
-"General Public License (AGPL) Version 3+</strong> and can (under the "
-"conditions\n"
-"of the license) be used, modified and distributed (also with modifications)\n"
-"without restrictions."
-msgstr ""
-"wger jest publikowany na zasadach <strong>licencji Affero GNU\n"
-"General Public License (AGPS) Wersja 3+</strong> i może (zgodnie z "
-"warunkami\n"
-"licencji) być używany, modyfikowany i dystrybuowany (także z modyfikacjami)\n"
-"bez żadnych ograniczeń."
-
-#: software/templates/license.html:29
-msgid ""
-"A copy the license text is contained in every wger Workout\n"
-"Manager release (LICENSE.txt) and can be read online on the website of\n"
-"<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</a>."
-msgstr ""
-"Kopia treści licencji jest zawarta w każdym wydaniu\n"
-"wgera (LICENSE.txt) i może być przeczytana online na stronie\n"
-"<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>GNU project</a>."
-
#: utils/generic_views.py:261
msgid "Yes, delete"
msgstr "Tak, usuń"
@@ -4314,6 +4066,245 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Responsible for the content of this site as per German law §5 TMG:"
+#~ msgstr "Za treść tej strony odpowiada niemieckie prawo §5 TMG:"
+
+#~ msgid "GNUPG-Key:"
+#~ msgstr "Klucz GNUPG:"
+
+#~ msgid "Get in touch"
+#~ msgstr "Skontaktuj się"
+
+#~ msgid ""
+#~ "If you want to further help and improve this project,\n"
+#~ "you might also be interested <a href=\"%(contribute)s\">in contributing</"
+#~ "a>."
+#~ msgstr ""
+#~ "Jeżeli chcesz, by ten projekt się rozwijał\n"
+#~ "możesz być zainteresowany <a href=\"%(contribute)s\">wspieraniem go</a>."
+
+#~ msgid "Feedback form"
+#~ msgstr "Formularz Facebooka"
+
+#~ msgid ""
+#~ "A simple contact form. Remember that\n"
+#~ "if you want an answer, you need to include some way to contact you."
+#~ msgstr ""
+#~ "Prosty formularz kontaktowy, Pamiętaj jednak,\n"
+#~ "że jeśli oczekujesz odpowiedzi, musisz zostawić jakąś formę do kontaktu."
+
+#~ msgid "Twitter"
+#~ msgstr "Twitter"
+
+#~ msgid ""
+#~ "We are also on twitter. Write us and tell us what\n"
+#~ "you think! Except patches, don't send patches via twitter."
+#~ msgstr ""
+#~ "Jesteśmy także na Twitterze.\n"
+#~ "Napisz do nas i powiedz co myślisz! Z wyjątkiem łatek, nie wysyłaj łatek "
+#~ "przez Twittera."
+
+#~ msgid ""
+#~ "Use the public group to get support for your\n"
+#~ "local wger installation, discuss issues or your new idea, etc.\n"
+#~ "(no registration needed)"
+#~ msgstr ""
+#~ "Użyj grupy publicznej by otrzymać wparcie w\n"
+#~ "samodzielnej instalacji wger, problemach bądź realizacji Twoich pomysłów\n"
+#~ "(rejestracja niewymagana)"
+
+#~ msgid "Open feedback form"
+#~ msgstr "Otwórz formularz kontaktowy"
+
+#~ msgid "Contribute!"
+#~ msgstr "Wspomóż!"
+
+#~ msgid "Problems and wishes"
+#~ msgstr "Problemy i życzenia"
+
+#~ msgid "About"
+#~ msgstr "O nas"
+
+#~ msgid ""
+#~ "wger Workout Manager is build by volunteers,\n"
+#~ "the development process is open and freely accessible to anybody "
+#~ "interested.\n"
+#~ "If you are new to the free software world, we recommend to take a\n"
+#~ "look <a href=\"http://schlitt.info/opensource/"
+#~ "blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
+#~ "article</a> which summarizes they way open source projects work very "
+#~ "well. "
+#~ msgstr ""
+#~ "wger jest budowany przez wolontariuszy,\n"
+#~ "proces rozwoju jest otwarty i dostępny dla wszystkich zainteresowanych.\n"
+#~ "Jeżeli jesteś nowy w świecie otwartego oprogramowania, polecamy zapoznać "
+#~ "się z\n"
+#~ "<a href=\"http://schlitt.info/opensource/"
+#~ "blog/0541_10_golden_rules_for_starting_with_open_source.html\">tym\n"
+#~ "artykułem</a>, który podsumowuje jak funkcjonują tego rodzaju projekty. "
+
+#~ msgid ""
+#~ "Any kind of contribution is appreciated and welcome.\n"
+#~ "Use this opportunity and influence the direction of the\n"
+#~ "project. "
+#~ msgstr ""
+#~ "Dziękujemy za wszelki wkład w rozwój.\n"
+#~ "Skorzystaj z tej okazji by wpłynąć na kierunek rozwoju \n"
+#~ "projektu. "
+
+#~ msgid "Use the site"
+#~ msgstr "Korzystaj ze strony"
+
+#~ msgid ""
+#~ "Simply use the site and tell your friends\n"
+#~ "how useful it is! ;) . When you find something that you specially liked,\n"
+#~ "could need some improvements or just doesn't work, tell us! This might "
+#~ "not sound\n"
+#~ "like much, but is incredibly important!"
+#~ msgstr ""
+#~ "Po prostu skorzystaj ze strony i powiedz znajomym\n"
+#~ "jakie to przydatne! ;) . Kiedy znajdziesz coś, co szczególnie Ci się "
+#~ "spodobało,\n"
+#~ "może wymagać pewnych ulepszeń lub po prostu nie działa, powiedz nam! To "
+#~ "może nie brzmieć\n"
+#~ "lubi dużo, ale jest niesamowicie ważny!"
+
+#~ msgid "Submit exercises"
+#~ msgstr "Dodaj ćwiczenia"
+
+#~ msgid ""
+#~ "Submit those cool exercises that you absolutely\n"
+#~ "love and do every week but are not in the list yet. If you think some "
+#~ "description\n"
+#~ "is too short or some other detail is missing or could be improved, tell!"
+#~ msgstr ""
+#~ "Dodaj fajne ćwiczenia, które\n"
+#~ "uwielbiasz i robisz każdego tygodnia, ale których nie znalazłeś jeszcze "
+#~ "na liście. Jeżeli uważasz, że opis któregoś z ćwiczeń\n"
+#~ "jest zbyt krótki, albo czegoś mu brakuje, powiedz!"
+
+#~ msgid ""
+#~ "Do you want to use wger in your own language?\n"
+#~ "Do you think the current translation could be improved?\n"
+#~ "The translations are easily managed and edited online, if you are "
+#~ "interested,\n"
+#~ "visit the link and start translating."
+#~ msgstr ""
+#~ "Chcesz używać wgera w swoim języku ojczystym?\n"
+#~ "Myślisz, że można poprawić obecne tłumaczenie?\n"
+#~ "Tłumaczeniami można łatwo zarządzać i edytować je online, więc jeśli "
+#~ "jesteś zainteresowany,\n"
+#~ "wejdź na stronę transifex, poproś o dostęp, a my ustawimy wszystko dla "
+#~ "Ciebie."
+
+#~ msgid "Code"
+#~ msgstr "Kod"
+
+#~ msgid ""
+#~ "Obviously, you are highly encouraged to clone the\n"
+#~ "repo and start hacking! Once you are ready, send a pull request and we\n"
+#~ "will show the world. Take a look at the developer guide for more details\n"
+#~ "on this."
+#~ msgstr ""
+#~ "Oczywiście, mocno zachęcamy do sklonowania\n"
+#~ "repozytorium i modyfikacji! Gdy tylko uda Ci się coś dodać, wyślij pull "
+#~ "requesta, a my\n"
+#~ "pokażemy go światu. Przeczytaj poradnik programisty, by poznać\n"
+#~ "szczegóły."
+
+#~ msgid "Reporting a problem"
+#~ msgstr "Zgłaszanie problemu"
+
+#~ msgid ""
+#~ "\n"
+#~ "No software is perfect. For some severe errors, an email will be "
+#~ "automatically sent, but\n"
+#~ "not always, so I depend on you reporting everything that didn't behave as "
+#~ "expected.\n"
+#~ "Please describe in as much detail as you can what you were doing when the "
+#~ "error\n"
+#~ "happened.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Nie ma idealnego oprogramowania. Wiele błędów jest raportowanych "
+#~ "automatycznie, ale\n"
+#~ "nie zawsze tak się dzieje, dlatego właśnie liczymy na Ciebie gdy coś nie "
+#~ "zadziała poprawnie. \n"
+#~ "Opisz w szczegółach co jest nie tak, a także co robiłeś gdy pojawił się\n"
+#~ "błąd.\n"
+
+#~ msgid "report problem to the issue tracker"
+#~ msgstr "zaraportuj problem do issue trackera"
+
+#~ msgid "Enhancements"
+#~ msgstr "Usprawnienia"
+
+#~ msgid ""
+#~ "\n"
+#~ "The issue tracker can also be used to document enhancements to the "
+#~ "software.\n"
+#~ "If you have some suggestions or think a feature is missing, feel\n"
+#~ "free to open a ticket. This can be anything from a slight change to a "
+#~ "whole\n"
+#~ "new section of the site. Please keep in mind that not all wishes can be\n"
+#~ "implemented."
+#~ msgstr ""
+#~ "\n"
+#~ "Issue tracker pozwala także na dokumentację ulepszeń oprogramowania.\n"
+#~ "Jeżeli masz jakieś sugestie albo uważasz, że brakuje funkcjonalności, po "
+#~ "prostu\n"
+#~ "stwórz nowy wątek. Może to być cokolwiek, od drobnej zmiany aż do nowej\n"
+#~ "sekcji strony. Pamiętaj, że nie wszystko może zostać\n"
+#~ "zaimplementowane."
+
+#~ msgid "report wish to the issue tracker"
+#~ msgstr "Zaproponuj coś na issue trackerze"
+
+#~ msgid "No Github account?"
+#~ msgstr "Brak konta Github?"
+
+#~ msgid ""
+#~ "Filing an issue requires a github account, if you don't\n"
+#~ "have one and don't want to register, you can also send it to\n"
+#~ "<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
+#~ msgstr ""
+#~ "Dodanie informacji o problemie wymaga konta w serwisie GitHub. Jeżeli go "
+#~ "nie\n"
+#~ "posiadasz i nie chcesz go zakładać, możesz również wysłać informację na\n"
+#~ "<a href=\"https://groups.google.com/group/wger\">grupę dyskusyjną</a>."
+
+#~ msgid ""
+#~ "wger Workout Manager is Free/Libre Open Source\n"
+#~ "Software (FLOSS)."
+#~ msgstr ""
+#~ "wger jest Darmowym i Wolno Źródłowym\n"
+#~ "Oprogramowaniem (FLOSS)."
+
+#~ msgid ""
+#~ "wger Workout Manager is released under the <strong>Affero GNU\n"
+#~ "General Public License (AGPL) Version 3+</strong> and can (under the "
+#~ "conditions\n"
+#~ "of the license) be used, modified and distributed (also with "
+#~ "modifications)\n"
+#~ "without restrictions."
+#~ msgstr ""
+#~ "wger jest publikowany na zasadach <strong>licencji Affero GNU\n"
+#~ "General Public License (AGPS) Wersja 3+</strong> i może (zgodnie z "
+#~ "warunkami\n"
+#~ "licencji) być używany, modyfikowany i dystrybuowany (także z "
+#~ "modyfikacjami)\n"
+#~ "bez żadnych ograniczeń."
+
+#~ msgid ""
+#~ "A copy the license text is contained in every wger Workout\n"
+#~ "Manager release (LICENSE.txt) and can be read online on the website of\n"
+#~ "<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</"
+#~ "a>."
+#~ msgstr ""
+#~ "Kopia treści licencji jest zawarta w każdym wydaniu\n"
+#~ "wgera (LICENSE.txt) i może być przeczytana online na stronie\n"
+#~ "<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>GNU project</a>."
+
#~ msgid "Use pauses in workout timer"
#~ msgstr "Używaj pauz w minutniku treningowym"
diff --git a/wger/locale/pt/LC_MESSAGES/django.po b/wger/locale/pt/LC_MESSAGES/django.po
index e124707ef..a98cdea29 100644
--- a/wger/locale/pt/LC_MESSAGES/django.po
+++ b/wger/locale/pt/LC_MESSAGES/django.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-17 15:00+0200\n"
+"POT-Creation-Date: 2021-08-17 17:23+0200\n"
"PO-Revision-Date: 2021-05-11 09:34+0000\n"
"Last-Translator: ssantos <[email protected]>\n"
"Language-Team: Portuguese <https://hosted.weblate.org/projects/wger/web/pt/"
@@ -49,7 +49,7 @@ msgstr "Exercícios"
msgid "Ingredients"
msgstr "Ingredientes"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:225
+#: config/templates/language/overview.html:4 core/templates/navigation.html:228
msgid "Languages"
msgstr "Idiomas"
@@ -226,8 +226,8 @@ msgstr "Minha agenda de treino bacana"
msgid "Empty placeholder schedule"
msgstr "Agenda espaço reservado vazio"
-#: core/forms.py:61 core/templates/navigation.html:187
-#: core/templates/navigation.html:191 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:190
+#: core/templates/navigation.html:194 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Login"
@@ -304,8 +304,8 @@ msgstr "Senha inválida"
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:187
-#: core/templates/navigation.html:192 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
+#: core/templates/navigation.html:195 core/templates/template.html:150
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -795,96 +795,10 @@ msgstr "Lista de licença"
msgid "Nothing found"
msgstr "Nada encontrado"
-#: core/templates/misc/about.html:4
-msgid "About us"
-msgstr "Sobre nós"
-
-#: core/templates/misc/about.html:8
-msgid "Responsible for the content of this site as per German law §5 TMG:"
-msgstr ""
-"Responsável pelo conteúdo deste site como definido pela Lei Alemã §5 TMG:"
-
-#: core/templates/misc/about.html:16
-msgid "GNUPG-Key:"
-msgstr "GNUPG-Key:"
-
-#: core/templates/misc/contact.html:4 core/templates/navigation.html:153
-#: core/templates/template_features.html:86
-#: software/templates/contribute.html:28
-msgid "Get in touch"
-msgstr "Entre em contato"
-
-#: core/templates/misc/contact.html:10
-#, python-format
-msgid ""
-"Thank you for your interest. Feel free to use any of the\n"
-"ways below to send feedback you have about any aspect of the site. For\n"
-"support, say hi\n"
-"<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
-"a bug, consider doing it through the <a href=\"%(issues)s\">issue tracker</"
-"a>\n"
-"."
-msgstr ""
-
-#: core/templates/misc/contact.html:20
-#, python-format
-msgid ""
-"If you want to further help and improve this project,\n"
-"you might also be interested <a href=\"%(contribute)s\">in contributing</a>."
-msgstr ""
-"Se você quiser ajudar ainda mais este projeto,\n"
-"você provavelmente estará interessado <a href=\"%(contribute)s\">em "
-"contribuir</a>."
-
-#: core/templates/misc/contact.html:29
-msgid "Feedback form"
-msgstr "Formulário de feedback"
-
-#: core/templates/misc/contact.html:30
-msgid ""
-"A simple contact form. Remember that\n"
-"if you want an answer, you need to include some way to contact you."
-msgstr ""
-"Um simples formulário de contato. Lembre-se que\n"
-"se você quiser uma resposta, você precisa incluir algum meio de contactar "
-"você."
-
-#: core/templates/misc/contact.html:35
-msgid "Twitter"
-msgstr "Twitter"
-
-#: core/templates/misc/contact.html:36
-msgid ""
-"We are also on twitter. Write us and tell us what\n"
-"you think! Except patches, don't send patches via twitter."
-msgstr ""
-"Nós estamos no Twitter também. Escreva-nos para contar o quê\n"
-"você achou! Não envie patches pelo Twitter."
-
-#: core/templates/misc/contact.html:42
-msgid "Discord"
-msgstr ""
-
-#: core/templates/misc/contact.html:43
-msgid ""
-"Use the public group to get support for your\n"
-"local wger installation, discuss issues or your new idea, etc.\n"
-"(no registration needed)"
-msgstr ""
-"Use o grupo púbico para obter suporte para sua\n"
-"instalação local do wger, discuta problemas ou suas nova idéias, etc.\n"
-"(não é preciso se cadastrar)"
-
-#: core/templates/misc/contact.html:49
-msgid "Open feedback form"
-msgstr "Formulário de feedback aberto"
-
-#: core/templates/misc/contact.html:53
-msgid "tweet to @wger_project"
-msgstr ""
-
-#: core/templates/misc/contact.html:56
-msgid "Go to the discord server"
+#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/template_features.html:118
+#: core/templates/template_no_context.html:88
+msgid "Imprint"
msgstr ""
#: core/templates/misc/fragments/shariff_modal.html:6
@@ -978,7 +892,7 @@ msgid "Add new exercise"
msgstr "adicionar novo exercício"
#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:223
+#: core/templates/navigation.html:226
msgid "Administration"
msgstr "Administração"
@@ -1045,68 +959,62 @@ msgid "About this software"
msgstr "Sobre este software"
#: core/templates/navigation.html:151 core/templates/template_features.html:83
-#: software/templates/contribute.html:6
-msgid "Contribute!"
-msgstr "Contribua!"
-
-#: core/templates/navigation.html:152
-msgid "Problems and wishes"
-msgstr "Problemas e desejos"
+#: software/templates/about_us.html:5
+msgid "About us"
+msgstr "Sobre nós"
-#: core/templates/navigation.html:155 software/templates/features.html:209
+#: core/templates/navigation.html:153 software/templates/features.html:209
msgid "REST API"
msgstr "API REST"
-#: core/templates/navigation.html:156 software/templates/license.html:7
-#: utils/models.py:40
+#: core/templates/navigation.html:157 utils/models.py:40
msgid "License"
msgstr "Licença"
-#: core/templates/navigation.html:160
+#: core/templates/navigation.html:163
msgid "Developer documentation"
msgstr "Documentação do desenvolvedor"
-#: core/templates/navigation.html:166 software/templates/contribute.html:59
+#: core/templates/navigation.html:169
msgid "Get the code"
msgstr "Obtenha o código fonte"
-#: core/templates/navigation.html:172 core/templates/template.html:193
-#: core/templates/template_features.html:103
-#: software/templates/contribute.html:43 software/templates/contribute.html:50
+#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/template_features.html:100
msgid "Translate"
msgstr "Traduzir"
-#: core/templates/navigation.html:193 core/templates/user/login.html:28
+#: core/templates/navigation.html:196 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Redefinr a senha"
-#: core/templates/navigation.html:206
+#: core/templates/navigation.html:209
msgid "My preferences"
msgstr "Minhas preferências"
-#: core/templates/navigation.html:213
+#: core/templates/navigation.html:216
msgid "Logout"
msgstr "Logout"
-#: core/templates/navigation.html:228
+#: core/templates/navigation.html:231
msgid "Licenses"
msgstr "Licenças"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:234
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Unidades de repetição"
-#: core/templates/navigation.html:234 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Unidade de peso"
-#: core/templates/navigation.html:237 core/templates/user/list.html:4
+#: core/templates/navigation.html:240 core/templates/user/list.html:4
msgid "User list"
msgstr "Lista de utilizadores"
-#: core/templates/navigation.html:238
+#: core/templates/navigation.html:241
msgid "Gyms"
msgstr "Academias"
@@ -1227,18 +1135,12 @@ msgstr ""
msgid "Create some demo entries"
msgstr "Crie alguns registros de demonstração"
-#: core/templates/template.html:201 core/templates/template_features.html:121
-#: core/templates/template_no_context.html:88
-msgid "About"
-msgstr "Sobre"
-
-#: core/templates/template.html:202 core/templates/template_features.html:125
+#: core/templates/template.html:202 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Termos de uso"
#: core/templates/template.html:209 core/templates/template.html:210
-#: software/templates/license.html:18 software/templates/license.html:19
msgid "Released under the Affero GPL"
msgstr "Licenciado usando Affero GPL"
@@ -1599,15 +1501,15 @@ msgstr ""
msgid "Rest day"
msgstr "Dia de descanso"
-#: core/views/misc.py:199
+#: core/views/misc.py:184
msgid "Feedback"
msgstr "Feedback"
-#: core/views/misc.py:218 weight/templates/import_csv_form.html:9
+#: core/views/misc.py:203 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Submeter"
-#: core/views/misc.py:226
+#: core/views/misc.py:211
msgid "Your feedback was successfully sent. Thank you!"
msgstr "O seu feedback foi enviado com sucesso. Obrigado!"
@@ -1781,7 +1683,6 @@ msgstr "nome do exercício"
#: exercises/templates/exercise/overview.html:118
#: exercises/templates/muscles/overview.html:114
#: nutrition/templates/ingredient/overview.html:85
-#: software/templates/contribute.html:39
msgid "Only registered users can do this"
msgstr "Somente utilizadores cadastrados podem fazer isto"
@@ -1994,7 +1895,7 @@ msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246 software/templates/contribute.html:37
+#: exercises/views/exercises.py:246
msgid "Add exercise"
msgstr "Adicionar exercício"
@@ -3760,116 +3661,55 @@ msgstr "Adicionar uma nova unidade de peso"
msgid "Edit a weight unit to ingredient connection"
msgstr "Edite uma unidade de peso para a conecção do ingrediente"
-#: software/templates/contribute.html:9
+#: software/templates/about_us.html:9
msgid ""
-"wger Workout Manager is build by volunteers,\n"
-"the development process is open and freely accessible to anybody "
-"interested.\n"
-"If you are new to the free software world, we recommend to take a\n"
-"look <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
-"article</a> which summarizes they way open source projects work very well. "
-msgstr ""
-"wger Gestor de Treinos é desenvolvido por voluntários,\n"
-"o processo de desenvolvimento é aberto e livremente acessível a qualquer "
-"interessado.\n"
-"Se você é novo ao mundo do software livre, nós recomendamos que você dê uma\n"
-"olhada <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">neste\n"
-"artigo</a> que resume muito bem como os projetos open source trabalham. "
-
-#: software/templates/contribute.html:16
-msgid ""
-"Any kind of contribution is appreciated and welcome.\n"
-"Use this opportunity and influence the direction of the\n"
-"project. "
+"Thank you for using wger! wger is a collaborative open source project, made "
+"by fitness enthusiasts from around the world."
msgstr ""
-"Qualquer tipo de contribução é apreciada e bem-vinda.\n"
-"Use essa oportunidade e influencie a direção do\n"
-"projeto."
-#: software/templates/contribute.html:23
-msgid "Use the site"
-msgstr "Use o site"
+#: software/templates/about_us.html:18
+msgid "Source code"
+msgstr ""
-#: software/templates/contribute.html:24
-msgid ""
-"Simply use the site and tell your friends\n"
-"how useful it is! ;) . When you find something that you specially liked,\n"
-"could need some improvements or just doesn't work, tell us! This might not "
-"sound\n"
-"like much, but is incredibly important!"
-msgstr ""
-"Simplesmente use o site e conte para seus amigos\n"
-"o quão útil ele é! ;) . Quando você encontrar algo que você realmente "
-"gostar,\n"
-"que precise ser melhorado ou somente não funcione, nos conte! Isto pode não "
-"parecer\n"
-"muito, mas é incrívelmente importante!"
-
-#: software/templates/contribute.html:31
-msgid "Submit exercises"
-msgstr "Submeta exercícios"
-
-#: software/templates/contribute.html:32
+#: software/templates/about_us.html:20
+msgid "Get the source code of this application and its server on github"
+msgstr ""
+
+#: software/templates/about_us.html:25
+msgid "Have a problem or idea?"
+msgstr ""
+
+#: software/templates/about_us.html:27
msgid ""
-"Submit those cool exercises that you absolutely\n"
-"love and do every week but are not in the list yet. If you think some "
-"description\n"
-"is too short or some other detail is missing or could be improved, tell!"
-msgstr ""
-"Submete esses exercícios bacanas que você realmente\n"
-"adora e faz toda semana mas ainda não estão na lista. Se você achar que "
-"alguma descrição\n"
-"está muito simples ou está faltando algum detalhes, sinta-se à vontade para "
-"melhorar, nos dizendo a respeito!"
-
-#: software/templates/contribute.html:44
+"Get in touch if something didn't behave as expected or if there is a feature "
+"that you feel is missing."
+msgstr ""
+
+#: software/templates/about_us.html:32
+msgid "Say hi!"
+msgstr ""
+
+#: software/templates/about_us.html:34
+msgid "If you want to chat with us, hop on the Discord server and get in touch"
+msgstr ""
+
+#: software/templates/about_us.html:39
#, fuzzy
-#| msgid ""
-#| "Do you want to use wger in your own language?\n"
-#| "Do you think the current translation could be improved?\n"
-#| "The translations are easily managed and edited online, if you are "
-#| "interested,\n"
-#| "go to the transifex site, request access and we will set everything\n"
-#| "up. "
-msgid ""
-"Do you want to use wger in your own language?\n"
-"Do you think the current translation could be improved?\n"
-"The translations are easily managed and edited online, if you are "
-"interested,\n"
-"visit the link and start translating."
-msgstr ""
-"Você que usar o wger no seu próprio idioma?\n"
-"Você acha que o estado atual da tradução pde ser melhorado?\n"
-"As traduções são fácilmente gerenciados e editadas online, se você estiver "
-"interessado,\n"
-"vá até o site transifex, solicite acesso e nós iremos preparar tudo\n"
-"para você trabalhar."
-
-#: software/templates/contribute.html:53
-msgid "Code"
-msgstr "Código"
-
-#: software/templates/contribute.html:54
+#| msgid "Translate"
+msgid "Translation"
+msgstr "Traduzir"
+
+#: software/templates/about_us.html:41
msgid ""
-"Obviously, you are highly encouraged to clone the\n"
-"repo and start hacking! Once you are ready, send a pull request and we\n"
-"will show the world. Take a look at the developer guide for more details\n"
-"on this."
-msgstr ""
-"Obviamente, você está altamente encorajado à clonar o\n"
-"repositório e começar a hackear! Uma vez que esteja pronto, envie um pull "
-"request e nós\n"
-"iremos mostr-a-lo ao mundo. De uma olhada no guia do desenvolvedor para mais "
-"detalhes\n"
-"sobre isto."
-
-#: software/templates/contribute.html:66
+"This application is translated on weblate. If you also want to help, click "
+"the link and start translating"
+msgstr ""
+
+#: software/templates/about_us.html:50
msgid "Our goal"
msgstr "Noso objetivo"
-#: software/templates/contribute.html:69
+#: software/templates/about_us.html:53
msgid ""
"The goal is to build an awesome\n"
"and flexible fitness manager, along with a comprehensive and complete list "
@@ -4040,107 +3880,6 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr "100%% livre<br>e <br>código aberto"
-#: software/templates/issues.html:6
-msgid "Reporting a problem"
-msgstr "Reportando um problema"
-
-#: software/templates/issues.html:10
-msgid ""
-"\n"
-"No software is perfect. For some severe errors, an email will be "
-"automatically sent, but\n"
-"not always, so I depend on you reporting everything that didn't behave as "
-"expected.\n"
-"Please describe in as much detail as you can what you were doing when the "
-"error\n"
-"happened.\n"
-msgstr ""
-"\n"
-"Nenhum software é perfeito. Para alguns erros graves, um e-mail será "
-"enviado \n"
-"automaticamente, mas nem sempre, então eu dependo que você reporte tudo que "
-"não se comporte da maneira esperada.\n"
-"Por favor, descreva o problema com o máximo de detalhes relevantes possível, "
-"como o que \n"
-"você estava fazendo quando o error ocorreu.\n"
-
-#: software/templates/issues.html:21
-msgid "report problem to the issue tracker"
-msgstr "Reporte problemas no issue tracker"
-
-#: software/templates/issues.html:25
-msgid "Enhancements"
-msgstr "Melhorias"
-
-#: software/templates/issues.html:27
-msgid ""
-"\n"
-"The issue tracker can also be used to document enhancements to the "
-"software.\n"
-"If you have some suggestions or think a feature is missing, feel\n"
-"free to open a ticket. This can be anything from a slight change to a whole\n"
-"new section of the site. Please keep in mind that not all wishes can be\n"
-"implemented."
-msgstr ""
-"\n"
-"O issue tracker pode ser usado também para documentar as melhorias "
-"desejadas.\n"
-"Se você tiver alguma sugestão ou estiver achando que alguma \n"
-"funcionalidade está faltando, sinta-se à vontade para abrir um chamado. Pode "
-"ser \n"
-"qualquer coisas desde uma pequena mudança até uma nova seção no site. Por "
-"favor,\n"
-"tenha em mente que nem todos os desejos serão implementados."
-
-#: software/templates/issues.html:36
-msgid "report wish to the issue tracker"
-msgstr "Reporte sugestões para o issue tracker"
-
-#: software/templates/issues.html:41
-msgid "No Github account?"
-msgstr "Não possui conta no github?"
-
-#: software/templates/issues.html:42
-msgid ""
-"Filing an issue requires a github account, if you don't\n"
-"have one and don't want to register, you can also send it to\n"
-"<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
-msgstr ""
-"Informando uma issue requer uma conta no github, caso você\n"
-"não possua e não queira cadastrar-se, você pode enviá-la para \n"
-"<a href=\"https://groups.google.com/group/wger\">a lista de discução</a>."
-
-#: software/templates/license.html:10
-msgid ""
-"wger Workout Manager is Free/Libre Open Source\n"
-"Software (FLOSS)."
-msgstr "wger Gestor de Treinos é um software Free/Libre Open Source (FLOSS)."
-
-#: software/templates/license.html:22
-msgid ""
-"wger Workout Manager is released under the <strong>Affero GNU\n"
-"General Public License (AGPL) Version 3+</strong> and can (under the "
-"conditions\n"
-"of the license) be used, modified and distributed (also with modifications)\n"
-"without restrictions."
-msgstr ""
-"wger Gestor de Treinos é lançado sob a licença <strong>Affero GNU\n"
-"General Public License (AGPL) versão 3+</strong> e pode (sob certas "
-"condições\n"
-"da licença) ser usado, modificado e distribuido (juntamente com as "
-"modificações)\n"
-"sem restrições."
-
-#: software/templates/license.html:29
-msgid ""
-"A copy the license text is contained in every wger Workout\n"
-"Manager release (LICENSE.txt) and can be read online on the website of\n"
-"<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</a>."
-msgstr ""
-"Uma cópia do texto da licença está em cada versão do wger Gestor de "
-"Exercícios (LICENSE.txt) e pode ser lida online no website do <a "
-"href='https://www.gnu.org/licenses/agpl-3.0.pt-br.html'>projeto GNU</a>."
-
#: utils/generic_views.py:261
msgid "Yes, delete"
msgstr "Sim, apagar"
@@ -4333,6 +4072,259 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Responsible for the content of this site as per German law §5 TMG:"
+#~ msgstr ""
+#~ "Responsável pelo conteúdo deste site como definido pela Lei Alemã §5 TMG:"
+
+#~ msgid "GNUPG-Key:"
+#~ msgstr "GNUPG-Key:"
+
+#~ msgid "Get in touch"
+#~ msgstr "Entre em contato"
+
+#~ msgid ""
+#~ "If you want to further help and improve this project,\n"
+#~ "you might also be interested <a href=\"%(contribute)s\">in contributing</"
+#~ "a>."
+#~ msgstr ""
+#~ "Se você quiser ajudar ainda mais este projeto,\n"
+#~ "você provavelmente estará interessado <a href=\"%(contribute)s\">em "
+#~ "contribuir</a>."
+
+#~ msgid "Feedback form"
+#~ msgstr "Formulário de feedback"
+
+#~ msgid ""
+#~ "A simple contact form. Remember that\n"
+#~ "if you want an answer, you need to include some way to contact you."
+#~ msgstr ""
+#~ "Um simples formulário de contato. Lembre-se que\n"
+#~ "se você quiser uma resposta, você precisa incluir algum meio de contactar "
+#~ "você."
+
+#~ msgid "Twitter"
+#~ msgstr "Twitter"
+
+#~ msgid ""
+#~ "We are also on twitter. Write us and tell us what\n"
+#~ "you think! Except patches, don't send patches via twitter."
+#~ msgstr ""
+#~ "Nós estamos no Twitter também. Escreva-nos para contar o quê\n"
+#~ "você achou! Não envie patches pelo Twitter."
+
+#~ msgid ""
+#~ "Use the public group to get support for your\n"
+#~ "local wger installation, discuss issues or your new idea, etc.\n"
+#~ "(no registration needed)"
+#~ msgstr ""
+#~ "Use o grupo púbico para obter suporte para sua\n"
+#~ "instalação local do wger, discuta problemas ou suas nova idéias, etc.\n"
+#~ "(não é preciso se cadastrar)"
+
+#~ msgid "Open feedback form"
+#~ msgstr "Formulário de feedback aberto"
+
+#~ msgid "Contribute!"
+#~ msgstr "Contribua!"
+
+#~ msgid "Problems and wishes"
+#~ msgstr "Problemas e desejos"
+
+#~ msgid "About"
+#~ msgstr "Sobre"
+
+#~ msgid ""
+#~ "wger Workout Manager is build by volunteers,\n"
+#~ "the development process is open and freely accessible to anybody "
+#~ "interested.\n"
+#~ "If you are new to the free software world, we recommend to take a\n"
+#~ "look <a href=\"http://schlitt.info/opensource/"
+#~ "blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
+#~ "article</a> which summarizes they way open source projects work very "
+#~ "well. "
+#~ msgstr ""
+#~ "wger Gestor de Treinos é desenvolvido por voluntários,\n"
+#~ "o processo de desenvolvimento é aberto e livremente acessível a qualquer "
+#~ "interessado.\n"
+#~ "Se você é novo ao mundo do software livre, nós recomendamos que você dê "
+#~ "uma\n"
+#~ "olhada <a href=\"http://schlitt.info/opensource/"
+#~ "blog/0541_10_golden_rules_for_starting_with_open_source.html\">neste\n"
+#~ "artigo</a> que resume muito bem como os projetos open source trabalham. "
+
+#~ msgid ""
+#~ "Any kind of contribution is appreciated and welcome.\n"
+#~ "Use this opportunity and influence the direction of the\n"
+#~ "project. "
+#~ msgstr ""
+#~ "Qualquer tipo de contribução é apreciada e bem-vinda.\n"
+#~ "Use essa oportunidade e influencie a direção do\n"
+#~ "projeto."
+
+#~ msgid "Use the site"
+#~ msgstr "Use o site"
+
+#~ msgid ""
+#~ "Simply use the site and tell your friends\n"
+#~ "how useful it is! ;) . When you find something that you specially liked,\n"
+#~ "could need some improvements or just doesn't work, tell us! This might "
+#~ "not sound\n"
+#~ "like much, but is incredibly important!"
+#~ msgstr ""
+#~ "Simplesmente use o site e conte para seus amigos\n"
+#~ "o quão útil ele é! ;) . Quando você encontrar algo que você realmente "
+#~ "gostar,\n"
+#~ "que precise ser melhorado ou somente não funcione, nos conte! Isto pode "
+#~ "não parecer\n"
+#~ "muito, mas é incrívelmente importante!"
+
+#~ msgid "Submit exercises"
+#~ msgstr "Submeta exercícios"
+
+#~ msgid ""
+#~ "Submit those cool exercises that you absolutely\n"
+#~ "love and do every week but are not in the list yet. If you think some "
+#~ "description\n"
+#~ "is too short or some other detail is missing or could be improved, tell!"
+#~ msgstr ""
+#~ "Submete esses exercícios bacanas que você realmente\n"
+#~ "adora e faz toda semana mas ainda não estão na lista. Se você achar que "
+#~ "alguma descrição\n"
+#~ "está muito simples ou está faltando algum detalhes, sinta-se à vontade "
+#~ "para melhorar, nos dizendo a respeito!"
+
+#, fuzzy
+#~| msgid ""
+#~| "Do you want to use wger in your own language?\n"
+#~| "Do you think the current translation could be improved?\n"
+#~| "The translations are easily managed and edited online, if you are "
+#~| "interested,\n"
+#~| "go to the transifex site, request access and we will set everything\n"
+#~| "up. "
+#~ msgid ""
+#~ "Do you want to use wger in your own language?\n"
+#~ "Do you think the current translation could be improved?\n"
+#~ "The translations are easily managed and edited online, if you are "
+#~ "interested,\n"
+#~ "visit the link and start translating."
+#~ msgstr ""
+#~ "Você que usar o wger no seu próprio idioma?\n"
+#~ "Você acha que o estado atual da tradução pde ser melhorado?\n"
+#~ "As traduções são fácilmente gerenciados e editadas online, se você "
+#~ "estiver interessado,\n"
+#~ "vá até o site transifex, solicite acesso e nós iremos preparar tudo\n"
+#~ "para você trabalhar."
+
+#~ msgid "Code"
+#~ msgstr "Código"
+
+#~ msgid ""
+#~ "Obviously, you are highly encouraged to clone the\n"
+#~ "repo and start hacking! Once you are ready, send a pull request and we\n"
+#~ "will show the world. Take a look at the developer guide for more details\n"
+#~ "on this."
+#~ msgstr ""
+#~ "Obviamente, você está altamente encorajado à clonar o\n"
+#~ "repositório e começar a hackear! Uma vez que esteja pronto, envie um pull "
+#~ "request e nós\n"
+#~ "iremos mostr-a-lo ao mundo. De uma olhada no guia do desenvolvedor para "
+#~ "mais detalhes\n"
+#~ "sobre isto."
+
+#~ msgid "Reporting a problem"
+#~ msgstr "Reportando um problema"
+
+#~ msgid ""
+#~ "\n"
+#~ "No software is perfect. For some severe errors, an email will be "
+#~ "automatically sent, but\n"
+#~ "not always, so I depend on you reporting everything that didn't behave as "
+#~ "expected.\n"
+#~ "Please describe in as much detail as you can what you were doing when the "
+#~ "error\n"
+#~ "happened.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Nenhum software é perfeito. Para alguns erros graves, um e-mail será "
+#~ "enviado \n"
+#~ "automaticamente, mas nem sempre, então eu dependo que você reporte tudo "
+#~ "que não se comporte da maneira esperada.\n"
+#~ "Por favor, descreva o problema com o máximo de detalhes relevantes "
+#~ "possível, como o que \n"
+#~ "você estava fazendo quando o error ocorreu.\n"
+
+#~ msgid "report problem to the issue tracker"
+#~ msgstr "Reporte problemas no issue tracker"
+
+#~ msgid "Enhancements"
+#~ msgstr "Melhorias"
+
+#~ msgid ""
+#~ "\n"
+#~ "The issue tracker can also be used to document enhancements to the "
+#~ "software.\n"
+#~ "If you have some suggestions or think a feature is missing, feel\n"
+#~ "free to open a ticket. This can be anything from a slight change to a "
+#~ "whole\n"
+#~ "new section of the site. Please keep in mind that not all wishes can be\n"
+#~ "implemented."
+#~ msgstr ""
+#~ "\n"
+#~ "O issue tracker pode ser usado também para documentar as melhorias "
+#~ "desejadas.\n"
+#~ "Se você tiver alguma sugestão ou estiver achando que alguma \n"
+#~ "funcionalidade está faltando, sinta-se à vontade para abrir um chamado. "
+#~ "Pode ser \n"
+#~ "qualquer coisas desde uma pequena mudança até uma nova seção no site. Por "
+#~ "favor,\n"
+#~ "tenha em mente que nem todos os desejos serão implementados."
+
+#~ msgid "report wish to the issue tracker"
+#~ msgstr "Reporte sugestões para o issue tracker"
+
+#~ msgid "No Github account?"
+#~ msgstr "Não possui conta no github?"
+
+#~ msgid ""
+#~ "Filing an issue requires a github account, if you don't\n"
+#~ "have one and don't want to register, you can also send it to\n"
+#~ "<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
+#~ msgstr ""
+#~ "Informando uma issue requer uma conta no github, caso você\n"
+#~ "não possua e não queira cadastrar-se, você pode enviá-la para \n"
+#~ "<a href=\"https://groups.google.com/group/wger\">a lista de discução</a>."
+
+#~ msgid ""
+#~ "wger Workout Manager is Free/Libre Open Source\n"
+#~ "Software (FLOSS)."
+#~ msgstr ""
+#~ "wger Gestor de Treinos é um software Free/Libre Open Source (FLOSS)."
+
+#~ msgid ""
+#~ "wger Workout Manager is released under the <strong>Affero GNU\n"
+#~ "General Public License (AGPL) Version 3+</strong> and can (under the "
+#~ "conditions\n"
+#~ "of the license) be used, modified and distributed (also with "
+#~ "modifications)\n"
+#~ "without restrictions."
+#~ msgstr ""
+#~ "wger Gestor de Treinos é lançado sob a licença <strong>Affero GNU\n"
+#~ "General Public License (AGPL) versão 3+</strong> e pode (sob certas "
+#~ "condições\n"
+#~ "da licença) ser usado, modificado e distribuido (juntamente com as "
+#~ "modificações)\n"
+#~ "sem restrições."
+
+#~ msgid ""
+#~ "A copy the license text is contained in every wger Workout\n"
+#~ "Manager release (LICENSE.txt) and can be read online on the website of\n"
+#~ "<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</"
+#~ "a>."
+#~ msgstr ""
+#~ "Uma cópia do texto da licença está em cada versão do wger Gestor de "
+#~ "Exercícios (LICENSE.txt) e pode ser lida online no website do <a "
+#~ "href='https://www.gnu.org/licenses/agpl-3.0.pt-br.html'>projeto GNU</a>."
+
#~ msgid "Use pauses in workout timer"
#~ msgstr "Usar pausa no cronômetro de treino"
diff --git a/wger/locale/ro/LC_MESSAGES/django.po b/wger/locale/ro/LC_MESSAGES/django.po
index a590f8138..b09c2edcb 100644
--- a/wger/locale/ro/LC_MESSAGES/django.po
+++ b/wger/locale/ro/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-17 15:00+0200\n"
+"POT-Creation-Date: 2021-08-17 17:23+0200\n"
"PO-Revision-Date: 2021-04-15 07:27+0000\n"
"Last-Translator: Allan Nordhøy <[email protected]>\n"
"Language-Team: Romanian <https://hosted.weblate.org/projects/wger/web/ro/>\n"
@@ -43,7 +43,7 @@ msgstr "Exerciții"
msgid "Ingredients"
msgstr "Ingrediente"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:225
+#: config/templates/language/overview.html:4 core/templates/navigation.html:228
msgid "Languages"
msgstr "Limbi"
@@ -215,8 +215,8 @@ msgstr ""
msgid "Empty placeholder schedule"
msgstr ""
-#: core/forms.py:61 core/templates/navigation.html:187
-#: core/templates/navigation.html:191 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:190
+#: core/templates/navigation.html:194 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr ""
@@ -297,8 +297,8 @@ msgstr "Parola incorectă"
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:187
-#: core/templates/navigation.html:192 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
+#: core/templates/navigation.html:195 core/templates/template.html:150
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -777,84 +777,10 @@ msgstr ""
msgid "Nothing found"
msgstr ""
-#: core/templates/misc/about.html:4
-msgid "About us"
-msgstr ""
-
-#: core/templates/misc/about.html:8
-msgid "Responsible for the content of this site as per German law §5 TMG:"
-msgstr ""
-
-#: core/templates/misc/about.html:16
-msgid "GNUPG-Key:"
-msgstr ""
-
-#: core/templates/misc/contact.html:4 core/templates/navigation.html:153
-#: core/templates/template_features.html:86
-#: software/templates/contribute.html:28
-msgid "Get in touch"
-msgstr ""
-
-#: core/templates/misc/contact.html:10
-#, python-format
-msgid ""
-"Thank you for your interest. Feel free to use any of the\n"
-"ways below to send feedback you have about any aspect of the site. For\n"
-"support, say hi\n"
-"<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
-"a bug, consider doing it through the <a href=\"%(issues)s\">issue tracker</"
-"a>\n"
-"."
-msgstr ""
-
-#: core/templates/misc/contact.html:20
-#, python-format
-msgid ""
-"If you want to further help and improve this project,\n"
-"you might also be interested <a href=\"%(contribute)s\">in contributing</a>."
-msgstr ""
-
-#: core/templates/misc/contact.html:29
-msgid "Feedback form"
-msgstr ""
-
-#: core/templates/misc/contact.html:30
-msgid ""
-"A simple contact form. Remember that\n"
-"if you want an answer, you need to include some way to contact you."
-msgstr ""
-
-#: core/templates/misc/contact.html:35
-msgid "Twitter"
-msgstr "Twitter"
-
-#: core/templates/misc/contact.html:36
-msgid ""
-"We are also on twitter. Write us and tell us what\n"
-"you think! Except patches, don't send patches via twitter."
-msgstr ""
-
-#: core/templates/misc/contact.html:42
-msgid "Discord"
-msgstr ""
-
-#: core/templates/misc/contact.html:43
-msgid ""
-"Use the public group to get support for your\n"
-"local wger installation, discuss issues or your new idea, etc.\n"
-"(no registration needed)"
-msgstr ""
-
-#: core/templates/misc/contact.html:49
-msgid "Open feedback form"
-msgstr ""
-
-#: core/templates/misc/contact.html:53
-msgid "tweet to @wger_project"
-msgstr ""
-
-#: core/templates/misc/contact.html:56
-msgid "Go to the discord server"
+#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/template_features.html:118
+#: core/templates/template_no_context.html:88
+msgid "Imprint"
msgstr ""
#: core/templates/misc/fragments/shariff_modal.html:6
@@ -942,7 +868,7 @@ msgid "Add new exercise"
msgstr "Adăugați un exercițiu nou"
#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:223
+#: core/templates/navigation.html:226
msgid "Administration"
msgstr "Administrație"
@@ -1009,68 +935,62 @@ msgid "About this software"
msgstr ""
#: core/templates/navigation.html:151 core/templates/template_features.html:83
-#: software/templates/contribute.html:6
-msgid "Contribute!"
-msgstr ""
-
-#: core/templates/navigation.html:152
-msgid "Problems and wishes"
+#: software/templates/about_us.html:5
+msgid "About us"
msgstr ""
-#: core/templates/navigation.html:155 software/templates/features.html:209
+#: core/templates/navigation.html:153 software/templates/features.html:209
msgid "REST API"
msgstr ""
-#: core/templates/navigation.html:156 software/templates/license.html:7
-#: utils/models.py:40
+#: core/templates/navigation.html:157 utils/models.py:40
msgid "License"
msgstr ""
-#: core/templates/navigation.html:160
+#: core/templates/navigation.html:163
msgid "Developer documentation"
msgstr ""
-#: core/templates/navigation.html:166 software/templates/contribute.html:59
+#: core/templates/navigation.html:169
msgid "Get the code"
msgstr ""
-#: core/templates/navigation.html:172 core/templates/template.html:193
-#: core/templates/template_features.html:103
-#: software/templates/contribute.html:43 software/templates/contribute.html:50
+#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/template_features.html:100
msgid "Translate"
msgstr ""
-#: core/templates/navigation.html:193 core/templates/user/login.html:28
+#: core/templates/navigation.html:196 core/templates/user/login.html:28
msgid "Reset password"
msgstr ""
-#: core/templates/navigation.html:206
+#: core/templates/navigation.html:209
msgid "My preferences"
msgstr ""
-#: core/templates/navigation.html:213
+#: core/templates/navigation.html:216
msgid "Logout"
msgstr ""
-#: core/templates/navigation.html:228
+#: core/templates/navigation.html:231
msgid "Licenses"
msgstr ""
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:234
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr ""
-#: core/templates/navigation.html:234 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr ""
-#: core/templates/navigation.html:237 core/templates/user/list.html:4
+#: core/templates/navigation.html:240 core/templates/user/list.html:4
msgid "User list"
msgstr ""
-#: core/templates/navigation.html:238
+#: core/templates/navigation.html:241
msgid "Gyms"
msgstr ""
@@ -1186,18 +1106,12 @@ msgstr ""
msgid "Create some demo entries"
msgstr ""
-#: core/templates/template.html:201 core/templates/template_features.html:121
-#: core/templates/template_no_context.html:88
-msgid "About"
-msgstr ""
-
-#: core/templates/template.html:202 core/templates/template_features.html:125
+#: core/templates/template.html:202 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr ""
#: core/templates/template.html:209 core/templates/template.html:210
-#: software/templates/license.html:18 software/templates/license.html:19
msgid "Released under the Affero GPL"
msgstr ""
@@ -1545,15 +1459,15 @@ msgstr ""
msgid "Rest day"
msgstr ""
-#: core/views/misc.py:199
+#: core/views/misc.py:184
msgid "Feedback"
msgstr ""
-#: core/views/misc.py:218 weight/templates/import_csv_form.html:9
+#: core/views/misc.py:203 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr ""
-#: core/views/misc.py:226
+#: core/views/misc.py:211
msgid "Your feedback was successfully sent. Thank you!"
msgstr ""
@@ -1722,7 +1636,6 @@ msgstr "numele exercițiului"
#: exercises/templates/exercise/overview.html:118
#: exercises/templates/muscles/overview.html:114
#: nutrition/templates/ingredient/overview.html:85
-#: software/templates/contribute.html:39
msgid "Only registered users can do this"
msgstr ""
@@ -1919,7 +1832,7 @@ msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246 software/templates/contribute.html:37
+#: exercises/views/exercises.py:246
msgid "Add exercise"
msgstr ""
@@ -3553,75 +3466,53 @@ msgstr ""
msgid "Edit a weight unit to ingredient connection"
msgstr ""
-#: software/templates/contribute.html:9
+#: software/templates/about_us.html:9
msgid ""
-"wger Workout Manager is build by volunteers,\n"
-"the development process is open and freely accessible to anybody "
-"interested.\n"
-"If you are new to the free software world, we recommend to take a\n"
-"look <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
-"article</a> which summarizes they way open source projects work very well. "
+"Thank you for using wger! wger is a collaborative open source project, made "
+"by fitness enthusiasts from around the world."
msgstr ""
-#: software/templates/contribute.html:16
-msgid ""
-"Any kind of contribution is appreciated and welcome.\n"
-"Use this opportunity and influence the direction of the\n"
-"project. "
+#: software/templates/about_us.html:18
+msgid "Source code"
msgstr ""
-#: software/templates/contribute.html:23
-msgid "Use the site"
+#: software/templates/about_us.html:20
+msgid "Get the source code of this application and its server on github"
msgstr ""
-#: software/templates/contribute.html:24
-msgid ""
-"Simply use the site and tell your friends\n"
-"how useful it is! ;) . When you find something that you specially liked,\n"
-"could need some improvements or just doesn't work, tell us! This might not "
-"sound\n"
-"like much, but is incredibly important!"
+#: software/templates/about_us.html:25
+msgid "Have a problem or idea?"
msgstr ""
-#: software/templates/contribute.html:31
-msgid "Submit exercises"
+#: software/templates/about_us.html:27
+msgid ""
+"Get in touch if something didn't behave as expected or if there is a feature "
+"that you feel is missing."
msgstr ""
-#: software/templates/contribute.html:32
-msgid ""
-"Submit those cool exercises that you absolutely\n"
-"love and do every week but are not in the list yet. If you think some "
-"description\n"
-"is too short or some other detail is missing or could be improved, tell!"
+#: software/templates/about_us.html:32
+msgid "Say hi!"
msgstr ""
-#: software/templates/contribute.html:44
-msgid ""
-"Do you want to use wger in your own language?\n"
-"Do you think the current translation could be improved?\n"
-"The translations are easily managed and edited online, if you are "
-"interested,\n"
-"visit the link and start translating."
+#: software/templates/about_us.html:34
+msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
-#: software/templates/contribute.html:53
-msgid "Code"
+#: software/templates/about_us.html:39
+msgid "Translation"
msgstr ""
-#: software/templates/contribute.html:54
+#: software/templates/about_us.html:41
msgid ""
-"Obviously, you are highly encouraged to clone the\n"
-"repo and start hacking! Once you are ready, send a pull request and we\n"
-"will show the world. Take a look at the developer guide for more details\n"
-"on this."
+"This application is translated on weblate. If you also want to help, click "
+"the link and start translating"
msgstr ""
-#: software/templates/contribute.html:66
+#: software/templates/about_us.html:50
msgid "Our goal"
msgstr ""
-#: software/templates/contribute.html:69
+#: software/templates/about_us.html:53
msgid ""
"The goal is to build an awesome\n"
"and flexible fitness manager, along with a comprehensive and complete list "
@@ -3756,78 +3647,6 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr ""
-#: software/templates/issues.html:6
-msgid "Reporting a problem"
-msgstr ""
-
-#: software/templates/issues.html:10
-msgid ""
-"\n"
-"No software is perfect. For some severe errors, an email will be "
-"automatically sent, but\n"
-"not always, so I depend on you reporting everything that didn't behave as "
-"expected.\n"
-"Please describe in as much detail as you can what you were doing when the "
-"error\n"
-"happened.\n"
-msgstr ""
-
-#: software/templates/issues.html:21
-msgid "report problem to the issue tracker"
-msgstr ""
-
-#: software/templates/issues.html:25
-msgid "Enhancements"
-msgstr ""
-
-#: software/templates/issues.html:27
-msgid ""
-"\n"
-"The issue tracker can also be used to document enhancements to the "
-"software.\n"
-"If you have some suggestions or think a feature is missing, feel\n"
-"free to open a ticket. This can be anything from a slight change to a whole\n"
-"new section of the site. Please keep in mind that not all wishes can be\n"
-"implemented."
-msgstr ""
-
-#: software/templates/issues.html:36
-msgid "report wish to the issue tracker"
-msgstr ""
-
-#: software/templates/issues.html:41
-msgid "No Github account?"
-msgstr ""
-
-#: software/templates/issues.html:42
-msgid ""
-"Filing an issue requires a github account, if you don't\n"
-"have one and don't want to register, you can also send it to\n"
-"<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
-msgstr ""
-
-#: software/templates/license.html:10
-msgid ""
-"wger Workout Manager is Free/Libre Open Source\n"
-"Software (FLOSS)."
-msgstr ""
-
-#: software/templates/license.html:22
-msgid ""
-"wger Workout Manager is released under the <strong>Affero GNU\n"
-"General Public License (AGPL) Version 3+</strong> and can (under the "
-"conditions\n"
-"of the license) be used, modified and distributed (also with modifications)\n"
-"without restrictions."
-msgstr ""
-
-#: software/templates/license.html:29
-msgid ""
-"A copy the license text is contained in every wger Workout\n"
-"Manager release (LICENSE.txt) and can be read online on the website of\n"
-"<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</a>."
-msgstr ""
-
#: utils/generic_views.py:261
msgid "Yes, delete"
msgstr ""
@@ -3993,6 +3812,9 @@ msgstr "Șters cu succes."
msgid "Delete weight entry for the %s"
msgstr "Ștergeți greutatea pentru %s"
+#~ msgid "Twitter"
+#~ msgstr "Twitter"
+
#~ msgid "There is no chart here because there are no weight entries."
#~ msgstr ""
#~ "Nu există o diagramă aici, deoarece nu există înregistrări de greutate."
diff --git a/wger/locale/ru/LC_MESSAGES/django.po b/wger/locale/ru/LC_MESSAGES/django.po
index d2c696bb1..fd45e6cb6 100644
--- a/wger/locale/ru/LC_MESSAGES/django.po
+++ b/wger/locale/ru/LC_MESSAGES/django.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-17 15:00+0200\n"
+"POT-Creation-Date: 2021-08-17 17:23+0200\n"
"PO-Revision-Date: 2021-07-24 23:33+0000\n"
"Last-Translator: Ryeori <[email protected]>\n"
"Language-Team: Russian <https://hosted.weblate.org/projects/wger/web/ru/>\n"
@@ -50,7 +50,7 @@ msgstr "Упражнения"
msgid "Ingredients"
msgstr "Ингредиенты"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:225
+#: config/templates/language/overview.html:4 core/templates/navigation.html:228
msgid "Languages"
msgstr "Языки"
@@ -226,8 +226,8 @@ msgstr "Моя прикольная программа тренировки"
msgid "Empty placeholder schedule"
msgstr "Пустая программа-«заполнитель»"
-#: core/forms.py:61 core/templates/navigation.html:187
-#: core/templates/navigation.html:191 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:190
+#: core/templates/navigation.html:194 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Войти"
@@ -304,8 +304,8 @@ msgstr "Неверный пароль"
msgid "The form is secured with reCAPTCHA"
msgstr "Данная форма защищена reCAPTCHA"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:187
-#: core/templates/navigation.html:192 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
+#: core/templates/navigation.html:195 core/templates/template.html:150
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -795,97 +795,12 @@ msgstr "Список лицензий"
msgid "Nothing found"
msgstr "Ничего не найдено"
-#: core/templates/misc/about.html:4
-msgid "About us"
-msgstr "О нас"
-
-#: core/templates/misc/about.html:8
-msgid "Responsible for the content of this site as per German law §5 TMG:"
-msgstr ""
-"Ответственный за содержимое этой страницы, соответственно немецкому праву §5 "
-"TMG:"
-
-#: core/templates/misc/about.html:16
-msgid "GNUPG-Key:"
-msgstr "GNUPG-Ключ:"
-
-#: core/templates/misc/contact.html:4 core/templates/navigation.html:153
-#: core/templates/template_features.html:86
-#: software/templates/contribute.html:28
-msgid "Get in touch"
-msgstr "Написать нам"
-
-#: core/templates/misc/contact.html:10
-#, python-format
-msgid ""
-"Thank you for your interest. Feel free to use any of the\n"
-"ways below to send feedback you have about any aspect of the site. For\n"
-"support, say hi\n"
-"<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
-"a bug, consider doing it through the <a href=\"%(issues)s\">issue tracker</"
-"a>\n"
-"."
-msgstr ""
-
-#: core/templates/misc/contact.html:20
-#, python-format
-msgid ""
-"If you want to further help and improve this project,\n"
-"you might also be interested <a href=\"%(contribute)s\">in contributing</a>."
-msgstr ""
-"Если Вы желаете дальше помогать и улучшать этот проект,\n"
-"Вас может также заинтересовать <a href=\"%(contribute)s\">в содействии</a>."
-
-#: core/templates/misc/contact.html:29
-msgid "Feedback form"
-msgstr "Форма отзыва"
-
-#: core/templates/misc/contact.html:30
-msgid ""
-"A simple contact form. Remember that\n"
-"if you want an answer, you need to include some way to contact you."
-msgstr ""
-"Простая форма отзыва. Не забудьте оставить обратный контакт, если Вы желаете "
-"получить ответ."
-
-#: core/templates/misc/contact.html:35
-msgid "Twitter"
-msgstr "Твиттер"
-
-#: core/templates/misc/contact.html:36
-msgid ""
-"We are also on twitter. Write us and tell us what\n"
-"you think! Except patches, don't send patches via twitter."
-msgstr ""
-"Мы также в твиттере. Напишите нам и сообщите, что Вы думаете! Кроме патчей, "
-"не высылайте патчи через Твиттер."
-
-#: core/templates/misc/contact.html:42
-msgid "Discord"
-msgstr ""
-
-#: core/templates/misc/contact.html:43
-msgid ""
-"Use the public group to get support for your\n"
-"local wger installation, discuss issues or your new idea, etc.\n"
-"(no registration needed)"
-msgstr ""
-"Воспользуйтесь общественной группой, чтобы получить поддержку для Вашей "
-"локальной wger установки, обговорить проблемы или Вашу новую идею, и т.п.\n"
-"(нет необходимости в регистрации)"
-
-#: core/templates/misc/contact.html:49
-msgid "Open feedback form"
-msgstr "Открытая форма отзыва"
-
-#: core/templates/misc/contact.html:53
-msgid "tweet to @wger_project"
+#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/template_features.html:118
+#: core/templates/template_no_context.html:88
+msgid "Imprint"
msgstr ""
-#: core/templates/misc/contact.html:56
-msgid "Go to the discord server"
-msgstr "Перейти в Discord сервер"
-
#: core/templates/misc/fragments/shariff_modal.html:6
msgid "Share this page"
msgstr "Поделиться этой страницей"
@@ -976,7 +891,7 @@ msgid "Add new exercise"
msgstr "Добавить новое упражнение"
#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:223
+#: core/templates/navigation.html:226
msgid "Administration"
msgstr "Администрация"
@@ -1043,68 +958,62 @@ msgid "About this software"
msgstr "Об этой программе"
#: core/templates/navigation.html:151 core/templates/template_features.html:83
-#: software/templates/contribute.html:6
-msgid "Contribute!"
-msgstr "Способствуйте!"
-
-#: core/templates/navigation.html:152
-msgid "Problems and wishes"
-msgstr "Проблемы и пожелания"
+#: software/templates/about_us.html:5
+msgid "About us"
+msgstr "О нас"
-#: core/templates/navigation.html:155 software/templates/features.html:209
+#: core/templates/navigation.html:153 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:156 software/templates/license.html:7
-#: utils/models.py:40
+#: core/templates/navigation.html:157 utils/models.py:40
msgid "License"
msgstr "Лицензия"
-#: core/templates/navigation.html:160
+#: core/templates/navigation.html:163
msgid "Developer documentation"
msgstr "Документация для разработчиков"
-#: core/templates/navigation.html:166 software/templates/contribute.html:59
+#: core/templates/navigation.html:169
msgid "Get the code"
msgstr "Получить код"
-#: core/templates/navigation.html:172 core/templates/template.html:193
-#: core/templates/template_features.html:103
-#: software/templates/contribute.html:43 software/templates/contribute.html:50
+#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/template_features.html:100
msgid "Translate"
msgstr "Перевести"
-#: core/templates/navigation.html:193 core/templates/user/login.html:28
+#: core/templates/navigation.html:196 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Восстановить пароль"
-#: core/templates/navigation.html:206
+#: core/templates/navigation.html:209
msgid "My preferences"
msgstr "Мои настройки"
-#: core/templates/navigation.html:213
+#: core/templates/navigation.html:216
msgid "Logout"
msgstr "Выйти"
-#: core/templates/navigation.html:228
+#: core/templates/navigation.html:231
msgid "Licenses"
msgstr "Лицензии"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:234
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Единицы повторения"
-#: core/templates/navigation.html:234 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Единицы веса"
-#: core/templates/navigation.html:237 core/templates/user/list.html:4
+#: core/templates/navigation.html:240 core/templates/user/list.html:4
msgid "User list"
msgstr "Список пользователей"
-#: core/templates/navigation.html:238
+#: core/templates/navigation.html:241
msgid "Gyms"
msgstr "Тренажерные залы"
@@ -1224,18 +1133,12 @@ msgstr ""
msgid "Create some demo entries"
msgstr "Создайте демо-записи"
-#: core/templates/template.html:201 core/templates/template_features.html:121
-#: core/templates/template_no_context.html:88
-msgid "About"
-msgstr "О"
-
-#: core/templates/template.html:202 core/templates/template_features.html:125
+#: core/templates/template.html:202 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Условия обслуживания"
#: core/templates/template.html:209 core/templates/template.html:210
-#: software/templates/license.html:18 software/templates/license.html:19
msgid "Released under the Affero GPL"
msgstr "Выпущено под Affero GPL"
@@ -1597,15 +1500,15 @@ msgstr ""
msgid "Rest day"
msgstr "Выходной день"
-#: core/views/misc.py:199
+#: core/views/misc.py:184
msgid "Feedback"
msgstr "Отзывы"
-#: core/views/misc.py:218 weight/templates/import_csv_form.html:9
+#: core/views/misc.py:203 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Отправить"
-#: core/views/misc.py:226
+#: core/views/misc.py:211
msgid "Your feedback was successfully sent. Thank you!"
msgstr "Ваш отзыв был успешно отправлен. Спасибо!"
@@ -1780,7 +1683,6 @@ msgstr "название упражнения"
#: exercises/templates/exercise/overview.html:118
#: exercises/templates/muscles/overview.html:114
#: nutrition/templates/ingredient/overview.html:85
-#: software/templates/contribute.html:39
msgid "Only registered users can do this"
msgstr "Это разрешается только зарегистрированным пользователям"
@@ -1986,7 +1888,7 @@ msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246 software/templates/contribute.html:37
+#: exercises/views/exercises.py:246
msgid "Add exercise"
msgstr "Добавить упражнение"
@@ -3718,108 +3620,55 @@ msgstr "Добавить новую единицу веса"
msgid "Edit a weight unit to ingredient connection"
msgstr "Изменить единицу веса соединения ингредиентов"
-#: software/templates/contribute.html:9
+#: software/templates/about_us.html:9
msgid ""
-"wger Workout Manager is build by volunteers,\n"
-"the development process is open and freely accessible to anybody "
-"interested.\n"
-"If you are new to the free software world, we recommend to take a\n"
-"look <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
-"article</a> which summarizes they way open source projects work very well. "
-msgstr ""
-"wger Workout Manager создан волонтерами,\n"
-"процесс программирования открыт и свободно доступен всем заинтересованым.\n"
-"Если вы новичок в сфере свободного софта, мы рекомендуем вам заглянуть сюда "
-"<a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">эта статья</"
-"a> очень доступно обьясняет как работают проекты в свободном софте."
-
-#: software/templates/contribute.html:16
-msgid ""
-"Any kind of contribution is appreciated and welcome.\n"
-"Use this opportunity and influence the direction of the\n"
-"project. "
+"Thank you for using wger! wger is a collaborative open source project, made "
+"by fitness enthusiasts from around the world."
msgstr ""
-"Любой вид содействия ценится и приветствуется.\n"
-"Используйте эту возможность и повлияйте на направление\n"
-"проекта."
-#: software/templates/contribute.html:23
-msgid "Use the site"
-msgstr "Воспользуйтесь этим сайтом"
+#: software/templates/about_us.html:18
+msgid "Source code"
+msgstr ""
-#: software/templates/contribute.html:24
-msgid ""
-"Simply use the site and tell your friends\n"
-"how useful it is! ;) . When you find something that you specially liked,\n"
-"could need some improvements or just doesn't work, tell us! This might not "
-"sound\n"
-"like much, but is incredibly important!"
-msgstr ""
-"Просто воспользуйтесь этим сайтом и расскажите своим друзьям какой он "
-"классный! ;) . Если вы найдете что-то, что вам особенно нравится,\n"
-"что нуждается в улучшении или просто не работает, скажите нам! Это может "
-"показаться незначительным, но это невероятно важно!"
-
-#: software/templates/contribute.html:31
-msgid "Submit exercises"
-msgstr "Представить упражнения"
-
-#: software/templates/contribute.html:32
+#: software/templates/about_us.html:20
+msgid "Get the source code of this application and its server on github"
+msgstr ""
+
+#: software/templates/about_us.html:25
+msgid "Have a problem or idea?"
+msgstr ""
+
+#: software/templates/about_us.html:27
msgid ""
-"Submit those cool exercises that you absolutely\n"
-"love and do every week but are not in the list yet. If you think some "
-"description\n"
-"is too short or some other detail is missing or could be improved, tell!"
-msgstr ""
-"Выставите на страничку ваши любимые упражнения, которые вы регулярно "
-"выполняете, но которых еще нет в списке. Если вы думаете, что некоторые "
-"описания\n"
-"слишком короткие или некоторые детали отсутствуют или могут быть улучшены, "
-"сообщите! "
-
-#: software/templates/contribute.html:44
+"Get in touch if something didn't behave as expected or if there is a feature "
+"that you feel is missing."
+msgstr ""
+
+#: software/templates/about_us.html:32
+msgid "Say hi!"
+msgstr ""
+
+#: software/templates/about_us.html:34
+msgid "If you want to chat with us, hop on the Discord server and get in touch"
+msgstr ""
+
+#: software/templates/about_us.html:39
#, fuzzy
-#| msgid ""
-#| "Do you want to use wger in your own language?\n"
-#| "Do you think the current translation could be improved?\n"
-#| "The translations are easily managed and edited online, if you are "
-#| "interested,\n"
-#| "go to the transifex site, request access and we will set everything\n"
-#| "up. "
-msgid ""
-"Do you want to use wger in your own language?\n"
-"Do you think the current translation could be improved?\n"
-"The translations are easily managed and edited online, if you are "
-"interested,\n"
-"visit the link and start translating."
-msgstr ""
-"Вы хотите пользоваться wger на своем родном языке?\n"
-"Вы думаете, что текущий перевод может быть улучшен?\n"
-"Переводы легко управляются и редактируются онлайн, если вы заинтересованы, \n"
-"перейдите на сайт transifex, запросите доступ и мы все настроим."
-
-#: software/templates/contribute.html:53
-msgid "Code"
-msgstr "Код"
-
-#: software/templates/contribute.html:54
+#| msgid "Translate"
+msgid "Translation"
+msgstr "Перевести"
+
+#: software/templates/about_us.html:41
msgid ""
-"Obviously, you are highly encouraged to clone the\n"
-"repo and start hacking! Once you are ready, send a pull request and we\n"
-"will show the world. Take a look at the developer guide for more details\n"
-"on this."
+"This application is translated on weblate. If you also want to help, click "
+"the link and start translating"
msgstr ""
-"Очевидно, вам настоятельно рекомендуется клонировать репозиторий и начинать "
-"хакерствовать! Когда вы будете готовы, отправьте патч и мы покажем его миру. "
-"Взгляните на руководство разработчика для более подробной информации."
-#: software/templates/contribute.html:66
+#: software/templates/about_us.html:50
msgid "Our goal"
msgstr "Наша цель"
-#: software/templates/contribute.html:69
+#: software/templates/about_us.html:53
msgid ""
"The goal is to build an awesome\n"
"and flexible fitness manager, along with a comprehensive and complete list "
@@ -3960,103 +3809,6 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr ""
-#: software/templates/issues.html:6
-msgid "Reporting a problem"
-msgstr "Сообщение о проблеме"
-
-#: software/templates/issues.html:10
-msgid ""
-"\n"
-"No software is perfect. For some severe errors, an email will be "
-"automatically sent, but\n"
-"not always, so I depend on you reporting everything that didn't behave as "
-"expected.\n"
-"Please describe in as much detail as you can what you were doing when the "
-"error\n"
-"happened.\n"
-msgstr ""
-"\n"
-"\n"
-"Нет совершенного программного обеспечения. При некоторых серьезных ошибках "
-"автоматически будет высылаться электронное сообщение, но не всегда, так что "
-"я полагаюсь на вашу отчетность всего, что не ведет себя так, как ожидалось.\n"
-"Пожалуйста, опишите как можно подробнее, что вы делали, когда ошибка "
-"произошла.\n"
-
-#: software/templates/issues.html:21
-msgid "report problem to the issue tracker"
-msgstr "сообщить о проблеме в систему отслеживания ошибок"
-
-#: software/templates/issues.html:25
-msgid "Enhancements"
-msgstr "Усовершенствования"
-
-#: software/templates/issues.html:27
-msgid ""
-"\n"
-"The issue tracker can also be used to document enhancements to the "
-"software.\n"
-"If you have some suggestions or think a feature is missing, feel\n"
-"free to open a ticket. This can be anything from a slight change to a whole\n"
-"new section of the site. Please keep in mind that not all wishes can be\n"
-"implemented."
-msgstr ""
-"\n"
-"Отслеживатель ошибок может также использоваться для документирования "
-"улучшения программного обеспечения.\n"
-"Если у вас есть предложения или думаете, что функция отсутствует, просто "
-"откройте билет. Это может быть что угодно, от небольшого изменения до "
-"предложения целого\n"
-"нового раздела сайта. Пожалуйста, имейте в виду, что не все желания могут "
-"быть реализованы."
-
-#: software/templates/issues.html:36
-msgid "report wish to the issue tracker"
-msgstr "сообщить о просьбе в систему отслеживания ошибок"
-
-#: software/templates/issues.html:41
-msgid "No Github account?"
-msgstr "Нет аккаунта в Github?"
-
-#: software/templates/issues.html:42
-msgid ""
-"Filing an issue requires a github account, if you don't\n"
-"have one and don't want to register, you can also send it to\n"
-"<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
-msgstr ""
-"Подача вопроса требует наличие аккаунта в github, если его у вас нет или вы "
-"не хотите регистрироваться, вы можете его также выслать в<a href=\"https://"
-"groups.google.com/group/wger\">список рассылки</a>."
-
-#: software/templates/license.html:10
-#, fuzzy
-msgid ""
-"wger Workout Manager is Free/Libre Open Source\n"
-"Software (FLOSS)."
-msgstr ""
-"wger Workout Manager - это Свободное программное\n"
-"обеспечение."
-
-#: software/templates/license.html:22
-msgid ""
-"wger Workout Manager is released under the <strong>Affero GNU\n"
-"General Public License (AGPL) Version 3+</strong> and can (under the "
-"conditions\n"
-"of the license) be used, modified and distributed (also with modifications)\n"
-"without restrictions."
-msgstr ""
-"wger Workout Manager выпущен под лицензией<strong>GNU Affero\n"
-"General Public License (AGPL) Версии 3+</strong> и может (в условиях\n"
-"лицензии) изпользоваться, изменяться и распределяться (также с изменениями)\n"
-"без ограничений."
-
-#: software/templates/license.html:29
-msgid ""
-"A copy the license text is contained in every wger Workout\n"
-"Manager release (LICENSE.txt) and can be read online on the website of\n"
-"<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</a>."
-msgstr ""
-
#: utils/generic_views.py:261
msgid "Yes, delete"
msgstr "Да, удалить"
@@ -4239,6 +3991,248 @@ msgstr "Успешно удалено."
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Responsible for the content of this site as per German law §5 TMG:"
+#~ msgstr ""
+#~ "Ответственный за содержимое этой страницы, соответственно немецкому праву "
+#~ "§5 TMG:"
+
+#~ msgid "GNUPG-Key:"
+#~ msgstr "GNUPG-Ключ:"
+
+#~ msgid "Get in touch"
+#~ msgstr "Написать нам"
+
+#~ msgid ""
+#~ "If you want to further help and improve this project,\n"
+#~ "you might also be interested <a href=\"%(contribute)s\">in contributing</"
+#~ "a>."
+#~ msgstr ""
+#~ "Если Вы желаете дальше помогать и улучшать этот проект,\n"
+#~ "Вас может также заинтересовать <a href=\"%(contribute)s\">в содействии</"
+#~ "a>."
+
+#~ msgid "Feedback form"
+#~ msgstr "Форма отзыва"
+
+#~ msgid ""
+#~ "A simple contact form. Remember that\n"
+#~ "if you want an answer, you need to include some way to contact you."
+#~ msgstr ""
+#~ "Простая форма отзыва. Не забудьте оставить обратный контакт, если Вы "
+#~ "желаете получить ответ."
+
+#~ msgid "Twitter"
+#~ msgstr "Твиттер"
+
+#~ msgid ""
+#~ "We are also on twitter. Write us and tell us what\n"
+#~ "you think! Except patches, don't send patches via twitter."
+#~ msgstr ""
+#~ "Мы также в твиттере. Напишите нам и сообщите, что Вы думаете! Кроме "
+#~ "патчей, не высылайте патчи через Твиттер."
+
+#~ msgid ""
+#~ "Use the public group to get support for your\n"
+#~ "local wger installation, discuss issues or your new idea, etc.\n"
+#~ "(no registration needed)"
+#~ msgstr ""
+#~ "Воспользуйтесь общественной группой, чтобы получить поддержку для Вашей "
+#~ "локальной wger установки, обговорить проблемы или Вашу новую идею, и т."
+#~ "п.\n"
+#~ "(нет необходимости в регистрации)"
+
+#~ msgid "Open feedback form"
+#~ msgstr "Открытая форма отзыва"
+
+#~ msgid "Go to the discord server"
+#~ msgstr "Перейти в Discord сервер"
+
+#~ msgid "Contribute!"
+#~ msgstr "Способствуйте!"
+
+#~ msgid "Problems and wishes"
+#~ msgstr "Проблемы и пожелания"
+
+#~ msgid "About"
+#~ msgstr "О"
+
+#~ msgid ""
+#~ "wger Workout Manager is build by volunteers,\n"
+#~ "the development process is open and freely accessible to anybody "
+#~ "interested.\n"
+#~ "If you are new to the free software world, we recommend to take a\n"
+#~ "look <a href=\"http://schlitt.info/opensource/"
+#~ "blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
+#~ "article</a> which summarizes they way open source projects work very "
+#~ "well. "
+#~ msgstr ""
+#~ "wger Workout Manager создан волонтерами,\n"
+#~ "процесс программирования открыт и свободно доступен всем "
+#~ "заинтересованым.\n"
+#~ "Если вы новичок в сфере свободного софта, мы рекомендуем вам заглянуть "
+#~ "сюда <a href=\"http://schlitt.info/opensource/"
+#~ "blog/0541_10_golden_rules_for_starting_with_open_source.html\">эта "
+#~ "статья</a> очень доступно обьясняет как работают проекты в свободном "
+#~ "софте."
+
+#~ msgid ""
+#~ "Any kind of contribution is appreciated and welcome.\n"
+#~ "Use this opportunity and influence the direction of the\n"
+#~ "project. "
+#~ msgstr ""
+#~ "Любой вид содействия ценится и приветствуется.\n"
+#~ "Используйте эту возможность и повлияйте на направление\n"
+#~ "проекта."
+
+#~ msgid "Use the site"
+#~ msgstr "Воспользуйтесь этим сайтом"
+
+#~ msgid ""
+#~ "Simply use the site and tell your friends\n"
+#~ "how useful it is! ;) . When you find something that you specially liked,\n"
+#~ "could need some improvements or just doesn't work, tell us! This might "
+#~ "not sound\n"
+#~ "like much, but is incredibly important!"
+#~ msgstr ""
+#~ "Просто воспользуйтесь этим сайтом и расскажите своим друзьям какой он "
+#~ "классный! ;) . Если вы найдете что-то, что вам особенно нравится,\n"
+#~ "что нуждается в улучшении или просто не работает, скажите нам! Это может "
+#~ "показаться незначительным, но это невероятно важно!"
+
+#~ msgid "Submit exercises"
+#~ msgstr "Представить упражнения"
+
+#~ msgid ""
+#~ "Submit those cool exercises that you absolutely\n"
+#~ "love and do every week but are not in the list yet. If you think some "
+#~ "description\n"
+#~ "is too short or some other detail is missing or could be improved, tell!"
+#~ msgstr ""
+#~ "Выставите на страничку ваши любимые упражнения, которые вы регулярно "
+#~ "выполняете, но которых еще нет в списке. Если вы думаете, что некоторые "
+#~ "описания\n"
+#~ "слишком короткие или некоторые детали отсутствуют или могут быть "
+#~ "улучшены, сообщите! "
+
+#, fuzzy
+#~| msgid ""
+#~| "Do you want to use wger in your own language?\n"
+#~| "Do you think the current translation could be improved?\n"
+#~| "The translations are easily managed and edited online, if you are "
+#~| "interested,\n"
+#~| "go to the transifex site, request access and we will set everything\n"
+#~| "up. "
+#~ msgid ""
+#~ "Do you want to use wger in your own language?\n"
+#~ "Do you think the current translation could be improved?\n"
+#~ "The translations are easily managed and edited online, if you are "
+#~ "interested,\n"
+#~ "visit the link and start translating."
+#~ msgstr ""
+#~ "Вы хотите пользоваться wger на своем родном языке?\n"
+#~ "Вы думаете, что текущий перевод может быть улучшен?\n"
+#~ "Переводы легко управляются и редактируются онлайн, если вы "
+#~ "заинтересованы, \n"
+#~ "перейдите на сайт transifex, запросите доступ и мы все настроим."
+
+#~ msgid "Code"
+#~ msgstr "Код"
+
+#~ msgid ""
+#~ "Obviously, you are highly encouraged to clone the\n"
+#~ "repo and start hacking! Once you are ready, send a pull request and we\n"
+#~ "will show the world. Take a look at the developer guide for more details\n"
+#~ "on this."
+#~ msgstr ""
+#~ "Очевидно, вам настоятельно рекомендуется клонировать репозиторий и "
+#~ "начинать хакерствовать! Когда вы будете готовы, отправьте патч и мы "
+#~ "покажем его миру. Взгляните на руководство разработчика для более "
+#~ "подробной информации."
+
+#~ msgid "Reporting a problem"
+#~ msgstr "Сообщение о проблеме"
+
+#~ msgid ""
+#~ "\n"
+#~ "No software is perfect. For some severe errors, an email will be "
+#~ "automatically sent, but\n"
+#~ "not always, so I depend on you reporting everything that didn't behave as "
+#~ "expected.\n"
+#~ "Please describe in as much detail as you can what you were doing when the "
+#~ "error\n"
+#~ "happened.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Нет совершенного программного обеспечения. При некоторых серьезных "
+#~ "ошибках автоматически будет высылаться электронное сообщение, но не "
+#~ "всегда, так что я полагаюсь на вашу отчетность всего, что не ведет себя "
+#~ "так, как ожидалось.\n"
+#~ "Пожалуйста, опишите как можно подробнее, что вы делали, когда ошибка "
+#~ "произошла.\n"
+
+#~ msgid "report problem to the issue tracker"
+#~ msgstr "сообщить о проблеме в систему отслеживания ошибок"
+
+#~ msgid "Enhancements"
+#~ msgstr "Усовершенствования"
+
+#~ msgid ""
+#~ "\n"
+#~ "The issue tracker can also be used to document enhancements to the "
+#~ "software.\n"
+#~ "If you have some suggestions or think a feature is missing, feel\n"
+#~ "free to open a ticket. This can be anything from a slight change to a "
+#~ "whole\n"
+#~ "new section of the site. Please keep in mind that not all wishes can be\n"
+#~ "implemented."
+#~ msgstr ""
+#~ "\n"
+#~ "Отслеживатель ошибок может также использоваться для документирования "
+#~ "улучшения программного обеспечения.\n"
+#~ "Если у вас есть предложения или думаете, что функция отсутствует, просто "
+#~ "откройте билет. Это может быть что угодно, от небольшого изменения до "
+#~ "предложения целого\n"
+#~ "нового раздела сайта. Пожалуйста, имейте в виду, что не все желания могут "
+#~ "быть реализованы."
+
+#~ msgid "report wish to the issue tracker"
+#~ msgstr "сообщить о просьбе в систему отслеживания ошибок"
+
+#~ msgid "No Github account?"
+#~ msgstr "Нет аккаунта в Github?"
+
+#~ msgid ""
+#~ "Filing an issue requires a github account, if you don't\n"
+#~ "have one and don't want to register, you can also send it to\n"
+#~ "<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
+#~ msgstr ""
+#~ "Подача вопроса требует наличие аккаунта в github, если его у вас нет или "
+#~ "вы не хотите регистрироваться, вы можете его также выслать в<a href="
+#~ "\"https://groups.google.com/group/wger\">список рассылки</a>."
+
+#, fuzzy
+#~ msgid ""
+#~ "wger Workout Manager is Free/Libre Open Source\n"
+#~ "Software (FLOSS)."
+#~ msgstr ""
+#~ "wger Workout Manager - это Свободное программное\n"
+#~ "обеспечение."
+
+#~ msgid ""
+#~ "wger Workout Manager is released under the <strong>Affero GNU\n"
+#~ "General Public License (AGPL) Version 3+</strong> and can (under the "
+#~ "conditions\n"
+#~ "of the license) be used, modified and distributed (also with "
+#~ "modifications)\n"
+#~ "without restrictions."
+#~ msgstr ""
+#~ "wger Workout Manager выпущен под лицензией<strong>GNU Affero\n"
+#~ "General Public License (AGPL) Версии 3+</strong> и может (в условиях\n"
+#~ "лицензии) изпользоваться, изменяться и распределяться (также с "
+#~ "изменениями)\n"
+#~ "без ограничений."
+
#~ msgid "Use pauses in workout timer"
#~ msgstr "Использование пауз в таймере тренировок"
diff --git a/wger/locale/sv/LC_MESSAGES/django.po b/wger/locale/sv/LC_MESSAGES/django.po
index 89231517e..b9977bf6f 100644
--- a/wger/locale/sv/LC_MESSAGES/django.po
+++ b/wger/locale/sv/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-17 15:00+0200\n"
+"POT-Creation-Date: 2021-08-17 17:23+0200\n"
"PO-Revision-Date: 2021-04-15 07:27+0000\n"
"Last-Translator: Allan Nordhøy <[email protected]>\n"
"Language-Team: Swedish <https://hosted.weblate.org/projects/wger/web/sv/>\n"
@@ -45,7 +45,7 @@ msgstr "Övningar"
msgid "Ingredients"
msgstr "Ingredienser"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:225
+#: config/templates/language/overview.html:4 core/templates/navigation.html:228
msgid "Languages"
msgstr "Språk"
@@ -220,8 +220,8 @@ msgstr "Mitt coola träningsschema"
msgid "Empty placeholder schedule"
msgstr "Tom platshållarschema"
-#: core/forms.py:61 core/templates/navigation.html:187
-#: core/templates/navigation.html:191 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:190
+#: core/templates/navigation.html:194 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Logga in"
@@ -300,8 +300,8 @@ msgstr "Ogiltigt lösenord"
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:187
-#: core/templates/navigation.html:192 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
+#: core/templates/navigation.html:195 core/templates/template.html:150
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -787,92 +787,10 @@ msgstr "Licens lista"
msgid "Nothing found"
msgstr "Ingenting hittades"
-#: core/templates/misc/about.html:4
-msgid "About us"
-msgstr "Om oss"
-
-#: core/templates/misc/about.html:8
-msgid "Responsible for the content of this site as per German law §5 TMG:"
-msgstr "Ansvarig för innehållet på denna webbplats enligt tysk lag §5 TMG:"
-
-#: core/templates/misc/about.html:16
-msgid "GNUPG-Key:"
-msgstr "GNUPG-Key:"
-
-#: core/templates/misc/contact.html:4 core/templates/navigation.html:153
-#: core/templates/template_features.html:86
-#: software/templates/contribute.html:28
-msgid "Get in touch"
-msgstr "Kontakt"
-
-#: core/templates/misc/contact.html:10
-#, python-format
-msgid ""
-"Thank you for your interest. Feel free to use any of the\n"
-"ways below to send feedback you have about any aspect of the site. For\n"
-"support, say hi\n"
-"<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
-"a bug, consider doing it through the <a href=\"%(issues)s\">issue tracker</"
-"a>\n"
-"."
-msgstr ""
-
-#: core/templates/misc/contact.html:20
-#, python-format
-msgid ""
-"If you want to further help and improve this project,\n"
-"you might also be interested <a href=\"%(contribute)s\">in contributing</a>."
-msgstr ""
-"Om du vill hjälpa till ytterligare och förbättra detta projekt, kanske du "
-"också är intresserad av <a href=\"%(contribute)s\"> att bidra</a>."
-
-#: core/templates/misc/contact.html:29
-msgid "Feedback form"
-msgstr "Feedback-formulär"
-
-#: core/templates/misc/contact.html:30
-msgid ""
-"A simple contact form. Remember that\n"
-"if you want an answer, you need to include some way to contact you."
-msgstr ""
-"Ett enkelt kontaktformulär. Kom ihåg att om du vill att ett svar kan du "
-"behöva inkludera några sätt att kontakta dig."
-
-#: core/templates/misc/contact.html:35
-msgid "Twitter"
-msgstr "Twitter"
-
-#: core/templates/misc/contact.html:36
-msgid ""
-"We are also on twitter. Write us and tell us what\n"
-"you think! Except patches, don't send patches via twitter."
-msgstr ""
-"Vi finns också på twitter. Skriv till oss och berätta vad du tycker! Förutom "
-"patchar, skicka inte patchar via twitter."
-
-#: core/templates/misc/contact.html:42
-msgid "Discord"
-msgstr ""
-
-#: core/templates/misc/contact.html:43
-msgid ""
-"Use the public group to get support for your\n"
-"local wger installation, discuss issues or your new idea, etc.\n"
-"(no registration needed)"
-msgstr ""
-"Använd den offentliga gruppen för att få stöd för din lokala wger "
-"installation samt diskutera frågor och idéer (ingen registrering krävs)."
-
-#: core/templates/misc/contact.html:49
-msgid "Open feedback form"
-msgstr "Öppna feedbackformulär"
-
-#: core/templates/misc/contact.html:53
-msgid "tweet to @wger_project"
-msgstr ""
-
-#: core/templates/misc/contact.html:56
-msgid "Go to the discord server"
+#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/template_features.html:118
+#: core/templates/template_no_context.html:88
+msgid "Imprint"
msgstr ""
#: core/templates/misc/fragments/shariff_modal.html:6
@@ -965,7 +883,7 @@ msgid "Add new exercise"
msgstr "Lägg till ny övning"
#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:223
+#: core/templates/navigation.html:226
msgid "Administration"
msgstr "Administration"
@@ -1032,68 +950,62 @@ msgid "About this software"
msgstr "Om programvaran"
#: core/templates/navigation.html:151 core/templates/template_features.html:83
-#: software/templates/contribute.html:6
-msgid "Contribute!"
-msgstr "Bidra!"
-
-#: core/templates/navigation.html:152
-msgid "Problems and wishes"
-msgstr "Problem och önskemål"
+#: software/templates/about_us.html:5
+msgid "About us"
+msgstr "Om oss"
-#: core/templates/navigation.html:155 software/templates/features.html:209
+#: core/templates/navigation.html:153 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:156 software/templates/license.html:7
-#: utils/models.py:40
+#: core/templates/navigation.html:157 utils/models.py:40
msgid "License"
msgstr "Licens"
-#: core/templates/navigation.html:160
+#: core/templates/navigation.html:163
msgid "Developer documentation"
msgstr "Dokument för utvecklare"
-#: core/templates/navigation.html:166 software/templates/contribute.html:59
+#: core/templates/navigation.html:169
msgid "Get the code"
msgstr "Hämta koden"
-#: core/templates/navigation.html:172 core/templates/template.html:193
-#: core/templates/template_features.html:103
-#: software/templates/contribute.html:43 software/templates/contribute.html:50
+#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/template_features.html:100
msgid "Translate"
msgstr "Översätt"
-#: core/templates/navigation.html:193 core/templates/user/login.html:28
+#: core/templates/navigation.html:196 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Återställ lösenord"
-#: core/templates/navigation.html:206
+#: core/templates/navigation.html:209
msgid "My preferences"
msgstr "Mina preferenser"
-#: core/templates/navigation.html:213
+#: core/templates/navigation.html:216
msgid "Logout"
msgstr "Logga ut"
-#: core/templates/navigation.html:228
+#: core/templates/navigation.html:231
msgid "Licenses"
msgstr "Licenser"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:234
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Repetitioner"
-#: core/templates/navigation.html:234 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Viktenheter"
-#: core/templates/navigation.html:237 core/templates/user/list.html:4
+#: core/templates/navigation.html:240 core/templates/user/list.html:4
msgid "User list"
msgstr "Användarlista"
-#: core/templates/navigation.html:238
+#: core/templates/navigation.html:241
msgid "Gyms"
msgstr "Gym"
@@ -1211,18 +1123,12 @@ msgstr "Du använder ett gästkonto, data som anges tas bort efter en vecka."
msgid "Create some demo entries"
msgstr "Skapa några demoposter"
-#: core/templates/template.html:201 core/templates/template_features.html:121
-#: core/templates/template_no_context.html:88
-msgid "About"
-msgstr "Om"
-
-#: core/templates/template.html:202 core/templates/template_features.html:125
+#: core/templates/template.html:202 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Villkor för tjänsten"
#: core/templates/template.html:209 core/templates/template.html:210
-#: software/templates/license.html:18 software/templates/license.html:19
msgid "Released under the Affero GPL"
msgstr "Släppt under GPL Affero"
@@ -1581,15 +1487,15 @@ msgstr ""
msgid "Rest day"
msgstr "Vilodag"
-#: core/views/misc.py:199
+#: core/views/misc.py:184
msgid "Feedback"
msgstr "Feedback"
-#: core/views/misc.py:218 weight/templates/import_csv_form.html:9
+#: core/views/misc.py:203 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Ladda upp"
-#: core/views/misc.py:226
+#: core/views/misc.py:211
msgid "Your feedback was successfully sent. Thank you!"
msgstr "Din feedback skickades. Tack!"
@@ -1763,7 +1669,6 @@ msgstr "Övningsnamn"
#: exercises/templates/exercise/overview.html:118
#: exercises/templates/muscles/overview.html:114
#: nutrition/templates/ingredient/overview.html:85
-#: software/templates/contribute.html:39
msgid "Only registered users can do this"
msgstr "Endast registrerade användare kan göra detta"
@@ -1970,7 +1875,7 @@ msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246 software/templates/contribute.html:37
+#: exercises/views/exercises.py:246
msgid "Add exercise"
msgstr "Lägg till övning"
@@ -3715,106 +3620,55 @@ msgstr "Lägg till en ny viktenhet"
msgid "Edit a weight unit to ingredient connection"
msgstr "Redigera en viktenhet- till ingrediens anslutning"
-#: software/templates/contribute.html:9
-msgid ""
-"wger Workout Manager is build by volunteers,\n"
-"the development process is open and freely accessible to anybody "
-"interested.\n"
-"If you are new to the free software world, we recommend to take a\n"
-"look <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
-"article</a> which summarizes they way open source projects work very well. "
-msgstr ""
-"wger Workout Manager är byggd av volontärer. Utvecklingsprocessen är öppen "
-"och fritt tillgänglig för alla intresserade.\n"
-"Om du är ny till fri- programvaruvärlden, rekommenderar vi att ta en titt på "
-"<a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">den här "
-"artikeln</a> som sammanfattar hur öppen- källkodrprojekt fungerar mycket "
-"bra. "
-
-#: software/templates/contribute.html:16
+#: software/templates/about_us.html:9
msgid ""
-"Any kind of contribution is appreciated and welcome.\n"
-"Use this opportunity and influence the direction of the\n"
-"project. "
+"Thank you for using wger! wger is a collaborative open source project, made "
+"by fitness enthusiasts from around the world."
msgstr ""
-"Alla typer av bidrag är uppskattade och välkommna.\n"
-"Utnyttja denna möjlighet så kan du verkligen influera projektets riktning. "
-#: software/templates/contribute.html:23
-msgid "Use the site"
-msgstr "Använd webbplatsen"
+#: software/templates/about_us.html:18
+msgid "Source code"
+msgstr ""
-#: software/templates/contribute.html:24
-msgid ""
-"Simply use the site and tell your friends\n"
-"how useful it is! ;) . When you find something that you specially liked,\n"
-"could need some improvements or just doesn't work, tell us! This might not "
-"sound\n"
-"like much, but is incredibly important!"
-msgstr ""
-"Använd helt enkelt webbplatsen och berätta för dina vänner hur användbar den "
-"är! ;) . När du hittar något som du verkligen gillade, något som kräver "
-"förbättringar eller något som helt enkelt inte fungerar så tveka inte att "
-"berätta för oss! Detta kanske inte låter som mycket, men är otroligt viktigt!"
-
-#: software/templates/contribute.html:31
-msgid "Submit exercises"
-msgstr "Ladda upp övningar"
-
-#: software/templates/contribute.html:32
+#: software/templates/about_us.html:20
+msgid "Get the source code of this application and its server on github"
+msgstr ""
+
+#: software/templates/about_us.html:25
+msgid "Have a problem or idea?"
+msgstr ""
+
+#: software/templates/about_us.html:27
msgid ""
-"Submit those cool exercises that you absolutely\n"
-"love and do every week but are not in the list yet. If you think some "
-"description\n"
-"is too short or some other detail is missing or could be improved, tell!"
+"Get in touch if something didn't behave as expected or if there is a feature "
+"that you feel is missing."
+msgstr ""
+
+#: software/templates/about_us.html:32
+msgid "Say hi!"
msgstr ""
-"Ladda upp häftiga övningar du verkligen älskar, och gör varje vecka, men "
-"ännu inte finns i listan. Om du tycker att någon beskrivning är för kort "
-"eller några andra detaljer saknas eller kan förbättras, berätta!"
-#: software/templates/contribute.html:44
+#: software/templates/about_us.html:34
+msgid "If you want to chat with us, hop on the Discord server and get in touch"
+msgstr ""
+
+#: software/templates/about_us.html:39
#, fuzzy
-#| msgid ""
-#| "Do you want to use wger in your own language?\n"
-#| "Do you think the current translation could be improved?\n"
-#| "The translations are easily managed and edited online, if you are "
-#| "interested,\n"
-#| "go to the transifex site, request access and we will set everything\n"
-#| "up. "
-msgid ""
-"Do you want to use wger in your own language?\n"
-"Do you think the current translation could be improved?\n"
-"The translations are easily managed and edited online, if you are "
-"interested,\n"
-"visit the link and start translating."
-msgstr ""
-"Vill du använda wger på ditt eget språk?\n"
-"Tror du att den aktuella översättningen kan förbättras?\n"
-"Översättningar hanteras enkelt och redigeras online. Om du är intresserad, "
-"gå till webbplatsen transifex, begär åtkomst så kommer vi att inrätta allt. "
-
-#: software/templates/contribute.html:53
-msgid "Code"
-msgstr "Kod"
-
-#: software/templates/contribute.html:54
+#| msgid "Translate"
+msgid "Translation"
+msgstr "Översätt"
+
+#: software/templates/about_us.html:41
msgid ""
-"Obviously, you are highly encouraged to clone the\n"
-"repo and start hacking! Once you are ready, send a pull request and we\n"
-"will show the world. Take a look at the developer guide for more details\n"
-"on this."
+"This application is translated on weblate. If you also want to help, click "
+"the link and start translating"
msgstr ""
-"Självklart uppmuntrar vi verkligen att du klonar repot och börjar hacka! När "
-"du är klar, skicka en pull request och visa världen. Ta en titt på "
-"utvecklarguiden för mer detaljer om detta."
-#: software/templates/contribute.html:66
+#: software/templates/about_us.html:50
msgid "Our goal"
msgstr "Vårt mål"
-#: software/templates/contribute.html:69
+#: software/templates/about_us.html:53
msgid ""
"The goal is to build an awesome\n"
"and flexible fitness manager, along with a comprehensive and complete list "
@@ -3985,98 +3839,6 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr "100%% Fri och Öppen källkod"
-#: software/templates/issues.html:6
-msgid "Reporting a problem"
-msgstr "Rapportera ett problem"
-
-#: software/templates/issues.html:10
-msgid ""
-"\n"
-"No software is perfect. For some severe errors, an email will be "
-"automatically sent, but\n"
-"not always, so I depend on you reporting everything that didn't behave as "
-"expected.\n"
-"Please describe in as much detail as you can what you were doing when the "
-"error\n"
-"happened.\n"
-msgstr ""
-"\n"
-"Ingen programvara är perfekt. För vissa allvarliga fel kommer ett e-"
-"postmeddelande skickas automatiskt, men inte alltid, så jag litar på du "
-"rapporterar allt som inte fungerar som förväntat.\n"
-"Beskriv så detaljerat som möjligt vad du gjorde när felet inträffade.\n"
-
-#: software/templates/issues.html:21
-msgid "report problem to the issue tracker"
-msgstr "rapportera problemet till issue trackern"
-
-#: software/templates/issues.html:25
-msgid "Enhancements"
-msgstr "Förbättringar"
-
-#: software/templates/issues.html:27
-msgid ""
-"\n"
-"The issue tracker can also be used to document enhancements to the "
-"software.\n"
-"If you have some suggestions or think a feature is missing, feel\n"
-"free to open a ticket. This can be anything from a slight change to a whole\n"
-"new section of the site. Please keep in mind that not all wishes can be\n"
-"implemented."
-msgstr ""
-"\n"
-"Issue trackern kan också användas för att dokumentera förbättringar av "
-"programvaran.\n"
-"Om du har några förslag eller tycker att en funktion saknas, öppna gärna en "
-"ticket. Det kan vara allt från en liten förändring till en helt ny sektion "
-"på webbplatsen. Kom ihåg att inte allt alla önskar kan genomföras."
-
-#: software/templates/issues.html:36
-msgid "report wish to the issue tracker"
-msgstr "Ge oss dina önskemål genom issue trackern"
-
-#: software/templates/issues.html:41
-msgid "No Github account?"
-msgstr "Inget Githubkonto?"
-
-#: software/templates/issues.html:42
-msgid ""
-"Filing an issue requires a github account, if you don't\n"
-"have one and don't want to register, you can also send it to\n"
-"<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
-msgstr ""
-"Skapandet av en issue kräver ett Githubkonto. Om du inte har ett och vill "
-"inte att registrera dig, du kan också skicka det till <a href=\"https://"
-"groups.google.com/group/wger\"> mailinglistan</a>."
-
-#: software/templates/license.html:10
-msgid ""
-"wger Workout Manager is Free/Libre Open Source\n"
-"Software (FLOSS)."
-msgstr "wger Workout Manager är fri och öppen- källkodsprogramvara (FLOSS)"
-
-#: software/templates/license.html:22
-msgid ""
-"wger Workout Manager is released under the <strong>Affero GNU\n"
-"General Public License (AGPL) Version 3+</strong> and can (under the "
-"conditions\n"
-"of the license) be used, modified and distributed (also with modifications)\n"
-"without restrictions."
-msgstr ""
-"wger Workout Manager är släppt under <strong>Affero GNU General Public "
-"License (AGPL) Version 3 +</strong> och kan (enligt villkoren i licensen) "
-"användas, ändras och distribueras (också med ändringar) utan begränsningar."
-
-#: software/templates/license.html:29
-msgid ""
-"A copy the license text is contained in every wger Workout\n"
-"Manager release (LICENSE.txt) and can be read online on the website of\n"
-"<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</a>."
-msgstr ""
-"En kopia av licenstexten finns i varje wger Workout\n"
-"Manager release (LICENSE.txt) och kan läsas online på webbplatsen för\n"
-"<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>GNU-projektet.</a>"
-
#: utils/generic_views.py:261
msgid "Yes, delete"
msgstr "Ja, ta bort"
@@ -4259,6 +4021,238 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Responsible for the content of this site as per German law §5 TMG:"
+#~ msgstr "Ansvarig för innehållet på denna webbplats enligt tysk lag §5 TMG:"
+
+#~ msgid "GNUPG-Key:"
+#~ msgstr "GNUPG-Key:"
+
+#~ msgid "Get in touch"
+#~ msgstr "Kontakt"
+
+#~ msgid ""
+#~ "If you want to further help and improve this project,\n"
+#~ "you might also be interested <a href=\"%(contribute)s\">in contributing</"
+#~ "a>."
+#~ msgstr ""
+#~ "Om du vill hjälpa till ytterligare och förbättra detta projekt, kanske du "
+#~ "också är intresserad av <a href=\"%(contribute)s\"> att bidra</a>."
+
+#~ msgid "Feedback form"
+#~ msgstr "Feedback-formulär"
+
+#~ msgid ""
+#~ "A simple contact form. Remember that\n"
+#~ "if you want an answer, you need to include some way to contact you."
+#~ msgstr ""
+#~ "Ett enkelt kontaktformulär. Kom ihåg att om du vill att ett svar kan du "
+#~ "behöva inkludera några sätt att kontakta dig."
+
+#~ msgid "Twitter"
+#~ msgstr "Twitter"
+
+#~ msgid ""
+#~ "We are also on twitter. Write us and tell us what\n"
+#~ "you think! Except patches, don't send patches via twitter."
+#~ msgstr ""
+#~ "Vi finns också på twitter. Skriv till oss och berätta vad du tycker! "
+#~ "Förutom patchar, skicka inte patchar via twitter."
+
+#~ msgid ""
+#~ "Use the public group to get support for your\n"
+#~ "local wger installation, discuss issues or your new idea, etc.\n"
+#~ "(no registration needed)"
+#~ msgstr ""
+#~ "Använd den offentliga gruppen för att få stöd för din lokala wger "
+#~ "installation samt diskutera frågor och idéer (ingen registrering krävs)."
+
+#~ msgid "Open feedback form"
+#~ msgstr "Öppna feedbackformulär"
+
+#~ msgid "Contribute!"
+#~ msgstr "Bidra!"
+
+#~ msgid "Problems and wishes"
+#~ msgstr "Problem och önskemål"
+
+#~ msgid "About"
+#~ msgstr "Om"
+
+#~ msgid ""
+#~ "wger Workout Manager is build by volunteers,\n"
+#~ "the development process is open and freely accessible to anybody "
+#~ "interested.\n"
+#~ "If you are new to the free software world, we recommend to take a\n"
+#~ "look <a href=\"http://schlitt.info/opensource/"
+#~ "blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
+#~ "article</a> which summarizes they way open source projects work very "
+#~ "well. "
+#~ msgstr ""
+#~ "wger Workout Manager är byggd av volontärer. Utvecklingsprocessen är "
+#~ "öppen och fritt tillgänglig för alla intresserade.\n"
+#~ "Om du är ny till fri- programvaruvärlden, rekommenderar vi att ta en titt "
+#~ "på <a href=\"http://schlitt.info/opensource/"
+#~ "blog/0541_10_golden_rules_for_starting_with_open_source.html\">den här "
+#~ "artikeln</a> som sammanfattar hur öppen- källkodrprojekt fungerar mycket "
+#~ "bra. "
+
+#~ msgid ""
+#~ "Any kind of contribution is appreciated and welcome.\n"
+#~ "Use this opportunity and influence the direction of the\n"
+#~ "project. "
+#~ msgstr ""
+#~ "Alla typer av bidrag är uppskattade och välkommna.\n"
+#~ "Utnyttja denna möjlighet så kan du verkligen influera projektets "
+#~ "riktning. "
+
+#~ msgid "Use the site"
+#~ msgstr "Använd webbplatsen"
+
+#~ msgid ""
+#~ "Simply use the site and tell your friends\n"
+#~ "how useful it is! ;) . When you find something that you specially liked,\n"
+#~ "could need some improvements or just doesn't work, tell us! This might "
+#~ "not sound\n"
+#~ "like much, but is incredibly important!"
+#~ msgstr ""
+#~ "Använd helt enkelt webbplatsen och berätta för dina vänner hur användbar "
+#~ "den är! ;) . När du hittar något som du verkligen gillade, något som "
+#~ "kräver förbättringar eller något som helt enkelt inte fungerar så tveka "
+#~ "inte att berätta för oss! Detta kanske inte låter som mycket, men är "
+#~ "otroligt viktigt!"
+
+#~ msgid "Submit exercises"
+#~ msgstr "Ladda upp övningar"
+
+#~ msgid ""
+#~ "Submit those cool exercises that you absolutely\n"
+#~ "love and do every week but are not in the list yet. If you think some "
+#~ "description\n"
+#~ "is too short or some other detail is missing or could be improved, tell!"
+#~ msgstr ""
+#~ "Ladda upp häftiga övningar du verkligen älskar, och gör varje vecka, men "
+#~ "ännu inte finns i listan. Om du tycker att någon beskrivning är för kort "
+#~ "eller några andra detaljer saknas eller kan förbättras, berätta!"
+
+#, fuzzy
+#~| msgid ""
+#~| "Do you want to use wger in your own language?\n"
+#~| "Do you think the current translation could be improved?\n"
+#~| "The translations are easily managed and edited online, if you are "
+#~| "interested,\n"
+#~| "go to the transifex site, request access and we will set everything\n"
+#~| "up. "
+#~ msgid ""
+#~ "Do you want to use wger in your own language?\n"
+#~ "Do you think the current translation could be improved?\n"
+#~ "The translations are easily managed and edited online, if you are "
+#~ "interested,\n"
+#~ "visit the link and start translating."
+#~ msgstr ""
+#~ "Vill du använda wger på ditt eget språk?\n"
+#~ "Tror du att den aktuella översättningen kan förbättras?\n"
+#~ "Översättningar hanteras enkelt och redigeras online. Om du är "
+#~ "intresserad, gå till webbplatsen transifex, begär åtkomst så kommer vi "
+#~ "att inrätta allt. "
+
+#~ msgid "Code"
+#~ msgstr "Kod"
+
+#~ msgid ""
+#~ "Obviously, you are highly encouraged to clone the\n"
+#~ "repo and start hacking! Once you are ready, send a pull request and we\n"
+#~ "will show the world. Take a look at the developer guide for more details\n"
+#~ "on this."
+#~ msgstr ""
+#~ "Självklart uppmuntrar vi verkligen att du klonar repot och börjar hacka! "
+#~ "När du är klar, skicka en pull request och visa världen. Ta en titt på "
+#~ "utvecklarguiden för mer detaljer om detta."
+
+#~ msgid "Reporting a problem"
+#~ msgstr "Rapportera ett problem"
+
+#~ msgid ""
+#~ "\n"
+#~ "No software is perfect. For some severe errors, an email will be "
+#~ "automatically sent, but\n"
+#~ "not always, so I depend on you reporting everything that didn't behave as "
+#~ "expected.\n"
+#~ "Please describe in as much detail as you can what you were doing when the "
+#~ "error\n"
+#~ "happened.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Ingen programvara är perfekt. För vissa allvarliga fel kommer ett e-"
+#~ "postmeddelande skickas automatiskt, men inte alltid, så jag litar på du "
+#~ "rapporterar allt som inte fungerar som förväntat.\n"
+#~ "Beskriv så detaljerat som möjligt vad du gjorde när felet inträffade.\n"
+
+#~ msgid "report problem to the issue tracker"
+#~ msgstr "rapportera problemet till issue trackern"
+
+#~ msgid "Enhancements"
+#~ msgstr "Förbättringar"
+
+#~ msgid ""
+#~ "\n"
+#~ "The issue tracker can also be used to document enhancements to the "
+#~ "software.\n"
+#~ "If you have some suggestions or think a feature is missing, feel\n"
+#~ "free to open a ticket. This can be anything from a slight change to a "
+#~ "whole\n"
+#~ "new section of the site. Please keep in mind that not all wishes can be\n"
+#~ "implemented."
+#~ msgstr ""
+#~ "\n"
+#~ "Issue trackern kan också användas för att dokumentera förbättringar av "
+#~ "programvaran.\n"
+#~ "Om du har några förslag eller tycker att en funktion saknas, öppna gärna "
+#~ "en ticket. Det kan vara allt från en liten förändring till en helt ny "
+#~ "sektion på webbplatsen. Kom ihåg att inte allt alla önskar kan genomföras."
+
+#~ msgid "report wish to the issue tracker"
+#~ msgstr "Ge oss dina önskemål genom issue trackern"
+
+#~ msgid "No Github account?"
+#~ msgstr "Inget Githubkonto?"
+
+#~ msgid ""
+#~ "Filing an issue requires a github account, if you don't\n"
+#~ "have one and don't want to register, you can also send it to\n"
+#~ "<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
+#~ msgstr ""
+#~ "Skapandet av en issue kräver ett Githubkonto. Om du inte har ett och vill "
+#~ "inte att registrera dig, du kan också skicka det till <a href=\"https://"
+#~ "groups.google.com/group/wger\"> mailinglistan</a>."
+
+#~ msgid ""
+#~ "wger Workout Manager is Free/Libre Open Source\n"
+#~ "Software (FLOSS)."
+#~ msgstr "wger Workout Manager är fri och öppen- källkodsprogramvara (FLOSS)"
+
+#~ msgid ""
+#~ "wger Workout Manager is released under the <strong>Affero GNU\n"
+#~ "General Public License (AGPL) Version 3+</strong> and can (under the "
+#~ "conditions\n"
+#~ "of the license) be used, modified and distributed (also with "
+#~ "modifications)\n"
+#~ "without restrictions."
+#~ msgstr ""
+#~ "wger Workout Manager är släppt under <strong>Affero GNU General Public "
+#~ "License (AGPL) Version 3 +</strong> och kan (enligt villkoren i licensen) "
+#~ "användas, ändras och distribueras (också med ändringar) utan "
+#~ "begränsningar."
+
+#~ msgid ""
+#~ "A copy the license text is contained in every wger Workout\n"
+#~ "Manager release (LICENSE.txt) and can be read online on the website of\n"
+#~ "<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</"
+#~ "a>."
+#~ msgstr ""
+#~ "En kopia av licenstexten finns i varje wger Workout\n"
+#~ "Manager release (LICENSE.txt) och kan läsas online på webbplatsen för\n"
+#~ "<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>GNU-projektet.</a>"
+
#~ msgid "Use pauses in workout timer"
#~ msgstr "Använd pauser i träningspasstimern"
diff --git a/wger/locale/tr/LC_MESSAGES/django.po b/wger/locale/tr/LC_MESSAGES/django.po
index 208d858cd..59458a8ea 100644
--- a/wger/locale/tr/LC_MESSAGES/django.po
+++ b/wger/locale/tr/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-17 15:00+0200\n"
+"POT-Creation-Date: 2021-08-17 17:23+0200\n"
"PO-Revision-Date: 2021-04-15 07:27+0000\n"
"Last-Translator: Oğuz Ersen <[email protected]>\n"
"Language-Team: Turkish <https://hosted.weblate.org/projects/wger/web/tr/>\n"
@@ -44,7 +44,7 @@ msgstr "Egzersizler"
msgid "Ingredients"
msgstr "Bileşimindekiler"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:225
+#: config/templates/language/overview.html:4 core/templates/navigation.html:228
msgid "Languages"
msgstr "Diller"
@@ -221,8 +221,8 @@ msgstr "Harika antrenman programım"
msgid "Empty placeholder schedule"
msgstr "Yer tutucu planı boş"
-#: core/forms.py:61 core/templates/navigation.html:187
-#: core/templates/navigation.html:191 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:190
+#: core/templates/navigation.html:194 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Oturum aç"
@@ -299,8 +299,8 @@ msgstr "Geçersiz parola"
msgid "The form is secured with reCAPTCHA"
msgstr "Form reCAPTCHA ile güvence altına alındı"
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:187
-#: core/templates/navigation.html:192 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
+#: core/templates/navigation.html:195 core/templates/template.html:150
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -796,104 +796,11 @@ msgstr "Lisans listesi"
msgid "Nothing found"
msgstr "Hiçbir şey Bulunamadı"
-#: core/templates/misc/about.html:4
-msgid "About us"
-msgstr "Hakkımızda"
-
-#: core/templates/misc/about.html:8
-msgid "Responsible for the content of this site as per German law §5 TMG:"
-msgstr "Alman yasaları §5 TMG uyarınca bu sitenin içeriğinden sorumlu:"
-
-#: core/templates/misc/about.html:16
-msgid "GNUPG-Key:"
-msgstr "GNUPG-Anahtarı:"
-
-#: core/templates/misc/contact.html:4 core/templates/navigation.html:153
-#: core/templates/template_features.html:86
-#: software/templates/contribute.html:28
-msgid "Get in touch"
-msgstr "Temas kur"
-
-#: core/templates/misc/contact.html:10
-#, python-format
-msgid ""
-"Thank you for your interest. Feel free to use any of the\n"
-"ways below to send feedback you have about any aspect of the site. For\n"
-"support, say hi\n"
-"<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
-"a bug, consider doing it through the <a href=\"%(issues)s\">issue tracker</"
-"a>\n"
-"."
-msgstr ""
-"İlginiz için teşekkürler. Herhangi birini kullanmaktan çekinmeyin\n"
-"Sitenin herhangi bir yönü hakkında sahip olduğunuz geri bildirimleri "
-"göndermek için aşağıdaki yollar. İçin\n"
-"destek, selam söyle\n"
-" <a href=\"%(discord)s\"> discord kanalında </a>, rapor etmek için\n"
-"bir hata, bunu <a href=\"%(issues)s\"> sorun izleyicisi </a> aracılığıyla "
-"yapmayı düşünün\n"
-"."
-
-#: core/templates/misc/contact.html:20
-#, python-format
-msgid ""
-"If you want to further help and improve this project,\n"
-"you might also be interested <a href=\"%(contribute)s\">in contributing</a>."
-msgstr ""
-"Bu projeye daha fazla yardım etmek ve onu iyileştirmek\n"
-"istiyorsanız, <a href=\"%(contribute)s\">katkıda bulunmak</a> da ilginizi "
-"çekebilir."
-
-#: core/templates/misc/contact.html:29
-msgid "Feedback form"
-msgstr "Geri bildirim formu"
-
-#: core/templates/misc/contact.html:30
-msgid ""
-"A simple contact form. Remember that\n"
-"if you want an answer, you need to include some way to contact you."
-msgstr ""
-"Basit bir iletişim formu. Bunu hatırla\n"
-"Bir cevap istiyorsanız, sizinle iletişim kurmanın bir yolunu eklemeniz "
-"gerekir."
-
-#: core/templates/misc/contact.html:35
-msgid "Twitter"
-msgstr "Twitter"
-
-#: core/templates/misc/contact.html:36
-msgid ""
-"We are also on twitter. Write us and tell us what\n"
-"you think! Except patches, don't send patches via twitter."
-msgstr ""
-"Biz de twitterdayız. Bize yazın ve bize ne söyleyin\n"
-"sence! Yamalar dışında, twitter üzerinden yama göndermeyin."
-
-#: core/templates/misc/contact.html:42
-msgid "Discord"
-msgstr "Discord"
-
-#: core/templates/misc/contact.html:43
-msgid ""
-"Use the public group to get support for your\n"
-"local wger installation, discuss issues or your new idea, etc.\n"
-"(no registration needed)"
+#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/template_features.html:118
+#: core/templates/template_no_context.html:88
+msgid "Imprint"
msgstr ""
-"Yerel wger kurulumunuz için destek almak, sorunları\n"
-"veya yeni fikrinizi tartışmak vb. için genel grubu kullanın\n"
-"(kayıt gerekmez)"
-
-#: core/templates/misc/contact.html:49
-msgid "Open feedback form"
-msgstr "Geri bildirim formunu aç"
-
-#: core/templates/misc/contact.html:53
-msgid "tweet to @wger_project"
-msgstr "@wger_project tweetle"
-
-#: core/templates/misc/contact.html:56
-msgid "Go to the discord server"
-msgstr "Discord sunucusuna git"
#: core/templates/misc/fragments/shariff_modal.html:6
msgid "Share this page"
@@ -986,7 +893,7 @@ msgid "Add new exercise"
msgstr "Yeni egzersiz ekleyin"
#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:223
+#: core/templates/navigation.html:226
msgid "Administration"
msgstr "Yönetim"
@@ -1053,68 +960,62 @@ msgid "About this software"
msgstr "Bu yazılım hakkında"
#: core/templates/navigation.html:151 core/templates/template_features.html:83
-#: software/templates/contribute.html:6
-msgid "Contribute!"
-msgstr "Katkıda bulun!"
-
-#: core/templates/navigation.html:152
-msgid "Problems and wishes"
-msgstr "Sorunlar ve dilekler"
+#: software/templates/about_us.html:5
+msgid "About us"
+msgstr "Hakkımızda"
-#: core/templates/navigation.html:155 software/templates/features.html:209
+#: core/templates/navigation.html:153 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:156 software/templates/license.html:7
-#: utils/models.py:40
+#: core/templates/navigation.html:157 utils/models.py:40
msgid "License"
msgstr "Lisans"
-#: core/templates/navigation.html:160
+#: core/templates/navigation.html:163
msgid "Developer documentation"
msgstr "Geliştirici belgeleri"
-#: core/templates/navigation.html:166 software/templates/contribute.html:59
+#: core/templates/navigation.html:169
msgid "Get the code"
msgstr "Kodu alın"
-#: core/templates/navigation.html:172 core/templates/template.html:193
-#: core/templates/template_features.html:103
-#: software/templates/contribute.html:43 software/templates/contribute.html:50
+#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/template_features.html:100
msgid "Translate"
msgstr "Çevir"
-#: core/templates/navigation.html:193 core/templates/user/login.html:28
+#: core/templates/navigation.html:196 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Parolayı sıfırla"
-#: core/templates/navigation.html:206
+#: core/templates/navigation.html:209
msgid "My preferences"
msgstr "Benim tercihlerim"
-#: core/templates/navigation.html:213
+#: core/templates/navigation.html:216
msgid "Logout"
msgstr "Çıkış"
-#: core/templates/navigation.html:228
+#: core/templates/navigation.html:231
msgid "Licenses"
msgstr "Lisanslar"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:234
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Tekrarlama birimleri"
-#: core/templates/navigation.html:234 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Ağırlık birimleri"
-#: core/templates/navigation.html:237 core/templates/user/list.html:4
+#: core/templates/navigation.html:240 core/templates/user/list.html:4
msgid "User list"
msgstr "Kullanıcı listesi"
-#: core/templates/navigation.html:238
+#: core/templates/navigation.html:241
msgid "Gyms"
msgstr "Spor salonları"
@@ -1233,18 +1134,12 @@ msgstr ""
msgid "Create some demo entries"
msgstr "Bazı demo girişleri oluşturun"
-#: core/templates/template.html:201 core/templates/template_features.html:121
-#: core/templates/template_no_context.html:88
-msgid "About"
-msgstr "hakkında"
-
-#: core/templates/template.html:202 core/templates/template_features.html:125
+#: core/templates/template.html:202 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Kullanım Şartları"
#: core/templates/template.html:209 core/templates/template.html:210
-#: software/templates/license.html:18 software/templates/license.html:19
msgid "Released under the Affero GPL"
msgstr "Affero GPL altında yayınlandı"
@@ -1607,15 +1502,15 @@ msgstr ""
msgid "Rest day"
msgstr "Dinlenme günü"
-#: core/views/misc.py:199
+#: core/views/misc.py:184
msgid "Feedback"
msgstr "geri bildirim"
-#: core/views/misc.py:218 weight/templates/import_csv_form.html:9
+#: core/views/misc.py:203 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Sunmak"
-#: core/views/misc.py:226
+#: core/views/misc.py:211
msgid "Your feedback was successfully sent. Thank you!"
msgstr "Geri bildiriminiz başarıyla gönderildi. Teşekkür ederim!"
@@ -1790,7 +1685,6 @@ msgstr "egzersiz adı"
#: exercises/templates/exercise/overview.html:118
#: exercises/templates/muscles/overview.html:114
#: nutrition/templates/ingredient/overview.html:85
-#: software/templates/contribute.html:39
msgid "Only registered users can do this"
msgstr "Bunu sadece kayıtlı kullanıcılar yapabilir"
@@ -2006,7 +1900,7 @@ msgid ""
msgstr ""
"%(name_original)s, mevcut \"%(exercise_name)s\" egzersizine çok benziyor"
-#: exercises/views/exercises.py:246 software/templates/contribute.html:37
+#: exercises/views/exercises.py:246
msgid "Add exercise"
msgstr "Egzersiz ekle"
@@ -3783,103 +3677,55 @@ msgstr "Yeni bir ağırlık birimi ekleyin"
msgid "Edit a weight unit to ingredient connection"
msgstr "Ağırlık birimini bileşen bağlantısına göre düzenleyin"
-#: software/templates/contribute.html:9
+#: software/templates/about_us.html:9
msgid ""
-"wger Workout Manager is build by volunteers,\n"
-"the development process is open and freely accessible to anybody "
-"interested.\n"
-"If you are new to the free software world, we recommend to take a\n"
-"look <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
-"article</a> which summarizes they way open source projects work very well. "
+"Thank you for using wger! wger is a collaborative open source project, made "
+"by fitness enthusiasts from around the world."
msgstr ""
-"wger Workout Manager, gönüllüler tarafından oluşturulmuştur,\n"
-"geliştirme süreci, ilgilenen herkes için açık ve serbestçe erişilebilirdir.\n"
-"Özgür yazılım dünyasında yeniyseniz, açık kaynaklı projelerin çok iyi "
-"çalıştığını\n"
-"özetleyen <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">bu\n"
-"makaleye</a> bir göz atmanızı tavsiye ederiz. "
-
-#: software/templates/contribute.html:16
-msgid ""
-"Any kind of contribution is appreciated and welcome.\n"
-"Use this opportunity and influence the direction of the\n"
-"project. "
-msgstr ""
-"Her türlü katkı takdir edilir ve memnuniyetle karşılanır.\n"
-"Bu fırsatı kullanın ve projenin yönünü etkileyin. "
-#: software/templates/contribute.html:23
-msgid "Use the site"
-msgstr "Siteyi kullanın"
+#: software/templates/about_us.html:18
+msgid "Source code"
+msgstr ""
-#: software/templates/contribute.html:24
-msgid ""
-"Simply use the site and tell your friends\n"
-"how useful it is! ;) . When you find something that you specially liked,\n"
-"could need some improvements or just doesn't work, tell us! This might not "
-"sound\n"
-"like much, but is incredibly important!"
+#: software/templates/about_us.html:20
+msgid "Get the source code of this application and its server on github"
msgstr ""
-"Yalnızca siteyi kullanın ve arkadaşlarınıza bunun\n"
-"ne kadar kullanışlı olduğunu söyleyin! ;). Özellikle beğendiğiniz,\n"
-"iyileştirmeye ihtiyaç duyabilecek veya çalışmayan bir şey bulduğunuzda bize "
-"söyleyin!\n"
-"Kulağa fazla bir şey gibi gelmeyebilir ama inanılmaz derecede önemlidir!"
-#: software/templates/contribute.html:31
-msgid "Submit exercises"
-msgstr "Egzersizleri gönderin"
+#: software/templates/about_us.html:25
+msgid "Have a problem or idea?"
+msgstr ""
-#: software/templates/contribute.html:32
+#: software/templates/about_us.html:27
msgid ""
-"Submit those cool exercises that you absolutely\n"
-"love and do every week but are not in the list yet. If you think some "
-"description\n"
-"is too short or some other detail is missing or could be improved, tell!"
+"Get in touch if something didn't behave as expected or if there is a feature "
+"that you feel is missing."
msgstr ""
-"Kesinlikle yaptığınız harika egzersizleri gönderin\n"
-"seviyorum ve her hafta yap ama henüz listede yok. Eğer bir açıklama "
-"düşünürsen\n"
-"çok kısa veya başka bir ayrıntı eksik veya iyileştirilebilir, söyle!"
-#: software/templates/contribute.html:44
-msgid ""
-"Do you want to use wger in your own language?\n"
-"Do you think the current translation could be improved?\n"
-"The translations are easily managed and edited online, if you are "
-"interested,\n"
-"visit the link and start translating."
+#: software/templates/about_us.html:32
+msgid "Say hi!"
msgstr ""
-"wger'ı kendi dilinizde kullanmak mı istiyorsunuz?\n"
-"Mevcut çevirinin iyileştirilebileceğini mi düşünüyorsunuz?\n"
-"Çeviriler çevrim içi olarak kolayca yönetilir ve düzenlenir, eğer\n"
-"ilgileniyorsanız bağlantıyı ziyaret edin ve çeviriye başlayın."
-#: software/templates/contribute.html:53
-msgid "Code"
-msgstr "Kod"
+#: software/templates/about_us.html:34
+msgid "If you want to chat with us, hop on the Discord server and get in touch"
+msgstr ""
-#: software/templates/contribute.html:54
+#: software/templates/about_us.html:39
+#, fuzzy
+#| msgid "Translate"
+msgid "Translation"
+msgstr "Çevir"
+
+#: software/templates/about_us.html:41
msgid ""
-"Obviously, you are highly encouraged to clone the\n"
-"repo and start hacking! Once you are ready, send a pull request and we\n"
-"will show the world. Take a look at the developer guide for more details\n"
-"on this."
+"This application is translated on weblate. If you also want to help, click "
+"the link and start translating"
msgstr ""
-"Açıkçası, büyük ölçüde\n"
-"repo ve hacklemeye başlayın! Hazır olduğunuzda, bir çekme talebi gönderin ve "
-"biz\n"
-"dünyaya gösterecek. Daha fazla ayrıntı için geliştirici kılavuzuna bir göz "
-"atın\n"
-"bunun üzerine."
-
-#: software/templates/contribute.html:66
+
+#: software/templates/about_us.html:50
msgid "Our goal"
msgstr "Hedefimiz"
-#: software/templates/contribute.html:69
+#: software/templates/about_us.html:53
msgid ""
"The goal is to build an awesome\n"
"and flexible fitness manager, along with a comprehensive and complete list "
@@ -4049,107 +3895,6 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr "100%% Ücretsiz <br> ve <br> Açık Kaynak"
-#: software/templates/issues.html:6
-msgid "Reporting a problem"
-msgstr "Sorun bildir"
-
-#: software/templates/issues.html:10
-msgid ""
-"\n"
-"No software is perfect. For some severe errors, an email will be "
-"automatically sent, but\n"
-"not always, so I depend on you reporting everything that didn't behave as "
-"expected.\n"
-"Please describe in as much detail as you can what you were doing when the "
-"error\n"
-"happened.\n"
-msgstr ""
-"\n"
-"Hiçbir yazılım mükemmel değildir. Bazı ciddi hatalar için otomatik olarak "
-"bir e-posta gönderilir, ancak\n"
-"her zaman değil, bu yüzden beklendiği gibi davranmayan her şeyi bildirmenize "
-"güveniyorum.\n"
-"Lütfen hata olduğunda ne yaptığınızı olabildiğince ayrıntılı olarak "
-"açıklayın\n"
-"olmuş.\n"
-
-#: software/templates/issues.html:21
-msgid "report problem to the issue tracker"
-msgstr "sorunu sorun izleyiciye bildirin"
-
-#: software/templates/issues.html:25
-msgid "Enhancements"
-msgstr "Geliştirmeler"
-
-#: software/templates/issues.html:27
-msgid ""
-"\n"
-"The issue tracker can also be used to document enhancements to the "
-"software.\n"
-"If you have some suggestions or think a feature is missing, feel\n"
-"free to open a ticket. This can be anything from a slight change to a whole\n"
-"new section of the site. Please keep in mind that not all wishes can be\n"
-"implemented."
-msgstr ""
-"\n"
-"Sorun izleyici, yazılımdaki geliştirmeleri belgelemek için de "
-"kullanılabilir.\n"
-"Bazı önerileriniz varsa veya bir özelliğin eksik olduğunu düşünüyorsanız,\n"
-"bilet açmak için ücretsiz. Bu, küçük bir değişiklikten bütüne her şey "
-"olabilir\n"
-"sitenin yeni bölümü. Lütfen tüm dileklerin olamayacağını unutmayın\n"
-"uygulandı."
-
-#: software/templates/issues.html:36
-msgid "report wish to the issue tracker"
-msgstr "sorun izleyiciye dilek bildir"
-
-#: software/templates/issues.html:41
-msgid "No Github account?"
-msgstr "Github hesabınız yok mu?"
-
-#: software/templates/issues.html:42
-msgid ""
-"Filing an issue requires a github account, if you don't\n"
-"have one and don't want to register, you can also send it to\n"
-"<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
-msgstr ""
-"Bir sorunu bildirmek için bir github hesabı gerekir, yoksa\n"
-"bir tane var ve kayıt olmak istemiyorsan, şu adrese de gönderebilirsin\n"
-" <a href=\"https://groups.google.com/group/wger\"> posta listesi </a>."
-
-#: software/templates/license.html:10
-msgid ""
-"wger Workout Manager is Free/Libre Open Source\n"
-"Software (FLOSS)."
-msgstr ""
-"wger Workout Manager Ücretsizdir / Libre Açık Kaynaktır\n"
-"Yazılım (FLOSS)."
-
-#: software/templates/license.html:22
-msgid ""
-"wger Workout Manager is released under the <strong>Affero GNU\n"
-"General Public License (AGPL) Version 3+</strong> and can (under the "
-"conditions\n"
-"of the license) be used, modified and distributed (also with modifications)\n"
-"without restrictions."
-msgstr ""
-"wger Workout Manager, <strong> Affero GNU altında piyasaya sürüldü\n"
-"Genel Kamu Lisansı (AGPL) Sürüm 3+ </strong> ve (koşullar altında\n"
-"lisans) kullanılabilir, değiştirilebilir ve dağıtılabilir (ayrıca "
-"değişikliklerle birlikte)\n"
-"Kısıtlamalar olmaksızın."
-
-#: software/templates/license.html:29
-msgid ""
-"A copy the license text is contained in every wger Workout\n"
-"Manager release (LICENSE.txt) and can be read online on the website of\n"
-"<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</a>."
-msgstr ""
-"Her wger Workout'ta lisans metninin bir kopyası bulunur\n"
-"Yönetici sürümü (LICENSE.txt) ve web sitesinde çevrimiçi olarak okunabilir\n"
-" <a href='https://www.gnu.org/licenses/agpl-3.0.en.html'> GNU projesi </a>."
-
#: utils/generic_views.py:261
msgid "Yes, delete"
msgstr "Evet, sil"
@@ -4343,6 +4088,274 @@ msgstr "Başarıyla silindi."
msgid "Delete weight entry for the %s"
msgstr "%s için ağırlık girişini silin"
+#~ msgid "Responsible for the content of this site as per German law §5 TMG:"
+#~ msgstr "Alman yasaları §5 TMG uyarınca bu sitenin içeriğinden sorumlu:"
+
+#~ msgid "GNUPG-Key:"
+#~ msgstr "GNUPG-Anahtarı:"
+
+#~ msgid "Get in touch"
+#~ msgstr "Temas kur"
+
+#~ msgid ""
+#~ "Thank you for your interest. Feel free to use any of the\n"
+#~ "ways below to send feedback you have about any aspect of the site. For\n"
+#~ "support, say hi\n"
+#~ "<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
+#~ "a bug, consider doing it through the <a href=\"%(issues)s\">issue "
+#~ "tracker</a>\n"
+#~ "."
+#~ msgstr ""
+#~ "İlginiz için teşekkürler. Herhangi birini kullanmaktan çekinmeyin\n"
+#~ "Sitenin herhangi bir yönü hakkında sahip olduğunuz geri bildirimleri "
+#~ "göndermek için aşağıdaki yollar. İçin\n"
+#~ "destek, selam söyle\n"
+#~ " <a href=\"%(discord)s\"> discord kanalında </a>, rapor etmek için\n"
+#~ "bir hata, bunu <a href=\"%(issues)s\"> sorun izleyicisi </a> aracılığıyla "
+#~ "yapmayı düşünün\n"
+#~ "."
+
+#~ msgid ""
+#~ "If you want to further help and improve this project,\n"
+#~ "you might also be interested <a href=\"%(contribute)s\">in contributing</"
+#~ "a>."
+#~ msgstr ""
+#~ "Bu projeye daha fazla yardım etmek ve onu iyileştirmek\n"
+#~ "istiyorsanız, <a href=\"%(contribute)s\">katkıda bulunmak</a> da ilginizi "
+#~ "çekebilir."
+
+#~ msgid "Feedback form"
+#~ msgstr "Geri bildirim formu"
+
+#~ msgid ""
+#~ "A simple contact form. Remember that\n"
+#~ "if you want an answer, you need to include some way to contact you."
+#~ msgstr ""
+#~ "Basit bir iletişim formu. Bunu hatırla\n"
+#~ "Bir cevap istiyorsanız, sizinle iletişim kurmanın bir yolunu eklemeniz "
+#~ "gerekir."
+
+#~ msgid "Twitter"
+#~ msgstr "Twitter"
+
+#~ msgid ""
+#~ "We are also on twitter. Write us and tell us what\n"
+#~ "you think! Except patches, don't send patches via twitter."
+#~ msgstr ""
+#~ "Biz de twitterdayız. Bize yazın ve bize ne söyleyin\n"
+#~ "sence! Yamalar dışında, twitter üzerinden yama göndermeyin."
+
+#~ msgid "Discord"
+#~ msgstr "Discord"
+
+#~ msgid ""
+#~ "Use the public group to get support for your\n"
+#~ "local wger installation, discuss issues or your new idea, etc.\n"
+#~ "(no registration needed)"
+#~ msgstr ""
+#~ "Yerel wger kurulumunuz için destek almak, sorunları\n"
+#~ "veya yeni fikrinizi tartışmak vb. için genel grubu kullanın\n"
+#~ "(kayıt gerekmez)"
+
+#~ msgid "Open feedback form"
+#~ msgstr "Geri bildirim formunu aç"
+
+#~ msgid "tweet to @wger_project"
+#~ msgstr "@wger_project tweetle"
+
+#~ msgid "Go to the discord server"
+#~ msgstr "Discord sunucusuna git"
+
+#~ msgid "Contribute!"
+#~ msgstr "Katkıda bulun!"
+
+#~ msgid "Problems and wishes"
+#~ msgstr "Sorunlar ve dilekler"
+
+#~ msgid "About"
+#~ msgstr "hakkında"
+
+#~ msgid ""
+#~ "wger Workout Manager is build by volunteers,\n"
+#~ "the development process is open and freely accessible to anybody "
+#~ "interested.\n"
+#~ "If you are new to the free software world, we recommend to take a\n"
+#~ "look <a href=\"http://schlitt.info/opensource/"
+#~ "blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
+#~ "article</a> which summarizes they way open source projects work very "
+#~ "well. "
+#~ msgstr ""
+#~ "wger Workout Manager, gönüllüler tarafından oluşturulmuştur,\n"
+#~ "geliştirme süreci, ilgilenen herkes için açık ve serbestçe "
+#~ "erişilebilirdir.\n"
+#~ "Özgür yazılım dünyasında yeniyseniz, açık kaynaklı projelerin çok iyi "
+#~ "çalıştığını\n"
+#~ "özetleyen <a href=\"http://schlitt.info/opensource/"
+#~ "blog/0541_10_golden_rules_for_starting_with_open_source.html\">bu\n"
+#~ "makaleye</a> bir göz atmanızı tavsiye ederiz. "
+
+#~ msgid ""
+#~ "Any kind of contribution is appreciated and welcome.\n"
+#~ "Use this opportunity and influence the direction of the\n"
+#~ "project. "
+#~ msgstr ""
+#~ "Her türlü katkı takdir edilir ve memnuniyetle karşılanır.\n"
+#~ "Bu fırsatı kullanın ve projenin yönünü etkileyin. "
+
+#~ msgid "Use the site"
+#~ msgstr "Siteyi kullanın"
+
+#~ msgid ""
+#~ "Simply use the site and tell your friends\n"
+#~ "how useful it is! ;) . When you find something that you specially liked,\n"
+#~ "could need some improvements or just doesn't work, tell us! This might "
+#~ "not sound\n"
+#~ "like much, but is incredibly important!"
+#~ msgstr ""
+#~ "Yalnızca siteyi kullanın ve arkadaşlarınıza bunun\n"
+#~ "ne kadar kullanışlı olduğunu söyleyin! ;). Özellikle beğendiğiniz,\n"
+#~ "iyileştirmeye ihtiyaç duyabilecek veya çalışmayan bir şey bulduğunuzda "
+#~ "bize söyleyin!\n"
+#~ "Kulağa fazla bir şey gibi gelmeyebilir ama inanılmaz derecede önemlidir!"
+
+#~ msgid "Submit exercises"
+#~ msgstr "Egzersizleri gönderin"
+
+#~ msgid ""
+#~ "Submit those cool exercises that you absolutely\n"
+#~ "love and do every week but are not in the list yet. If you think some "
+#~ "description\n"
+#~ "is too short or some other detail is missing or could be improved, tell!"
+#~ msgstr ""
+#~ "Kesinlikle yaptığınız harika egzersizleri gönderin\n"
+#~ "seviyorum ve her hafta yap ama henüz listede yok. Eğer bir açıklama "
+#~ "düşünürsen\n"
+#~ "çok kısa veya başka bir ayrıntı eksik veya iyileştirilebilir, söyle!"
+
+#~ msgid ""
+#~ "Do you want to use wger in your own language?\n"
+#~ "Do you think the current translation could be improved?\n"
+#~ "The translations are easily managed and edited online, if you are "
+#~ "interested,\n"
+#~ "visit the link and start translating."
+#~ msgstr ""
+#~ "wger'ı kendi dilinizde kullanmak mı istiyorsunuz?\n"
+#~ "Mevcut çevirinin iyileştirilebileceğini mi düşünüyorsunuz?\n"
+#~ "Çeviriler çevrim içi olarak kolayca yönetilir ve düzenlenir, eğer\n"
+#~ "ilgileniyorsanız bağlantıyı ziyaret edin ve çeviriye başlayın."
+
+#~ msgid "Code"
+#~ msgstr "Kod"
+
+#~ msgid ""
+#~ "Obviously, you are highly encouraged to clone the\n"
+#~ "repo and start hacking! Once you are ready, send a pull request and we\n"
+#~ "will show the world. Take a look at the developer guide for more details\n"
+#~ "on this."
+#~ msgstr ""
+#~ "Açıkçası, büyük ölçüde\n"
+#~ "repo ve hacklemeye başlayın! Hazır olduğunuzda, bir çekme talebi gönderin "
+#~ "ve biz\n"
+#~ "dünyaya gösterecek. Daha fazla ayrıntı için geliştirici kılavuzuna bir "
+#~ "göz atın\n"
+#~ "bunun üzerine."
+
+#~ msgid "Reporting a problem"
+#~ msgstr "Sorun bildir"
+
+#~ msgid ""
+#~ "\n"
+#~ "No software is perfect. For some severe errors, an email will be "
+#~ "automatically sent, but\n"
+#~ "not always, so I depend on you reporting everything that didn't behave as "
+#~ "expected.\n"
+#~ "Please describe in as much detail as you can what you were doing when the "
+#~ "error\n"
+#~ "happened.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Hiçbir yazılım mükemmel değildir. Bazı ciddi hatalar için otomatik olarak "
+#~ "bir e-posta gönderilir, ancak\n"
+#~ "her zaman değil, bu yüzden beklendiği gibi davranmayan her şeyi "
+#~ "bildirmenize güveniyorum.\n"
+#~ "Lütfen hata olduğunda ne yaptığınızı olabildiğince ayrıntılı olarak "
+#~ "açıklayın\n"
+#~ "olmuş.\n"
+
+#~ msgid "report problem to the issue tracker"
+#~ msgstr "sorunu sorun izleyiciye bildirin"
+
+#~ msgid "Enhancements"
+#~ msgstr "Geliştirmeler"
+
+#~ msgid ""
+#~ "\n"
+#~ "The issue tracker can also be used to document enhancements to the "
+#~ "software.\n"
+#~ "If you have some suggestions or think a feature is missing, feel\n"
+#~ "free to open a ticket. This can be anything from a slight change to a "
+#~ "whole\n"
+#~ "new section of the site. Please keep in mind that not all wishes can be\n"
+#~ "implemented."
+#~ msgstr ""
+#~ "\n"
+#~ "Sorun izleyici, yazılımdaki geliştirmeleri belgelemek için de "
+#~ "kullanılabilir.\n"
+#~ "Bazı önerileriniz varsa veya bir özelliğin eksik olduğunu "
+#~ "düşünüyorsanız,\n"
+#~ "bilet açmak için ücretsiz. Bu, küçük bir değişiklikten bütüne her şey "
+#~ "olabilir\n"
+#~ "sitenin yeni bölümü. Lütfen tüm dileklerin olamayacağını unutmayın\n"
+#~ "uygulandı."
+
+#~ msgid "report wish to the issue tracker"
+#~ msgstr "sorun izleyiciye dilek bildir"
+
+#~ msgid "No Github account?"
+#~ msgstr "Github hesabınız yok mu?"
+
+#~ msgid ""
+#~ "Filing an issue requires a github account, if you don't\n"
+#~ "have one and don't want to register, you can also send it to\n"
+#~ "<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
+#~ msgstr ""
+#~ "Bir sorunu bildirmek için bir github hesabı gerekir, yoksa\n"
+#~ "bir tane var ve kayıt olmak istemiyorsan, şu adrese de gönderebilirsin\n"
+#~ " <a href=\"https://groups.google.com/group/wger\"> posta listesi </a>."
+
+#~ msgid ""
+#~ "wger Workout Manager is Free/Libre Open Source\n"
+#~ "Software (FLOSS)."
+#~ msgstr ""
+#~ "wger Workout Manager Ücretsizdir / Libre Açık Kaynaktır\n"
+#~ "Yazılım (FLOSS)."
+
+#~ msgid ""
+#~ "wger Workout Manager is released under the <strong>Affero GNU\n"
+#~ "General Public License (AGPL) Version 3+</strong> and can (under the "
+#~ "conditions\n"
+#~ "of the license) be used, modified and distributed (also with "
+#~ "modifications)\n"
+#~ "without restrictions."
+#~ msgstr ""
+#~ "wger Workout Manager, <strong> Affero GNU altında piyasaya sürüldü\n"
+#~ "Genel Kamu Lisansı (AGPL) Sürüm 3+ </strong> ve (koşullar altında\n"
+#~ "lisans) kullanılabilir, değiştirilebilir ve dağıtılabilir (ayrıca "
+#~ "değişikliklerle birlikte)\n"
+#~ "Kısıtlamalar olmaksızın."
+
+#~ msgid ""
+#~ "A copy the license text is contained in every wger Workout\n"
+#~ "Manager release (LICENSE.txt) and can be read online on the website of\n"
+#~ "<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</"
+#~ "a>."
+#~ msgstr ""
+#~ "Her wger Workout'ta lisans metninin bir kopyası bulunur\n"
+#~ "Yönetici sürümü (LICENSE.txt) ve web sitesinde çevrimiçi olarak "
+#~ "okunabilir\n"
+#~ " <a href='https://www.gnu.org/licenses/agpl-3.0.en.html'> GNU projesi </"
+#~ "a>."
+
#~ msgid "Use pauses in workout timer"
#~ msgstr "Antrenman zamanlayıcısında duraklamaları kullanın"
diff --git a/wger/locale/uk/LC_MESSAGES/django.po b/wger/locale/uk/LC_MESSAGES/django.po
index 357adbf36..be818b169 100644
--- a/wger/locale/uk/LC_MESSAGES/django.po
+++ b/wger/locale/uk/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-17 15:00+0200\n"
+"POT-Creation-Date: 2021-08-17 17:23+0200\n"
"PO-Revision-Date: 2021-04-11 18:54+0000\n"
"Last-Translator: rge <[email protected]>\n"
"Language-Team: Ukrainian (http://www.transifex.com/rge/wger-workout-manager/"
@@ -21,10 +21,10 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 "
-"? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > "
-"14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % "
-"100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != "
+"11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % "
+"100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || "
+"(n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
"X-Generator: Weblate 4.8-dev\n"
#: config/models/gym_config.py:46 gym/templates/gym/list.html:50
@@ -50,7 +50,7 @@ msgstr "Вправи"
msgid "Ingredients"
msgstr "Інгредієнти"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:225
+#: config/templates/language/overview.html:4 core/templates/navigation.html:228
msgid "Languages"
msgstr "Мови"
@@ -226,8 +226,8 @@ msgstr "Моя класна програграма тренувань"
msgid "Empty placeholder schedule"
msgstr "Порожня програма-заповнювач"
-#: core/forms.py:61 core/templates/navigation.html:187
-#: core/templates/navigation.html:191 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:190
+#: core/templates/navigation.html:194 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "Вхід"
@@ -308,8 +308,8 @@ msgstr "Неправильний пароль"
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:187
-#: core/templates/navigation.html:192 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
+#: core/templates/navigation.html:195 core/templates/template.html:150
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -797,95 +797,10 @@ msgstr "Список ліцензій"
msgid "Nothing found"
msgstr "Нічого не знайдено"
-#: core/templates/misc/about.html:4
-msgid "About us"
-msgstr "Про нас"
-
-#: core/templates/misc/about.html:8
-msgid "Responsible for the content of this site as per German law §5 TMG:"
-msgstr ""
-"Відповідальний за зміст цього сайту, відповідно до німецького законодавства "
-"§5 TMG:"
-
-#: core/templates/misc/about.html:16
-msgid "GNUPG-Key:"
-msgstr "GNUPG-Ключ:"
-
-#: core/templates/misc/contact.html:4 core/templates/navigation.html:153
-#: core/templates/template_features.html:86
-#: software/templates/contribute.html:28
-msgid "Get in touch"
-msgstr "Написати нам"
-
-#: core/templates/misc/contact.html:10
-#, python-format
-msgid ""
-"Thank you for your interest. Feel free to use any of the\n"
-"ways below to send feedback you have about any aspect of the site. For\n"
-"support, say hi\n"
-"<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
-"a bug, consider doing it through the <a href=\"%(issues)s\">issue tracker</"
-"a>\n"
-"."
-msgstr ""
-
-#: core/templates/misc/contact.html:20
-#, python-format
-msgid ""
-"If you want to further help and improve this project,\n"
-"you might also be interested <a href=\"%(contribute)s\">in contributing</a>."
-msgstr ""
-"Якщо ви хочете додатково допомогти і вдосконалити цей проект, можливо, вас "
-"також зацікавить <a href=\"%(contribute)s\">внесення коштів</a>."
-
-#: core/templates/misc/contact.html:29
-msgid "Feedback form"
-msgstr "Форма відгуку"
-
-#: core/templates/misc/contact.html:30
-msgid ""
-"A simple contact form. Remember that\n"
-"if you want an answer, you need to include some way to contact you."
-msgstr ""
-"Проста контактна форма. Пам'ятайте, що якщо ви хочете отримати відповідь, "
-"вам потрібно включити певний спосіб зв’язку з вами."
-
-#: core/templates/misc/contact.html:35
-msgid "Twitter"
-msgstr "Твіттер"
-
-#: core/templates/misc/contact.html:36
-msgid ""
-"We are also on twitter. Write us and tell us what\n"
-"you think! Except patches, don't send patches via twitter."
-msgstr ""
-"Ми також є в Twitter. Напишіть нам і розкажіть що ви думаєте! Крім патчів, "
-"не надсилайте патчі через Twitter."
-
-#: core/templates/misc/contact.html:42
-msgid "Discord"
-msgstr ""
-
-#: core/templates/misc/contact.html:43
-msgid ""
-"Use the public group to get support for your\n"
-"local wger installation, discuss issues or your new idea, etc.\n"
-"(no registration needed)"
-msgstr ""
-"Скористайтеся громадської групою, щоб отримати підтримку для вашої локальної "
-"wger ​​установки, обговорити проблеми або вашу нову ідею, і т.п. (немає "
-"необхідності в реєстрації)"
-
-#: core/templates/misc/contact.html:49
-msgid "Open feedback form"
-msgstr "Відкрити форму зворотного зв'язку"
-
-#: core/templates/misc/contact.html:53
-msgid "tweet to @wger_project"
-msgstr ""
-
-#: core/templates/misc/contact.html:56
-msgid "Go to the discord server"
+#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/template_features.html:118
+#: core/templates/template_no_context.html:88
+msgid "Imprint"
msgstr ""
#: core/templates/misc/fragments/shariff_modal.html:6
@@ -979,7 +894,7 @@ msgid "Add new exercise"
msgstr "Додати нову вправу"
#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:223
+#: core/templates/navigation.html:226
msgid "Administration"
msgstr "Адміністрація"
@@ -1046,68 +961,62 @@ msgid "About this software"
msgstr "Про це програмне забезпечення"
#: core/templates/navigation.html:151 core/templates/template_features.html:83
-#: software/templates/contribute.html:6
-msgid "Contribute!"
-msgstr "Сприяйте!"
-
-#: core/templates/navigation.html:152
-msgid "Problems and wishes"
-msgstr "Проблеми та побажання"
+#: software/templates/about_us.html:5
+msgid "About us"
+msgstr "Про нас"
-#: core/templates/navigation.html:155 software/templates/features.html:209
+#: core/templates/navigation.html:153 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:156 software/templates/license.html:7
-#: utils/models.py:40
+#: core/templates/navigation.html:157 utils/models.py:40
msgid "License"
msgstr "Ліцензія"
-#: core/templates/navigation.html:160
+#: core/templates/navigation.html:163
msgid "Developer documentation"
msgstr "Документація для розробників"
-#: core/templates/navigation.html:166 software/templates/contribute.html:59
+#: core/templates/navigation.html:169
msgid "Get the code"
msgstr "Отримати код"
-#: core/templates/navigation.html:172 core/templates/template.html:193
-#: core/templates/template_features.html:103
-#: software/templates/contribute.html:43 software/templates/contribute.html:50
+#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/template_features.html:100
msgid "Translate"
msgstr "Перекласти"
-#: core/templates/navigation.html:193 core/templates/user/login.html:28
+#: core/templates/navigation.html:196 core/templates/user/login.html:28
msgid "Reset password"
msgstr "Скинути пароль"
-#: core/templates/navigation.html:206
+#: core/templates/navigation.html:209
msgid "My preferences"
msgstr "Мої налаштування"
-#: core/templates/navigation.html:213
+#: core/templates/navigation.html:216
msgid "Logout"
msgstr "Вийти"
-#: core/templates/navigation.html:228
+#: core/templates/navigation.html:231
msgid "Licenses"
msgstr "Ліцензії"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:234
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "Одиниці повторень"
-#: core/templates/navigation.html:234 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "Одиниця ваги"
-#: core/templates/navigation.html:237 core/templates/user/list.html:4
+#: core/templates/navigation.html:240 core/templates/user/list.html:4
msgid "User list"
msgstr "Список користувачів"
-#: core/templates/navigation.html:238
+#: core/templates/navigation.html:241
msgid "Gyms"
msgstr "Тренажерні зали"
@@ -1227,18 +1136,12 @@ msgstr ""
msgid "Create some demo entries"
msgstr "Створіть деякі демонстраційні записи"
-#: core/templates/template.html:201 core/templates/template_features.html:121
-#: core/templates/template_no_context.html:88
-msgid "About"
-msgstr "Про"
-
-#: core/templates/template.html:202 core/templates/template_features.html:125
+#: core/templates/template.html:202 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "Умови надання послуг"
#: core/templates/template.html:209 core/templates/template.html:210
-#: software/templates/license.html:18 software/templates/license.html:19
msgid "Released under the Affero GPL"
msgstr "Випущено згідно з Affero GPL"
@@ -1597,15 +1500,15 @@ msgstr ""
msgid "Rest day"
msgstr "День відпочинку"
-#: core/views/misc.py:199
+#: core/views/misc.py:184
msgid "Feedback"
msgstr "Відгук"
-#: core/views/misc.py:218 weight/templates/import_csv_form.html:9
+#: core/views/misc.py:203 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "Надіслати"
-#: core/views/misc.py:226
+#: core/views/misc.py:211
msgid "Your feedback was successfully sent. Thank you!"
msgstr "Ваш відгук успішно надіслано. Дякуємо!"
@@ -1779,7 +1682,6 @@ msgstr "назва вправи"
#: exercises/templates/exercise/overview.html:118
#: exercises/templates/muscles/overview.html:114
#: nutrition/templates/ingredient/overview.html:85
-#: software/templates/contribute.html:39
msgid "Only registered users can do this"
msgstr "Це можуть робити лише зареєстровані користувачі"
@@ -1985,7 +1887,7 @@ msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246 software/templates/contribute.html:37
+#: exercises/views/exercises.py:246
msgid "Add exercise"
msgstr "Додати вправу"
@@ -3741,108 +3643,55 @@ msgstr "Додати нову одиницю ваги"
msgid "Edit a weight unit to ingredient connection"
msgstr "Змінити одиницю ваги з'єднання інгредієнтів"
-#: software/templates/contribute.html:9
-msgid ""
-"wger Workout Manager is build by volunteers,\n"
-"the development process is open and freely accessible to anybody "
-"interested.\n"
-"If you are new to the free software world, we recommend to take a\n"
-"look <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
-"article</a> which summarizes they way open source projects work very well. "
-msgstr ""
-"wger Workout Manager створений волонтерами, \n"
-"процесс програмування відкритий і знаходиться у вільному доступі всім "
-"охочим. \n"
-"Якщо ви новачок в сфері вільного програмного забезпечення, ми рекомендуємо "
-"вам переглянути <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">цю статтю</"
-"a>, яка дуже доступно пояснює як працюють проекти з відкритим кодом."
-
-#: software/templates/contribute.html:16
+#: software/templates/about_us.html:9
msgid ""
-"Any kind of contribution is appreciated and welcome.\n"
-"Use this opportunity and influence the direction of the\n"
-"project. "
+"Thank you for using wger! wger is a collaborative open source project, made "
+"by fitness enthusiasts from around the world."
msgstr ""
-"Будь-який внесок цінується і вітається. \n"
-"Скористайтеся цією можливістю і ви вплинете на напрямок розвитку проекту."
-#: software/templates/contribute.html:23
-msgid "Use the site"
-msgstr "Використовуйте сайт"
+#: software/templates/about_us.html:18
+msgid "Source code"
+msgstr ""
-#: software/templates/contribute.html:24
-msgid ""
-"Simply use the site and tell your friends\n"
-"how useful it is! ;) . When you find something that you specially liked,\n"
-"could need some improvements or just doesn't work, tell us! This might not "
-"sound\n"
-"like much, but is incredibly important!"
-msgstr ""
-"Просто користайтеся цим сайтом і розкажіть своїм друзям який він "
-"класний! ;). Якщо ви знайдете щось, що вам особливо подобається, чи потребує "
-"поліпшення або просто не працює, скажіть нам! Це може здатися незначним, але "
-"це неймовірно важливо!"
-
-#: software/templates/contribute.html:31
-msgid "Submit exercises"
-msgstr "Надіслати вправи"
-
-#: software/templates/contribute.html:32
+#: software/templates/about_us.html:20
+msgid "Get the source code of this application and its server on github"
+msgstr ""
+
+#: software/templates/about_us.html:25
+msgid "Have a problem or idea?"
+msgstr ""
+
+#: software/templates/about_us.html:27
msgid ""
-"Submit those cool exercises that you absolutely\n"
-"love and do every week but are not in the list yet. If you think some "
-"description\n"
-"is too short or some other detail is missing or could be improved, tell!"
+"Get in touch if something didn't behave as expected or if there is a feature "
+"that you feel is missing."
msgstr ""
-"Додайте ваші улюблені вправи, які ви регулярно виконуєте, але яких ще немає "
-"в списку.\n"
-"Якщо ви вважаєте, що деякі описи занадто короткі, або відсутня якась інша "
-"деталь, або ви можете його покращити, скажіть!"
-#: software/templates/contribute.html:44
+#: software/templates/about_us.html:32
+msgid "Say hi!"
+msgstr ""
+
+#: software/templates/about_us.html:34
+msgid "If you want to chat with us, hop on the Discord server and get in touch"
+msgstr ""
+
+#: software/templates/about_us.html:39
#, fuzzy
-#| msgid ""
-#| "Do you want to use wger in your own language?\n"
-#| "Do you think the current translation could be improved?\n"
-#| "The translations are easily managed and edited online, if you are "
-#| "interested,\n"
-#| "go to the transifex site, request access and we will set everything\n"
-#| "up. "
-msgid ""
-"Do you want to use wger in your own language?\n"
-"Do you think the current translation could be improved?\n"
-"The translations are easily managed and edited online, if you are "
-"interested,\n"
-"visit the link and start translating."
-msgstr ""
-"Ви хочете використовувати wger на вашій рідній мові?\n"
-"Чи вважаєте ви, що поточний переклад можна покращити?\n"
-"Переклади легко керуються та редагуються онлайн. \n"
-"Якщо ви зацікавлені, перейдіть на сайт transifex, запитайте про доступ і ми "
-"все встановимо."
-
-#: software/templates/contribute.html:53
-msgid "Code"
-msgstr "Код"
-
-#: software/templates/contribute.html:54
+#| msgid "Translate"
+msgid "Translation"
+msgstr "Перекласти"
+
+#: software/templates/about_us.html:41
msgid ""
-"Obviously, you are highly encouraged to clone the\n"
-"repo and start hacking! Once you are ready, send a pull request and we\n"
-"will show the world. Take a look at the developer guide for more details\n"
-"on this."
+"This application is translated on weblate. If you also want to help, click "
+"the link and start translating"
msgstr ""
-"Очевидно, вам дуже не терпиться клонувати репозиторій і починати "
-"хакерствувати! Коли ви будете готові, відправте патч і ми покажемо його "
-"світу. Погляньте на посібник розробника для більш докладної інформації."
-#: software/templates/contribute.html:66
+#: software/templates/about_us.html:50
msgid "Our goal"
msgstr "Наша мета"
-#: software/templates/contribute.html:69
+#: software/templates/about_us.html:53
msgid ""
"The goal is to build an awesome\n"
"and flexible fitness manager, along with a comprehensive and complete list "
@@ -4014,101 +3863,6 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr "100%% Безкоштовне <br>і <br>Відкрите програмне забезпечення"
-#: software/templates/issues.html:6
-msgid "Reporting a problem"
-msgstr "Повідомлення про проблему"
-
-#: software/templates/issues.html:10
-msgid ""
-"\n"
-"No software is perfect. For some severe errors, an email will be "
-"automatically sent, but\n"
-"not always, so I depend on you reporting everything that didn't behave as "
-"expected.\n"
-"Please describe in as much detail as you can what you were doing when the "
-"error\n"
-"happened.\n"
-msgstr ""
-"\n"
-"Немає досконалого програмного забезпечення. При деяких серйозних помилках "
-"автоматично буде надсилатися електронне повідомлення, але не завжди, так що "
-"я покладаюся на вашу звітність за все, що не веде себе так, як очікувалося. "
-"Будь ласка, опишіть якомого докладніше, що ви робили, коли сталася помилка.\n"
-
-#: software/templates/issues.html:21
-msgid "report problem to the issue tracker"
-msgstr "повідомити про проблему в систему стеження за помилками"
-
-#: software/templates/issues.html:25
-msgid "Enhancements"
-msgstr "Покращення"
-
-#: software/templates/issues.html:27
-msgid ""
-"\n"
-"The issue tracker can also be used to document enhancements to the "
-"software.\n"
-"If you have some suggestions or think a feature is missing, feel\n"
-"free to open a ticket. This can be anything from a slight change to a whole\n"
-"new section of the site. Please keep in mind that not all wishes can be\n"
-"implemented."
-msgstr ""
-"\n"
-"Системe стеження проблем можна також використовувати для документування "
-"удосконалень програмного забезпечення. Якщо у вас є пропозиції або ви "
-"думаєте, що функція відсутня, відкрийте квиток. Це може бути що завгодно від "
-"невеликої зміни до зміни цілого нового розділу сайту. Будь ласка, майте на "
-"увазі, що не всі побажання можуть бути реалізовані."
-
-#: software/templates/issues.html:36
-msgid "report wish to the issue tracker"
-msgstr "повідомити про побажання в систему стеження за проблемами"
-
-#: software/templates/issues.html:41
-msgid "No Github account?"
-msgstr "Немає облікового запису Github?"
-
-#: software/templates/issues.html:42
-msgid ""
-"Filing an issue requires a github account, if you don't\n"
-"have one and don't want to register, you can also send it to\n"
-"<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
-msgstr ""
-"Подача питання вимагає наявність облікового запису в github, якщо його у вас "
-"немає або ви не хочете реєструватися, ви можете його також вислати в <a href="
-"\"https://groups.google.com/group/wger\">список розсилки</a>."
-
-#: software/templates/license.html:10
-msgid ""
-"wger Workout Manager is Free/Libre Open Source\n"
-"Software (FLOSS)."
-msgstr ""
-"wger Workout Manager це вільне/безкоштовне програмне забезпечення з "
-"відкритим кодом (FLOSS)"
-
-#: software/templates/license.html:22
-msgid ""
-"wger Workout Manager is released under the <strong>Affero GNU\n"
-"General Public License (AGPL) Version 3+</strong> and can (under the "
-"conditions\n"
-"of the license) be used, modified and distributed (also with modifications)\n"
-"without restrictions."
-msgstr ""
-"wger Workout Manager випущений під ліцензією <strong>GNU Affero General "
-"Public License (AGPL) Версії 3+</strong> і може (в умовах ліцензії) "
-"використовуватись, змінюватись і розповсюджуватись (також зі змінами) без "
-"обмежень."
-
-#: software/templates/license.html:29
-msgid ""
-"A copy the license text is contained in every wger Workout\n"
-"Manager release (LICENSE.txt) and can be read online on the website of\n"
-"<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</a>."
-msgstr ""
-"Копія ліцензійного тексту міститься в кожному релізі wger Workout\n"
-"Manager (LICENSE.txt) і можна прочитати онлайн на веб-сайті <a href='https://"
-"www.gnu.org/licenses/agpl-3.0.en.html'>GNU проекту</a>."
-
#: utils/generic_views.py:261
msgid "Yes, delete"
msgstr "Так, вилучити"
@@ -4294,6 +4048,243 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Responsible for the content of this site as per German law §5 TMG:"
+#~ msgstr ""
+#~ "Відповідальний за зміст цього сайту, відповідно до німецького "
+#~ "законодавства §5 TMG:"
+
+#~ msgid "GNUPG-Key:"
+#~ msgstr "GNUPG-Ключ:"
+
+#~ msgid "Get in touch"
+#~ msgstr "Написати нам"
+
+#~ msgid ""
+#~ "If you want to further help and improve this project,\n"
+#~ "you might also be interested <a href=\"%(contribute)s\">in contributing</"
+#~ "a>."
+#~ msgstr ""
+#~ "Якщо ви хочете додатково допомогти і вдосконалити цей проект, можливо, "
+#~ "вас також зацікавить <a href=\"%(contribute)s\">внесення коштів</a>."
+
+#~ msgid "Feedback form"
+#~ msgstr "Форма відгуку"
+
+#~ msgid ""
+#~ "A simple contact form. Remember that\n"
+#~ "if you want an answer, you need to include some way to contact you."
+#~ msgstr ""
+#~ "Проста контактна форма. Пам'ятайте, що якщо ви хочете отримати відповідь, "
+#~ "вам потрібно включити певний спосіб зв’язку з вами."
+
+#~ msgid "Twitter"
+#~ msgstr "Твіттер"
+
+#~ msgid ""
+#~ "We are also on twitter. Write us and tell us what\n"
+#~ "you think! Except patches, don't send patches via twitter."
+#~ msgstr ""
+#~ "Ми також є в Twitter. Напишіть нам і розкажіть що ви думаєте! Крім "
+#~ "патчів, не надсилайте патчі через Twitter."
+
+#~ msgid ""
+#~ "Use the public group to get support for your\n"
+#~ "local wger installation, discuss issues or your new idea, etc.\n"
+#~ "(no registration needed)"
+#~ msgstr ""
+#~ "Скористайтеся громадської групою, щоб отримати підтримку для вашої "
+#~ "локальної wger ​​установки, обговорити проблеми або вашу нову ідею, і т.п. "
+#~ "(немає необхідності в реєстрації)"
+
+#~ msgid "Open feedback form"
+#~ msgstr "Відкрити форму зворотного зв'язку"
+
+#~ msgid "Contribute!"
+#~ msgstr "Сприяйте!"
+
+#~ msgid "Problems and wishes"
+#~ msgstr "Проблеми та побажання"
+
+#~ msgid "About"
+#~ msgstr "Про"
+
+#~ msgid ""
+#~ "wger Workout Manager is build by volunteers,\n"
+#~ "the development process is open and freely accessible to anybody "
+#~ "interested.\n"
+#~ "If you are new to the free software world, we recommend to take a\n"
+#~ "look <a href=\"http://schlitt.info/opensource/"
+#~ "blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
+#~ "article</a> which summarizes they way open source projects work very "
+#~ "well. "
+#~ msgstr ""
+#~ "wger Workout Manager створений волонтерами, \n"
+#~ "процесс програмування відкритий і знаходиться у вільному доступі всім "
+#~ "охочим. \n"
+#~ "Якщо ви новачок в сфері вільного програмного забезпечення, ми "
+#~ "рекомендуємо вам переглянути <a href=\"http://schlitt.info/opensource/"
+#~ "blog/0541_10_golden_rules_for_starting_with_open_source.html\">цю статтю</"
+#~ "a>, яка дуже доступно пояснює як працюють проекти з відкритим кодом."
+
+#~ msgid ""
+#~ "Any kind of contribution is appreciated and welcome.\n"
+#~ "Use this opportunity and influence the direction of the\n"
+#~ "project. "
+#~ msgstr ""
+#~ "Будь-який внесок цінується і вітається. \n"
+#~ "Скористайтеся цією можливістю і ви вплинете на напрямок розвитку проекту."
+
+#~ msgid "Use the site"
+#~ msgstr "Використовуйте сайт"
+
+#~ msgid ""
+#~ "Simply use the site and tell your friends\n"
+#~ "how useful it is! ;) . When you find something that you specially liked,\n"
+#~ "could need some improvements or just doesn't work, tell us! This might "
+#~ "not sound\n"
+#~ "like much, but is incredibly important!"
+#~ msgstr ""
+#~ "Просто користайтеся цим сайтом і розкажіть своїм друзям який він "
+#~ "класний! ;). Якщо ви знайдете щось, що вам особливо подобається, чи "
+#~ "потребує поліпшення або просто не працює, скажіть нам! Це може здатися "
+#~ "незначним, але це неймовірно важливо!"
+
+#~ msgid "Submit exercises"
+#~ msgstr "Надіслати вправи"
+
+#~ msgid ""
+#~ "Submit those cool exercises that you absolutely\n"
+#~ "love and do every week but are not in the list yet. If you think some "
+#~ "description\n"
+#~ "is too short or some other detail is missing or could be improved, tell!"
+#~ msgstr ""
+#~ "Додайте ваші улюблені вправи, які ви регулярно виконуєте, але яких ще "
+#~ "немає в списку.\n"
+#~ "Якщо ви вважаєте, що деякі описи занадто короткі, або відсутня якась інша "
+#~ "деталь, або ви можете його покращити, скажіть!"
+
+#, fuzzy
+#~| msgid ""
+#~| "Do you want to use wger in your own language?\n"
+#~| "Do you think the current translation could be improved?\n"
+#~| "The translations are easily managed and edited online, if you are "
+#~| "interested,\n"
+#~| "go to the transifex site, request access and we will set everything\n"
+#~| "up. "
+#~ msgid ""
+#~ "Do you want to use wger in your own language?\n"
+#~ "Do you think the current translation could be improved?\n"
+#~ "The translations are easily managed and edited online, if you are "
+#~ "interested,\n"
+#~ "visit the link and start translating."
+#~ msgstr ""
+#~ "Ви хочете використовувати wger на вашій рідній мові?\n"
+#~ "Чи вважаєте ви, що поточний переклад можна покращити?\n"
+#~ "Переклади легко керуються та редагуються онлайн. \n"
+#~ "Якщо ви зацікавлені, перейдіть на сайт transifex, запитайте про доступ і "
+#~ "ми все встановимо."
+
+#~ msgid "Code"
+#~ msgstr "Код"
+
+#~ msgid ""
+#~ "Obviously, you are highly encouraged to clone the\n"
+#~ "repo and start hacking! Once you are ready, send a pull request and we\n"
+#~ "will show the world. Take a look at the developer guide for more details\n"
+#~ "on this."
+#~ msgstr ""
+#~ "Очевидно, вам дуже не терпиться клонувати репозиторій і починати "
+#~ "хакерствувати! Коли ви будете готові, відправте патч і ми покажемо його "
+#~ "світу. Погляньте на посібник розробника для більш докладної інформації."
+
+#~ msgid "Reporting a problem"
+#~ msgstr "Повідомлення про проблему"
+
+#~ msgid ""
+#~ "\n"
+#~ "No software is perfect. For some severe errors, an email will be "
+#~ "automatically sent, but\n"
+#~ "not always, so I depend on you reporting everything that didn't behave as "
+#~ "expected.\n"
+#~ "Please describe in as much detail as you can what you were doing when the "
+#~ "error\n"
+#~ "happened.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Немає досконалого програмного забезпечення. При деяких серйозних помилках "
+#~ "автоматично буде надсилатися електронне повідомлення, але не завжди, так "
+#~ "що я покладаюся на вашу звітність за все, що не веде себе так, як "
+#~ "очікувалося. Будь ласка, опишіть якомого докладніше, що ви робили, коли "
+#~ "сталася помилка.\n"
+
+#~ msgid "report problem to the issue tracker"
+#~ msgstr "повідомити про проблему в систему стеження за помилками"
+
+#~ msgid "Enhancements"
+#~ msgstr "Покращення"
+
+#~ msgid ""
+#~ "\n"
+#~ "The issue tracker can also be used to document enhancements to the "
+#~ "software.\n"
+#~ "If you have some suggestions or think a feature is missing, feel\n"
+#~ "free to open a ticket. This can be anything from a slight change to a "
+#~ "whole\n"
+#~ "new section of the site. Please keep in mind that not all wishes can be\n"
+#~ "implemented."
+#~ msgstr ""
+#~ "\n"
+#~ "Системe стеження проблем можна також використовувати для документування "
+#~ "удосконалень програмного забезпечення. Якщо у вас є пропозиції або ви "
+#~ "думаєте, що функція відсутня, відкрийте квиток. Це може бути що завгодно "
+#~ "від невеликої зміни до зміни цілого нового розділу сайту. Будь ласка, "
+#~ "майте на увазі, що не всі побажання можуть бути реалізовані."
+
+#~ msgid "report wish to the issue tracker"
+#~ msgstr "повідомити про побажання в систему стеження за проблемами"
+
+#~ msgid "No Github account?"
+#~ msgstr "Немає облікового запису Github?"
+
+#~ msgid ""
+#~ "Filing an issue requires a github account, if you don't\n"
+#~ "have one and don't want to register, you can also send it to\n"
+#~ "<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
+#~ msgstr ""
+#~ "Подача питання вимагає наявність облікового запису в github, якщо його у "
+#~ "вас немає або ви не хочете реєструватися, ви можете його також вислати в "
+#~ "<a href=\"https://groups.google.com/group/wger\">список розсилки</a>."
+
+#~ msgid ""
+#~ "wger Workout Manager is Free/Libre Open Source\n"
+#~ "Software (FLOSS)."
+#~ msgstr ""
+#~ "wger Workout Manager це вільне/безкоштовне програмне забезпечення з "
+#~ "відкритим кодом (FLOSS)"
+
+#~ msgid ""
+#~ "wger Workout Manager is released under the <strong>Affero GNU\n"
+#~ "General Public License (AGPL) Version 3+</strong> and can (under the "
+#~ "conditions\n"
+#~ "of the license) be used, modified and distributed (also with "
+#~ "modifications)\n"
+#~ "without restrictions."
+#~ msgstr ""
+#~ "wger Workout Manager випущений під ліцензією <strong>GNU Affero General "
+#~ "Public License (AGPL) Версії 3+</strong> і може (в умовах ліцензії) "
+#~ "використовуватись, змінюватись і розповсюджуватись (також зі змінами) без "
+#~ "обмежень."
+
+#~ msgid ""
+#~ "A copy the license text is contained in every wger Workout\n"
+#~ "Manager release (LICENSE.txt) and can be read online on the website of\n"
+#~ "<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</"
+#~ "a>."
+#~ msgstr ""
+#~ "Копія ліцензійного тексту міститься в кожному релізі wger Workout\n"
+#~ "Manager (LICENSE.txt) і можна прочитати онлайн на веб-сайті <a "
+#~ "href='https://www.gnu.org/licenses/agpl-3.0.en.html'>GNU проекту</a>."
+
#~ msgid "Use pauses in workout timer"
#~ msgstr "Використовувати паузи в таймері тренування"
diff --git a/wger/locale/zh_CN/LC_MESSAGES/django.po b/wger/locale/zh_CN/LC_MESSAGES/django.po
index e6fb9de1b..c4ff60195 100644
--- a/wger/locale/zh_CN/LC_MESSAGES/django.po
+++ b/wger/locale/zh_CN/LC_MESSAGES/django.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: wger Workout Manager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-17 15:00+0200\n"
+"POT-Creation-Date: 2021-08-17 17:23+0200\n"
"PO-Revision-Date: 2021-05-27 16:04+0000\n"
"Last-Translator: 猫猫头 <[email protected]>\n"
"Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -48,7 +48,7 @@ msgstr "练习"
msgid "Ingredients"
msgstr "食谱"
-#: config/templates/language/overview.html:4 core/templates/navigation.html:225
+#: config/templates/language/overview.html:4 core/templates/navigation.html:228
msgid "Languages"
msgstr "语言"
@@ -223,8 +223,8 @@ msgstr "我酷酷的健身日程"
msgid "Empty placeholder schedule"
msgstr ""
-#: core/forms.py:61 core/templates/navigation.html:187
-#: core/templates/navigation.html:191 core/templates/user/login.html:4
+#: core/forms.py:61 core/templates/navigation.html:190
+#: core/templates/navigation.html:194 core/templates/user/login.html:4
#: software/templates/features.html:43
msgid "Login"
msgstr "登录"
@@ -299,8 +299,8 @@ msgstr "密码无效"
msgid "The form is secured with reCAPTCHA"
msgstr ""
-#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:187
-#: core/templates/navigation.html:192 core/templates/template.html:150
+#: core/forms.py:226 core/forms.py:245 core/templates/navigation.html:190
+#: core/templates/navigation.html:195 core/templates/template.html:150
#: core/templates/user/login.html:20 core/views/user.py:293
#: software/templates/features.html:38
msgid "Register"
@@ -786,95 +786,11 @@ msgstr "许可协议列表"
msgid "Nothing found"
msgstr "没有找到任何内容"
-#: core/templates/misc/about.html:4
-msgid "About us"
-msgstr "关于我们"
-
-#: core/templates/misc/about.html:8
-msgid "Responsible for the content of this site as per German law §5 TMG:"
-msgstr "根据德国法律§5 TMG,对本网站的内容负责。"
-
-#: core/templates/misc/about.html:16
-msgid "GNUPG-Key:"
-msgstr "GnuPG-公钥:"
-
-#: core/templates/misc/contact.html:4 core/templates/navigation.html:153
-#: core/templates/template_features.html:86
-#: software/templates/contribute.html:28
-msgid "Get in touch"
-msgstr "联系我们"
-
-#: core/templates/misc/contact.html:10
-#, python-format
-msgid ""
-"Thank you for your interest. Feel free to use any of the\n"
-"ways below to send feedback you have about any aspect of the site. For\n"
-"support, say hi\n"
-"<a href=\"%(discord)s\">on the discord channel</a>, to report\n"
-"a bug, consider doing it through the <a href=\"%(issues)s\">issue tracker</"
-"a>\n"
-"."
-msgstr ""
-
-#: core/templates/misc/contact.html:20
-#, python-format
-msgid ""
-"If you want to further help and improve this project,\n"
-"you might also be interested <a href=\"%(contribute)s\">in contributing</a>."
-msgstr ""
-"如果你想要更近一步地帮助提升这个项目,你或许也会对 <a href=\"%(contribute)s\">"
-"感兴趣</a>."
-
-#: core/templates/misc/contact.html:29
-msgid "Feedback form"
-msgstr "反馈表格"
-
-#: core/templates/misc/contact.html:30
-msgid ""
-"A simple contact form. Remember that\n"
-"if you want an answer, you need to include some way to contact you."
-msgstr ""
-"一个简单的联系表格.记住,\n"
-"如果你想要一个答案,你需要留下你的联系方式."
-
-#: core/templates/misc/contact.html:35
-msgid "Twitter"
-msgstr "推特"
-
-#: core/templates/misc/contact.html:36
-msgid ""
-"We are also on twitter. Write us and tell us what\n"
-"you think! Except patches, don't send patches via twitter."
-msgstr ""
-"我们也在推特上.推特我们告诉我们你的想法!当然,除了补丁包,请不要通过推特发送补"
-"丁包."
-
-#: core/templates/misc/contact.html:42
-msgid "Discord"
-msgstr "不一致"
-
-#: core/templates/misc/contact.html:43
-msgid ""
-"Use the public group to get support for your\n"
-"local wger installation, discuss issues or your new idea, etc.\n"
-"(no registration needed)"
+#: core/templates/misc/about.html:4 core/templates/template.html:201
+#: core/templates/template_features.html:118
+#: core/templates/template_no_context.html:88
+msgid "Imprint"
msgstr ""
-"在公开小组, 你可以获取wger本地安装的支持,\n"
-"你也可以讨论问题,表达你的想法等.\n"
-"(无需注册)"
-
-#: core/templates/misc/contact.html:49
-msgid "Open feedback form"
-msgstr "打开反馈表单"
-
-#: core/templates/misc/contact.html:53
-msgid "tweet to @wger_project"
-msgstr "发推给@wger_project"
-
-#: core/templates/misc/contact.html:56
-#, fuzzy
-msgid "Go to the discord server"
-msgstr "前往Discord服务器"
#: core/templates/misc/fragments/shariff_modal.html:6
msgid "Share this page"
@@ -963,7 +879,7 @@ msgid "Add new exercise"
msgstr "新增健身项目"
#: core/templates/navigation.html:75 core/templates/navigation.html:134
-#: core/templates/navigation.html:223
+#: core/templates/navigation.html:226
msgid "Administration"
msgstr "管理"
@@ -1030,68 +946,62 @@ msgid "About this software"
msgstr "关于软件"
#: core/templates/navigation.html:151 core/templates/template_features.html:83
-#: software/templates/contribute.html:6
-msgid "Contribute!"
-msgstr "贡献!"
-
-#: core/templates/navigation.html:152
-msgid "Problems and wishes"
-msgstr "问题和期望"
+#: software/templates/about_us.html:5
+msgid "About us"
+msgstr "关于我们"
-#: core/templates/navigation.html:155 software/templates/features.html:209
+#: core/templates/navigation.html:153 software/templates/features.html:209
msgid "REST API"
msgstr "REST API"
-#: core/templates/navigation.html:156 software/templates/license.html:7
-#: utils/models.py:40
+#: core/templates/navigation.html:157 utils/models.py:40
msgid "License"
msgstr "许可协议"
-#: core/templates/navigation.html:160
+#: core/templates/navigation.html:163
msgid "Developer documentation"
msgstr "开发者文档"
-#: core/templates/navigation.html:166 software/templates/contribute.html:59
+#: core/templates/navigation.html:169
msgid "Get the code"
msgstr "获取源码"
-#: core/templates/navigation.html:172 core/templates/template.html:193
-#: core/templates/template_features.html:103
-#: software/templates/contribute.html:43 software/templates/contribute.html:50
+#: core/templates/navigation.html:175 core/templates/template.html:193
+#: core/templates/template_features.html:100
msgid "Translate"
msgstr "翻译"
-#: core/templates/navigation.html:193 core/templates/user/login.html:28
+#: core/templates/navigation.html:196 core/templates/user/login.html:28
msgid "Reset password"
msgstr "重设密码"
-#: core/templates/navigation.html:206
+#: core/templates/navigation.html:209
msgid "My preferences"
msgstr "我的首选项"
-#: core/templates/navigation.html:213
+#: core/templates/navigation.html:216
msgid "Logout"
msgstr "退出"
-#: core/templates/navigation.html:228
+#: core/templates/navigation.html:231
msgid "Licenses"
msgstr "许可协议"
-#: core/templates/navigation.html:231
+#: core/templates/navigation.html:234
#: core/templates/repetition_unit/list.html:4
msgid "Repetition units"
msgstr "重复单元"
-#: core/templates/navigation.html:234 core/templates/weight_unit/list.html:4
+#: core/templates/navigation.html:237 core/templates/weight_unit/list.html:4
#: nutrition/templates/ingredient/view.html:174
msgid "Weight units"
msgstr "重量单位"
-#: core/templates/navigation.html:237 core/templates/user/list.html:4
+#: core/templates/navigation.html:240 core/templates/user/list.html:4
msgid "User list"
msgstr "用户列表"
-#: core/templates/navigation.html:238
+#: core/templates/navigation.html:241
msgid "Gyms"
msgstr "健身房"
@@ -1207,18 +1117,12 @@ msgstr "你正在以访客模式浏览,输入的数据会在一周后删除."
msgid "Create some demo entries"
msgstr "创建一些示例项"
-#: core/templates/template.html:201 core/templates/template_features.html:121
-#: core/templates/template_no_context.html:88
-msgid "About"
-msgstr "关于"
-
-#: core/templates/template.html:202 core/templates/template_features.html:125
+#: core/templates/template.html:202 core/templates/template_features.html:122
#: core/templates/template_no_context.html:89 software/templates/tos.html:7
msgid "Terms of service"
msgstr "服务条款"
#: core/templates/template.html:209 core/templates/template.html:210
-#: software/templates/license.html:18 software/templates/license.html:19
msgid "Released under the Affero GPL"
msgstr "以Affero GPL许可协议发行"
@@ -1576,15 +1480,15 @@ msgstr ""
msgid "Rest day"
msgstr "休息日"
-#: core/views/misc.py:199
+#: core/views/misc.py:184
msgid "Feedback"
msgstr "反馈"
-#: core/views/misc.py:218 weight/templates/import_csv_form.html:9
+#: core/views/misc.py:203 weight/templates/import_csv_form.html:9
msgid "Submit"
msgstr "提交"
-#: core/views/misc.py:226
+#: core/views/misc.py:211
msgid "Your feedback was successfully sent. Thank you!"
msgstr "你的反馈已经成功发送.非常感谢!"
@@ -1755,7 +1659,6 @@ msgstr "健身项目名称"
#: exercises/templates/exercise/overview.html:118
#: exercises/templates/muscles/overview.html:114
#: nutrition/templates/ingredient/overview.html:85
-#: software/templates/contribute.html:39
msgid "Only registered users can do this"
msgstr "只有注册用户才可以操作"
@@ -1957,7 +1860,7 @@ msgid ""
"%(name_original)s is too similar to existing exercise \"%(exercise_name)s\""
msgstr ""
-#: exercises/views/exercises.py:246 software/templates/contribute.html:37
+#: exercises/views/exercises.py:246
msgid "Add exercise"
msgstr "新增健身项目"
@@ -3611,94 +3514,55 @@ msgstr "新增计量单位"
msgid "Edit a weight unit to ingredient connection"
msgstr "关联计量单位与食谱"
-#: software/templates/contribute.html:9
-msgid ""
-"wger Workout Manager is build by volunteers,\n"
-"the development process is open and freely accessible to anybody "
-"interested.\n"
-"If you are new to the free software world, we recommend to take a\n"
-"look <a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
-"article</a> which summarizes they way open source projects work very well. "
-msgstr ""
-"wger 健身经理是志愿者们参与开发的.整个开发的过程\n"
-"是公开的,并且任何对这个项目感兴趣的人都可以免费参与进来.如果您对自由软件世界"
-"不熟悉,那么我们推荐您浏览\n"
-"一下<a href=\"http://schlitt.info/opensource/"
-"blog/0541_10_golden_rules_for_starting_with_open_source.html\">这篇文章</"
-"a>, \n"
-"它会告诉您开源项目是如何良好运作的."
-
-#: software/templates/contribute.html:16
+#: software/templates/about_us.html:9
msgid ""
-"Any kind of contribution is appreciated and welcome.\n"
-"Use this opportunity and influence the direction of the\n"
-"project. "
+"Thank you for using wger! wger is a collaborative open source project, made "
+"by fitness enthusiasts from around the world."
msgstr ""
-#: software/templates/contribute.html:23
-msgid "Use the site"
+#: software/templates/about_us.html:18
+msgid "Source code"
msgstr ""
-#: software/templates/contribute.html:24
-msgid ""
-"Simply use the site and tell your friends\n"
-"how useful it is! ;) . When you find something that you specially liked,\n"
-"could need some improvements or just doesn't work, tell us! This might not "
-"sound\n"
-"like much, but is incredibly important!"
+#: software/templates/about_us.html:20
+msgid "Get the source code of this application and its server on github"
msgstr ""
-#: software/templates/contribute.html:31
-msgid "Submit exercises"
-msgstr "提交健身项目"
+#: software/templates/about_us.html:25
+msgid "Have a problem or idea?"
+msgstr ""
-#: software/templates/contribute.html:32
+#: software/templates/about_us.html:27
msgid ""
-"Submit those cool exercises that you absolutely\n"
-"love and do every week but are not in the list yet. If you think some "
-"description\n"
-"is too short or some other detail is missing or could be improved, tell!"
+"Get in touch if something didn't behave as expected or if there is a feature "
+"that you feel is missing."
msgstr ""
-#: software/templates/contribute.html:44
-#, fuzzy
-#| msgid ""
-#| "Do you want to use wger in your own language?\n"
-#| "Do you think the current translation could be improved?\n"
-#| "The translations are easily managed and edited online, if you are "
-#| "interested,\n"
-#| "go to the transifex site, request access and we will set everything\n"
-#| "up. "
-msgid ""
-"Do you want to use wger in your own language?\n"
-"Do you think the current translation could be improved?\n"
-"The translations are easily managed and edited online, if you are "
-"interested,\n"
-"visit the link and start translating."
+#: software/templates/about_us.html:32
+msgid "Say hi!"
msgstr ""
-"你想通过母语来使用wger吗?\n"
-"你认为现在wger的翻译有待提高吗?\n"
-"翻译过程是很容易在线管理和编辑的,如果你感兴趣,请访问transifex网站,\n"
-"发出翻译请求,然后我们会搞定一切."
-#: software/templates/contribute.html:53
-msgid "Code"
+#: software/templates/about_us.html:34
+msgid "If you want to chat with us, hop on the Discord server and get in touch"
msgstr ""
-#: software/templates/contribute.html:54
+#: software/templates/about_us.html:39
+#, fuzzy
+#| msgid "Translate"
+msgid "Translation"
+msgstr "翻译"
+
+#: software/templates/about_us.html:41
msgid ""
-"Obviously, you are highly encouraged to clone the\n"
-"repo and start hacking! Once you are ready, send a pull request and we\n"
-"will show the world. Take a look at the developer guide for more details\n"
-"on this."
+"This application is translated on weblate. If you also want to help, click "
+"the link and start translating"
msgstr ""
-#: software/templates/contribute.html:66
+#: software/templates/about_us.html:50
msgid "Our goal"
msgstr "目标"
-#: software/templates/contribute.html:69
+#: software/templates/about_us.html:53
msgid ""
"The goal is to build an awesome\n"
"and flexible fitness manager, along with a comprehensive and complete list "
@@ -3837,98 +3701,6 @@ msgstr ""
msgid "100%% Free <br>and <br>Open Source"
msgstr ""
-#: software/templates/issues.html:6
-msgid "Reporting a problem"
-msgstr "报告问题"
-
-#: software/templates/issues.html:10
-msgid ""
-"\n"
-"No software is perfect. For some severe errors, an email will be "
-"automatically sent, but\n"
-"not always, so I depend on you reporting everything that didn't behave as "
-"expected.\n"
-"Please describe in as much detail as you can what you were doing when the "
-"error\n"
-"happened.\n"
-msgstr ""
-"\n"
-"没有软件是完美的.电子邮件会报告一些严重的错误,但是邮件并不总是可靠的,所以,如"
-"果该软件\n"
-"出现任何非预期的错误,请报告给我,我将感激不尽.当然,在错误发生的时候,你在执行什"
-"么\n"
-"操作,基于什么样的步骤等,这些信息越是详细,对于我排查问题越是有\n"
-"帮助.\n"
-
-#: software/templates/issues.html:21
-msgid "report problem to the issue tracker"
-msgstr "使用问题追踪器报告问题"
-
-#: software/templates/issues.html:25
-msgid "Enhancements"
-msgstr "软件改善"
-
-#: software/templates/issues.html:27
-msgid ""
-"\n"
-"The issue tracker can also be used to document enhancements to the "
-"software.\n"
-"If you have some suggestions or think a feature is missing, feel\n"
-"free to open a ticket. This can be anything from a slight change to a whole\n"
-"new section of the site. Please keep in mind that not all wishes can be\n"
-"implemented."
-msgstr ""
-"\n"
-"github上的问题追踪可以被用来记录这个软件改善的过程.\n"
-"如果你有任何建议或者认为软件的某个功能缺失,请放心打开一个追踪器.\n"
-"这可以是一个微小的变更,也可以是这个站点某个板块的去留等.\n"
-"但是,也请谅解,并不是所有的期望都会被实现."
-
-#: software/templates/issues.html:36
-msgid "report wish to the issue tracker"
-msgstr "使用问题追踪器提出期望"
-
-#: software/templates/issues.html:41
-msgid "No Github account?"
-msgstr "没有github账户?"
-
-#: software/templates/issues.html:42
-msgid ""
-"Filing an issue requires a github account, if you don't\n"
-"have one and don't want to register, you can also send it to\n"
-"<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
-msgstr ""
-"提出一个问题需要一个github帐户,如果你没有\n"
-"github账户并且不想注册,你也可以选择把问题发送到\n"
-"<a href=\"https://groups.google.com/group/wger\">邮件列表</a>"
-
-#: software/templates/license.html:10
-msgid ""
-"wger Workout Manager is Free/Libre Open Source\n"
-"Software (FLOSS)."
-msgstr ""
-"wger 健身经理是免费/自由 开源\n"
-"软件(FLOSS)."
-
-#: software/templates/license.html:22
-msgid ""
-"wger Workout Manager is released under the <strong>Affero GNU\n"
-"General Public License (AGPL) Version 3+</strong> and can (under the "
-"conditions\n"
-"of the license) be used, modified and distributed (also with modifications)\n"
-"without restrictions."
-msgstr ""
-"wger 健身经理是以 <strong>Affero GNU General Public License\n"
-" (AGPL) Version 3+</strong>发行的,并且(在该软件条款下)\n"
-"可以无限制地使用,修改和发行(当然包括修改再发行)"
-
-#: software/templates/license.html:29
-msgid ""
-"A copy the license text is contained in every wger Workout\n"
-"Manager release (LICENSE.txt) and can be read online on the website of\n"
-"<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</a>."
-msgstr ""
-
#: utils/generic_views.py:261
msgid "Yes, delete"
msgstr "是,删除"
@@ -4094,6 +3866,192 @@ msgstr ""
msgid "Delete weight entry for the %s"
msgstr ""
+#~ msgid "Responsible for the content of this site as per German law §5 TMG:"
+#~ msgstr "根据德国法律§5 TMG,对本网站的内容负责。"
+
+#~ msgid "GNUPG-Key:"
+#~ msgstr "GnuPG-公钥:"
+
+#~ msgid "Get in touch"
+#~ msgstr "联系我们"
+
+#~ msgid ""
+#~ "If you want to further help and improve this project,\n"
+#~ "you might also be interested <a href=\"%(contribute)s\">in contributing</"
+#~ "a>."
+#~ msgstr ""
+#~ "如果你想要更近一步地帮助提升这个项目,你或许也会对 <a href=\"%(contribute)s"
+#~ "\">感兴趣</a>."
+
+#~ msgid "Feedback form"
+#~ msgstr "反馈表格"
+
+#~ msgid ""
+#~ "A simple contact form. Remember that\n"
+#~ "if you want an answer, you need to include some way to contact you."
+#~ msgstr ""
+#~ "一个简单的联系表格.记住,\n"
+#~ "如果你想要一个答案,你需要留下你的联系方式."
+
+#~ msgid "Twitter"
+#~ msgstr "推特"
+
+#~ msgid ""
+#~ "We are also on twitter. Write us and tell us what\n"
+#~ "you think! Except patches, don't send patches via twitter."
+#~ msgstr ""
+#~ "我们也在推特上.推特我们告诉我们你的想法!当然,除了补丁包,请不要通过推特发送"
+#~ "补丁包."
+
+#~ msgid "Discord"
+#~ msgstr "不一致"
+
+#~ msgid ""
+#~ "Use the public group to get support for your\n"
+#~ "local wger installation, discuss issues or your new idea, etc.\n"
+#~ "(no registration needed)"
+#~ msgstr ""
+#~ "在公开小组, 你可以获取wger本地安装的支持,\n"
+#~ "你也可以讨论问题,表达你的想法等.\n"
+#~ "(无需注册)"
+
+#~ msgid "Open feedback form"
+#~ msgstr "打开反馈表单"
+
+#~ msgid "tweet to @wger_project"
+#~ msgstr "发推给@wger_project"
+
+#, fuzzy
+#~ msgid "Go to the discord server"
+#~ msgstr "前往Discord服务器"
+
+#~ msgid "Contribute!"
+#~ msgstr "贡献!"
+
+#~ msgid "Problems and wishes"
+#~ msgstr "问题和期望"
+
+#~ msgid "About"
+#~ msgstr "关于"
+
+#~ msgid ""
+#~ "wger Workout Manager is build by volunteers,\n"
+#~ "the development process is open and freely accessible to anybody "
+#~ "interested.\n"
+#~ "If you are new to the free software world, we recommend to take a\n"
+#~ "look <a href=\"http://schlitt.info/opensource/"
+#~ "blog/0541_10_golden_rules_for_starting_with_open_source.html\">this\n"
+#~ "article</a> which summarizes they way open source projects work very "
+#~ "well. "
+#~ msgstr ""
+#~ "wger 健身经理是志愿者们参与开发的.整个开发的过程\n"
+#~ "是公开的,并且任何对这个项目感兴趣的人都可以免费参与进来.如果您对自由软件世"
+#~ "界不熟悉,那么我们推荐您浏览\n"
+#~ "一下<a href=\"http://schlitt.info/opensource/"
+#~ "blog/0541_10_golden_rules_for_starting_with_open_source.html\">这篇文章</"
+#~ "a>, \n"
+#~ "它会告诉您开源项目是如何良好运作的."
+
+#~ msgid "Submit exercises"
+#~ msgstr "提交健身项目"
+
+#, fuzzy
+#~| msgid ""
+#~| "Do you want to use wger in your own language?\n"
+#~| "Do you think the current translation could be improved?\n"
+#~| "The translations are easily managed and edited online, if you are "
+#~| "interested,\n"
+#~| "go to the transifex site, request access and we will set everything\n"
+#~| "up. "
+#~ msgid ""
+#~ "Do you want to use wger in your own language?\n"
+#~ "Do you think the current translation could be improved?\n"
+#~ "The translations are easily managed and edited online, if you are "
+#~ "interested,\n"
+#~ "visit the link and start translating."
+#~ msgstr ""
+#~ "你想通过母语来使用wger吗?\n"
+#~ "你认为现在wger的翻译有待提高吗?\n"
+#~ "翻译过程是很容易在线管理和编辑的,如果你感兴趣,请访问transifex网站,\n"
+#~ "发出翻译请求,然后我们会搞定一切."
+
+#~ msgid "Reporting a problem"
+#~ msgstr "报告问题"
+
+#~ msgid ""
+#~ "\n"
+#~ "No software is perfect. For some severe errors, an email will be "
+#~ "automatically sent, but\n"
+#~ "not always, so I depend on you reporting everything that didn't behave as "
+#~ "expected.\n"
+#~ "Please describe in as much detail as you can what you were doing when the "
+#~ "error\n"
+#~ "happened.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "没有软件是完美的.电子邮件会报告一些严重的错误,但是邮件并不总是可靠的,所以,"
+#~ "如果该软件\n"
+#~ "出现任何非预期的错误,请报告给我,我将感激不尽.当然,在错误发生的时候,你在执"
+#~ "行什么\n"
+#~ "操作,基于什么样的步骤等,这些信息越是详细,对于我排查问题越是有\n"
+#~ "帮助.\n"
+
+#~ msgid "report problem to the issue tracker"
+#~ msgstr "使用问题追踪器报告问题"
+
+#~ msgid "Enhancements"
+#~ msgstr "软件改善"
+
+#~ msgid ""
+#~ "\n"
+#~ "The issue tracker can also be used to document enhancements to the "
+#~ "software.\n"
+#~ "If you have some suggestions or think a feature is missing, feel\n"
+#~ "free to open a ticket. This can be anything from a slight change to a "
+#~ "whole\n"
+#~ "new section of the site. Please keep in mind that not all wishes can be\n"
+#~ "implemented."
+#~ msgstr ""
+#~ "\n"
+#~ "github上的问题追踪可以被用来记录这个软件改善的过程.\n"
+#~ "如果你有任何建议或者认为软件的某个功能缺失,请放心打开一个追踪器.\n"
+#~ "这可以是一个微小的变更,也可以是这个站点某个板块的去留等.\n"
+#~ "但是,也请谅解,并不是所有的期望都会被实现."
+
+#~ msgid "report wish to the issue tracker"
+#~ msgstr "使用问题追踪器提出期望"
+
+#~ msgid "No Github account?"
+#~ msgstr "没有github账户?"
+
+#~ msgid ""
+#~ "Filing an issue requires a github account, if you don't\n"
+#~ "have one and don't want to register, you can also send it to\n"
+#~ "<a href=\"https://groups.google.com/group/wger\">the mailing list</a>."
+#~ msgstr ""
+#~ "提出一个问题需要一个github帐户,如果你没有\n"
+#~ "github账户并且不想注册,你也可以选择把问题发送到\n"
+#~ "<a href=\"https://groups.google.com/group/wger\">邮件列表</a>"
+
+#~ msgid ""
+#~ "wger Workout Manager is Free/Libre Open Source\n"
+#~ "Software (FLOSS)."
+#~ msgstr ""
+#~ "wger 健身经理是免费/自由 开源\n"
+#~ "软件(FLOSS)."
+
+#~ msgid ""
+#~ "wger Workout Manager is released under the <strong>Affero GNU\n"
+#~ "General Public License (AGPL) Version 3+</strong> and can (under the "
+#~ "conditions\n"
+#~ "of the license) be used, modified and distributed (also with "
+#~ "modifications)\n"
+#~ "without restrictions."
+#~ msgstr ""
+#~ "wger 健身经理是以 <strong>Affero GNU General Public License\n"
+#~ " (AGPL) Version 3+</strong>发行的,并且(在该软件条款下)\n"
+#~ "可以无限制地使用,修改和发行(当然包括修改再发行)"
+
#~ msgid "Use pauses in workout timer"
#~ msgstr "在锻炼计时器中使用暂停功能"