Merge pull request #930 from gerhardol/Miniangel/_patch-3

Refresh English source texts
jonasoreland · Jul 4, 2020 · f70a8e3 · f70a8e3
2 parents 1cf9a0f + 746accd
commit f70a8e3
Show file tree

Hide file tree

Showing 41 changed files with 828 additions and 476 deletions.
diff --git a/app/res/values-de/cues.xml b/app/res/values-de/cues.xml
@@ -65,6 +65,10 @@
     <item quantity="one">%d bpm</item>
     <item quantity="other">%d bpm</item>
   </plurals>
+  <plurals name="cue_rpm">
+    <item quantity="one">%d U/min.</item>
+    <item quantity="other">%d U/min.</item>
+  </plurals>
   <string name="cue_activity_paused">Aktivität pausiert</string>
   <string name="cue_activity_resumed">Aktivität fortgeführt</string>
   <string name="cue_activity_stopped">Aktivität gestoppt</string>

diff --git a/app/res/values-es/cues.xml b/app/res/values-es/cues.xml
@@ -65,6 +65,10 @@
     <item quantity="one">%d bpm</item>
     <item quantity="other">%d pulsaciones por minuto</item>
   </plurals>
+  <plurals name="cue_rpm">
+    <item quantity="one">%d rpm</item>
+    <item quantity="other">%d rpm</item>
+  </plurals>
   <string name="cue_activity_paused">actividad pausada</string>
   <string name="cue_activity_resumed">actividad reanudada</string>
   <string name="cue_activity_stopped">actividad parada</string>

diff --git a/app/res/values-fr/cues.xml b/app/res/values-fr/cues.xml
@@ -18,7 +18,7 @@
   <string name="cue_interval">intervalle</string>
   <string name="cue_lap">tour</string>
   <string name="cue_warmup">échauffement</string>
-  <string name="cue_cooldown">refroidissement</string>
+  <string name="cue_cooldown">récupération</string>
   <string name="cue_current">actuel</string>
   <string name="cue_perkilometer">par kilomètre</string>
   <string name="cue_permile">par mile</string>
@@ -27,8 +27,8 @@
   <string name="cue_resumed">repris</string>
   <string name="cue_stopped">arrêté</string>
   <string name="cue_completed">terminé</string>
-  <string name="cue_speedup">accélérez !</string>
-  <string name="cue_slowdown">ralentissez !</string>
+  <string name="cue_speedup">accélérez</string>
+  <string name="cue_slowdown">ralentissez</string>
   <plurals name="cue_hour">
     <item quantity="one">%d heure</item>
     <item quantity="other">%d heures</item>

diff --git a/app/res/values-it/cues.xml b/app/res/values-it/cues.xml
@@ -53,10 +53,22 @@
     <item quantity="one">%s miglio</item>
     <item quantity="other">%s miglia</item>
   </plurals>
+  <plurals name="cue_kilometers_per_hour">
+    <item quantity="one">%s chillometro all\'ora</item>
+    <item quantity="other">%s chillometri all\'ora</item>
+  </plurals>
+  <plurals name="cue_miles_per_hour">
+    <item quantity="one">%s miglio all\'ora</item>
+    <item quantity="other">%s miglia all\'ora</item>
+  </plurals>
   <plurals name="cue_bpm">
     <item quantity="one">%d bpm</item>
     <item quantity="other">%d bpm</item>
   </plurals>
+  <plurals name="cue_rpm">
+    <item quantity="one">%d gam</item>
+    <item quantity="other">%d gam</item>
+  </plurals>
   <string name="cue_activity_paused">attività interrotta</string>
   <string name="cue_activity_resumed">attività ripresa</string>
   <string name="cue_activity_stopped">attività fermata</string>

