From b9378c24b5356eb232b351936e26df190c0463a0 Mon Sep 17 00:00:00 2001
From: pcktm <13273420+pcktm@users.noreply.github.com>
Date: Fri, 3 Jan 2020 21:12:05 +0100
Subject: [PATCH] Minor translation changes (#630)

---
 README.en.md                                   | 12 ++++++------
 README.md                                      | 10 +++++-----
 app/src/main/res/values-pl/strings.xml         |  4 ++--
 app/src/main/res/values/preferences_values.xml |  2 +-
 app/src/main/res/values/strings.xml            | 18 +++++++++---------
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/README.en.md b/README.en.md
index 4da00e5dd..7444cccae 100644
--- a/README.en.md
+++ b/README.en.md
@@ -7,11 +7,11 @@
 [![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg?style=flat-square)](https://f-droid.org/packages/io.github.wulkanowy/)
 [![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github&style=flat-square)](https://github.com/wulkanowy/wulkanowy/releases)
 
-Unofficial android VULCAN UONET+ register client for student and parent
+Unofficial android VULCAN UONET+ register client for both students and their parents
 
 ## Features
 
-* logging in using the email and password
+* logging in using the email and password OR using token and pin
 * functions from the register website:
     * grades
     * grade statistics
@@ -24,7 +24,7 @@ Unofficial android VULCAN UONET+ register client for student and parent
     * homework
     * notes
     * lucky number
-* calculation of the average
+* calculation of the average independently of school's preferences
 * notifications, e.g. about a new grade
 * dark and black (AMOLED) theme
 * offline mode
@@ -32,16 +32,16 @@ Unofficial android VULCAN UONET+ register client for student and parent
 
 ## Download
 
-You can download the current beta from the Google Play or Fdroid store
+You can download the current beta version from the Google Play or the F-Droid store
 
 [<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
       alt="Get it on Google Play"
       height="80">](https://play.google.com/store/apps/details?id=io.github.wulkanowy)
 [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
-    alt="Get it on Fdroid"
+    alt="Get it on F-Droid"
     height="80">](https://f-droid.org/packages/io.github.wulkanowy/)
     
-You can also download a [development version](https://wulkanowy.github.io/#download) that includes new features prepared for the next release
+You can also download a [development version](https://wulkanowy.github.io/#download) that includes new features being prepared for the next release
 
 ## Built With
 
diff --git a/README.md b/README.md
index d51115d5e..61b13444a 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Nieoficjalny klient dziennika VULCAN UONET+ dla ucznia i rodzica
 
 ## Funkcje
 
-* logowanie za pomocą e-maila i hasła
+* logowanie za pomocą e-maila i hasła LUB tokena i pinu
 * funkcje ze strony internetowej dziennika:
     * oceny
     * statystyki ocen
@@ -24,7 +24,7 @@ Nieoficjalny klient dziennika VULCAN UONET+ dla ucznia i rodzica
     * zadania domowe
     * uwagi
     * szczęśliwy numerek
-* obliczanie średniej
+* obliczanie średniej niezależnie od preferencji szkoły
 * powiadomienia np. o nowej ocenie
 * ciemny i czarny (AMOLED) motyw
 * tryb offilne
@@ -32,13 +32,13 @@ Nieoficjalny klient dziennika VULCAN UONET+ dla ucznia i rodzica
 
 ## Pobierz
 
-Aktualną wersję beta możesz pobrać ze sklepu Google Play lub Fdroid
+Aktualną wersję beta możesz pobrać ze sklepu Google Play lub F-Droid
 
 [<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
       alt="Pobierz z Google Play"
       height="80">](https://play.google.com/store/apps/details?id=io.github.wulkanowy)
 [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
-    alt="Pobierz z Fdroid"
+    alt="Pobierz z F-Droid"
     height="80">](https://f-droid.org/packages/io.github.wulkanowy/)
 
 
@@ -59,4 +59,4 @@ Wnieś swój wkład w projekt, tworząc PR lub wysyłając issue na GitHub.
 
 ## Licencja
 
-Ten projekt jest licencjonowany w ramach Apache License 2.0 - szczegóły w pliku [LICENSE](LICENSE)
\ No newline at end of file
+Ten projekt udostępniany jest na licencji Apache License 2.0 - szczegóły w pliku [LICENSE](LICENSE)
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index dd61f7df4..cedb224bb 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -359,8 +359,8 @@
 
     <!--Errors-->
     <string name="error_no_internet">Brak połączenia z internetem</string>
-    <string name="error_timeout">Zbyt długie oczekiwanie na połączenie z dziennikiem</string>
-    <string name="error_login_failed">Logowanie nie powiodło się. Spróbuj ponownie lub zrestartuj aplikację</string>
+    <string name="error_timeout">Upłynął limit czasu na połączenie z dziennikiem</string>
+    <string name="error_login_failed">Logowanie nie powiodło się. Zrestartuj aplikację i spróbuj ponownie</string>
     <string name="error_service_unavailable">Dziennik jest niedostępny. Spróbuj ponownie później</string>
     <string name="error_unknown">Wystąpił nieoczekiwany błąd</string>
     <string name="error_feature_disabled">Funkcja wyłączona przez szkołę</string>
diff --git a/app/src/main/res/values/preferences_values.xml b/app/src/main/res/values/preferences_values.xml
index 05210fd22..ee54d53c6 100644
--- a/app/src/main/res/values/preferences_values.xml
+++ b/app/src/main/res/values/preferences_values.xml
@@ -83,7 +83,7 @@
     </string-array>
 
     <string-array name="grade_average_mode_entries">
-        <item>Average grades from the 2nd semester</item>
+        <item>Average of grades only from the 2nd semester</item>
         <item>Average of grades from the whole year</item>
     </string-array>
     <string-array name="grade_average_mode_values" translatable="false">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e260a4161..7d568b9b7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -27,14 +27,14 @@
     <string name="login_password_hint">Password</string>
     <string name="login_host_hint">Register</string>
     <string name="login_type_api">Mobile API</string>
-    <string name="login_type_scrapper">Scrapper</string>
+    <string name="login_type_scrapper">Scraper</string>
     <string name="login_type_hybrid">Hybrid</string>
     <string name="login_token_hint">Token</string>
     <string name="login_pin_hint">PIN</string>
     <string name="login_api_key_hint">API key</string>
     <string name="login_symbol_hint">Symbol</string>
     <string name="login_sign_in">Sign in</string>
-    <string name="login_invalid_password">This password is too short</string>
+    <string name="login_invalid_password">Password too short</string>
     <string name="login_incorrect_password">Login details are incorrect</string>
     <string name="login_invalid_pin">Invalid PIN</string>
     <string name="login_invalid_token">Invalid token</string>
@@ -42,7 +42,7 @@
     <string name="login_invalid_symbol">Invalid symbol</string>
     <string name="login_incorrect_symbol">Student not found. Check the symbol</string>
     <string name="login_field_required">This field is required</string>
-    <string name="login_duplicate_student">The selected student is already logged in</string>
+    <string name="login_duplicate_student">Selected student is already logged in</string>
     <string name="login_symbol_helper">The symbol can be found on the register page in Uczeń -> Dostęp Mobilny -> Zarejestruj urządzenie mobilne</string>
     <string name="login_select_student">Select students to log in to the application</string>
     <string name="login_advanced">Other options</string>
@@ -210,7 +210,7 @@
     <!--Mobile devices-->
     <string name="mobile_devices_title">Mobile devices</string>
     <string name="mobile_devices_no_items">No devices</string>
-    <string name="mobile_devices_unregister">Unregister</string>
+    <string name="mobile_devices_unregister">Deregister</string>
     <string name="mobile_device_removed">Device removed</string>
     <string name="mobile_device_qr">QR code</string>
     <string name="mobile_device_token">Token</string>
@@ -243,7 +243,7 @@
     <!--Account-->
     <string name="account_add_new">Add account</string>
     <string name="account_logout">Logout</string>
-    <string name="account_confirm">Do you want to log out of an active student?</string>
+    <string name="account_confirm">Do you want to log out of this student account?</string>
     <string name="account_logout_student">Student logout</string>
 
 
@@ -309,7 +309,7 @@
 
     <string name="pref_services_header">Synchronization</string>
     <string name="pref_services_switch">Automatic update</string>
-    <string name="pref_services_suspended">Suspended on holiday</string>
+    <string name="pref_services_suspended">Suspended on holidays</string>
     <string name="pref_services_interval">Updates interval</string>
     <string name="pref_services_wifi">Wi-Fi only</string>
 
@@ -340,9 +340,9 @@
 
     <!--Errors-->
     <string name="error_no_internet">No internet connection</string>
-    <string name="error_timeout">Too long waiting time for connection to the register</string>
-    <string name="error_login_failed">Login is failed. Try again or restart the app</string>
-    <string name="error_service_unavailable">The log is not available. Try again later</string>
+    <string name="error_timeout">Connection to the register timed out</string>
+    <string name="error_login_failed">Login failed. Restart the app and try again</string>
+    <string name="error_service_unavailable">The service is not available. Try again later</string>
     <string name="error_unknown">An unexpected error occurred</string>
     <string name="error_feature_disabled">Feature disabled by your school</string>
     <string name="error_feature_not_available">Feature not available in this mode</string>