Merge branch 'master' into feature/exercise-crowdsourcing

# Conflicts:
#	pubspec.lock
#	pubspec.yaml

Author: rolandgeider

README.md

@@ -26,8 +26,8 @@ If you want to contribute, hop on the Discord server and say hi!
 ## Development
 
 ### 1
-Install the wger server, the easiest way is to start the development docker-compose:
-<https://github.com/wger-project/wger>
+Install the [wger server](https://github.com/wger-project/wger), the easiest way
+is to start the development docker-compose: <https://github.com/wger-project/docker>
 
 Alternatively, you can use one of our test servers, just ask us for access.
 
@@ -52,9 +52,6 @@ on your local instance and then run ``python3 manage.py add-user-rest the userna
 
 You can later list all the registered users with: ``python3 manage.py list-users-api``  
 
-[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
-      alt="Get it on F-Droid"
-      height="80">](https://f-droid.org/packages/de.wger.flutter)
 
 ### 4
 Start the application with ``flutter run`` or use your IDE

lib/l10n/app_hr.arb

@@ -95,7 +95,7 @@
   "@logHelpEntriesUnits": {},
   "description": "Opis",
   "@description": {},
-  "name": "Naziv",
+  "name": "Ime",
   "@name": {
     "description": "Name for a workout or nutritional plan"
   },
@@ -381,7 +381,7 @@
   "@noWeightEntries": {
     "description": "Message shown when the user has no logged weight entries"
   },
-  "loadingText": "Učitavanje...",
+  "loadingText": "Učitavanje …",
   "@loadingText": {
     "description": "Text to show when entries are being loaded in the background: Loading..."
   },