diff --git a/app/res/values-ro/cues.xml b/app/res/values-ro/cues.xml
@@ -0,0 +1,89 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--~ Copyright (C) 2014 [email protected]
+  ~
+  ~  This program is free software: you can redistribute it and/or modify
+  ~  it under the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation, either version 3 of the License, or
+  ~  (at your option) any later version.
+  ~
+  ~  This program is distributed in the hope that it will be useful,
+  ~  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~  GNU General Public License for more details.
+  ~
+  ~  You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
+  <string name="cue_activity">activitate</string>
+  <string name="cue_interval">interval</string>
+  <string name="cue_lap">rundă</string>
+  <string name="cue_warmup">încălzire</string>
+  <string name="cue_cooldown">răcire</string>
+  <string name="cue_current">actual</string>
+  <string name="cue_perkilometer">pe kilometru</string>
+  <string name="cue_permile">pe milă</string>
+  <string name="cue_started">început</string>
+  <string name="cue_paused">întrerupt</string>
+  <string name="cue_resumed">reluat</string>
+  <string name="cue_stopped">oprit</string>
+  <string name="cue_completed">terminat</string>
+  <string name="cue_speedup">accelerează</string>
+  <string name="cue_slowdown">incetineste</string>
+  <plurals name="cue_hour">
+    <item quantity="one">%d oră</item>
+    <item quantity="few">%d ore</item>
+    <item quantity="other">%d ore</item>
+  </plurals>
+  <plurals name="cue_minute">
+    <item quantity="one">%d minut</item>
+    <item quantity="few">%d minute</item>
+    <item quantity="other">%d minute</item>
+  </plurals>
+  <plurals name="cue_second">
+    <item quantity="one">%d secundă</item>
+    <item quantity="few">%d secunde</item>
+    <item quantity="other">%d secunde</item>
+  </plurals>
+  <plurals name="cue_meter">
+    <item quantity="one">%d metru</item>
+    <item quantity="few">%d metri</item>
+    <item quantity="other">%d metri</item>
+  </plurals>
+  <plurals name="cue_kilometer">
+    <item quantity="one">%s kilometru</item>
+    <item quantity="few">%s kilometri</item>
+    <item quantity="other">%s kilometri</item>
+  </plurals>
+  <plurals name="cue_mile">
+    <item quantity="one">%s milă</item>
+    <item quantity="few">%s mile</item>
+    <item quantity="other">%s mile</item>
+  </plurals>
+  <plurals name="cue_kilometers_per_hour">
+    <item quantity="one">%s kilometru pe oră</item>
+    <item quantity="few">%s kilometri pe oră</item>
+    <item quantity="other">%s kilometri pe oră</item>
+  </plurals>
+  <plurals name="cue_miles_per_hour">
+    <item quantity="one">%s milă pe oră</item>
+    <item quantity="few">%s mile pe oră</item>
+    <item quantity="other">%s mile pe oră</item>
+  </plurals>
+  <plurals name="cue_bpm">
+    <item quantity="one">%d bpm</item>
+    <item quantity="few">%d bpm</item>
+    <item quantity="other">%d bpm</item>
+  </plurals>
+  <plurals name="cue_rpm">
+    <item quantity="one">%d rpm</item>
+    <item quantity="few">%d rpm</item>
+    <item quantity="other">%d rpm</item>
+  </plurals>
+  <string name="cue_activity_paused">activitatea întreruptă</string>
+  <string name="cue_activity_resumed">activitatea reluată</string>
+  <string name="cue_activity_stopped">activitatea oprită</string>
+  <string name="cue_lap_started">runda începută</string>
+  <string name="cue_lap_completed">runda terminată</string>
+  <string name="cue_warmup_started">încălzirea începută</string>
+  <string name="cue_cooldown_started">răcirea începută</string>
+</resources>
diff --git a/app/res/values/cues.xml b/app/res/values/cues.xml
@@ -17,8 +17,8 @@
   <string name="cue_activity">activity</string>
   <string name="cue_interval">interval</string>
   <string name="cue_lap">lap</string>
-  <string name="cue_warmup">warm up</string>
-  <string name="cue_cooldown">cool down</string>
+  <string name="cue_warmup">warmup</string>
+  <string name="cue_cooldown">cooldown</string>
   <string name="cue_current">current</string>
   <string name="cue_perkilometer">per kilometer</string>
   <string name="cue_permile">per mile</string>

diff --git a/app/src/main/org/runnerup/db/DBHelper.java b/app/src/main/org/runnerup/db/DBHelper.java
@@ -643,10 +643,10 @@ public void onClick(DialogInterface dialog, int which) {
             String to = getDbPath(ctx);
             int cnt = FileUtil.copyFile(to, from);
             builder.setMessage("Copied " + cnt + " bytes")
-                    .setPositiveButton(ctx.getString(R.string.Great), listener);
+                    .setPositiveButton(ctx.getString(R.string.OK), listener);
         } catch (IOException e) {
             builder.setMessage("Exception: " + e.toString())
-                    .setNegativeButton(ctx.getString(R.string.Darn), listener);
+                    .setNegativeButton(ctx.getString(R.string.OK), listener);
         }
         builder.show();
     }
@@ -665,10 +665,10 @@ public void onClick(DialogInterface dialog, int which) {
             String from = getDbPath(ctx);
             int cnt = FileUtil.copyFile(to, from);
             builder.setMessage("Copied " + cnt + " bytes")
-                    .setPositiveButton(ctx.getString(R.string.Great), listener);
+                    .setPositiveButton(ctx.getString(R.string.OK), listener);
         } catch (IOException e) {
             builder.setMessage("Exception: " + e.toString())
-                    .setNegativeButton(ctx.getString(R.string.Darn), listener);
+                    .setNegativeButton(ctx.getString(R.string.OK), listener);
         }
         builder.show();
     }

diff --git a/app/src/main/org/runnerup/view/HRSettingsActivity.java b/app/src/main/org/runnerup/view/HRSettingsActivity.java
@@ -313,7 +313,7 @@ public void onClick(DialogInterface dialog, int which) {
 
         AlertDialog.Builder builder = new AlertDialog.Builder(this)
                 .setTitle(getString(R.string.Heart_rate_monitor_is_not_supported_for_your_device))
-                .setNegativeButton(getString(R.string.ok_rats), listener);
+                .setNegativeButton(getString(R.string.OK), listener);
         builder.show();
     }
 

diff --git a/app/src/main/org/runnerup/view/MainLayout.java b/app/src/main/org/runnerup/view/MainLayout.java
@@ -311,7 +311,7 @@ public void onClick(DialogInterface dialog, int which) {
             }
 
         })
-                .setNegativeButton(getString(R.string.Dismiss), new DialogInterface.OnClickListener() {
+                .setNegativeButton(getString(R.string.OK), new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
                 dialog.dismiss();

diff --git a/app/src/main/org/runnerup/view/ManageWorkoutsActivity.java b/app/src/main/org/runnerup/view/ManageWorkoutsActivity.java
@@ -144,9 +144,9 @@ public void onCreate(Bundle savedInstanceState) {
                 importData(fileName, data);
             } catch (Exception e) {
                 AlertDialog.Builder builder = new AlertDialog.Builder(this)
-                        .setTitle(getString(R.string.Problem))
+                        .setTitle(getString(R.string.Error))
                         .setMessage(getString(R.string.Failed_to_import) + ": " + fileName)
-                        .setPositiveButton(getString(R.string.OK_darn),
+                        .setPositiveButton(getString(R.string.OK),
                         new DialogInterface.OnClickListener() {
                             public void onClick(DialogInterface dialog, int which) {
                                 dialog.dismiss();

diff --git a/app/src/main/org/runnerup/view/SettingsActivity.java b/app/src/main/org/runnerup/view/SettingsActivity.java
@@ -205,7 +205,7 @@ public void onClick(DialogInterface dialog, int which) {
                 AlertDialog.Builder builder = new AlertDialog.Builder(SettingsActivity.this)
                         .setTitle("Export runnerup.db")
                         .setMessage("Storage permission not granted in Android settings")
-                        .setNegativeButton(getString(R.string.Darn), listener);
+                        .setNegativeButton(getString(R.string.OK), listener);
                 builder.show();
             }
             return false;
@@ -231,7 +231,7 @@ public void onClick(DialogInterface dialog, int which) {
                 AlertDialog.Builder builder = new AlertDialog.Builder(SettingsActivity.this)
                         .setTitle("Import runnerup.db")
                         .setMessage("Storage permission not granted in Android settings")
-                        .setNegativeButton(getString(R.string.Darn), listener);
+                        .setNegativeButton(getString(R.string.OK), listener);
                 builder.show();
             }
             return false;

diff --git a/common/src/main/res/values-bs/strings.xml b/common/src/main/res/values-bs/strings.xml
@@ -14,7 +14,6 @@
   ~
   ~  You should have received a copy of the GNU General Public License
   ~  along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
-  <string name="app_name">RunnerUp</string>
   <!--metrics stuff-->
   <string name="metrics_distance_km">km</string>
   <string name="metrics_distance_mi">mi</string>
@@ -24,22 +23,14 @@
   <string name="metrics_elapsed_min">min</string>
   <string name="metrics_elapsed_s">s</string>
   <string name="metrics_heartrate">Puls</string>
-  <!--format hint stuff-->
   <string name="Maximum_heart_rate_MHR">Max puls (MP)</string>
   <string name="Target_pace_HHMMSS">Ciljani tempo</string>
-  <!--strings with argument to provide-->
   <!--first argument is a date, second a time, for instance: "Yesterday at 13:32"-->
   <string name="formatting_date_at_time">%1$s u %2$s</string>
-  <!--weird stuff: should it be placeholders or even removed?-->
-  <string name="ok_rats">OK, miševi</string>
-  <!--other-->
   <string name="Type">Tip</string>
   <string name="active">aktivan</string>
   <string name="rest">odmor</string>
   <string name="recovery">oporavak</string>
-  <string name="warm_up">zagrijavanje</string>
-  <string name="cool_down">hlađenje</string>
-  <string name="repeat">ponavljanje</string>
   <string name="time">vrijeme</string>
   <string name="distance">razdaljina</string>
   <string name="Distance">Razdaljina</string>
@@ -110,11 +101,8 @@
   <string name="Configure_accounts">Konfiguriši račune</string>
   <string name="Refresh">Osvježi</string>
   <string name="Age">Godine</string>
-  <string name="Synchronizing">Sinhronizacija:</string>
-  <string name="synchronizing_feed">sinhronizacija vrijesti…</string>
   <string name="OK">OK</string>
   <string name="Clear_uploads">Očisti uploade</string>
-  <string name="Upload_missing_workouts">Upload treninga (koji nedostaju)</string>
   <string name="Disconnect_account">Otkači račun</string>
   <string name="Edit_activity">Izmijeni aktivnost</string>
   <string name="Share_activity">Podijeli aktivnost</string>
@@ -135,15 +123,10 @@
   <string name="Select_type_of_Bluetooth_device">Odaberi tip Bluetooth uređaja</string>
   <string name="Scanning">Skeniranje</string>
   <string name="Failed_to_load_workout">Greška učitavanja treninga!!</string>
-  <string name="Problem">Problem</string>
   <string name="Edit_step">Promijeni korak</string>
   <string name="Create_new_audio_cue_scheme">Napravi novu šemu audio napomena</string>
-  <string name="Great">Sjajno!</string>
-  <string name="OK_darn">OK, dođavola!</string>
   <string name="Yes">Da</string>
   <string name="Create">Kreiraj</string>
-  <string name="Darn">Dođavola!</string>
-  <string name="Dismiss">Otkaži</string>
   <string name="No_way">Nema šanse</string>
   <string name="No">Ne</string>
   <string name="Loading">Učitavanje…</string>