[chronojump] run->race, track->lap Done!
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] run->race, track->lap Done!
- Date: Sun, 20 Nov 2016 11:46:46 +0000 (UTC)
commit ed086211a62d513fa1853365a86c7aa482e6b22c
Author: Xavier de Blas <xaviblas gmail com>
Date: Sun Nov 20 12:46:12 2016 +0100
run->race, track->lap Done!
src/constants.cs | 4 ++--
src/execute/run.cs | 6 +++---
src/exportSession.cs | 2 +-
src/gui/chronojump.cs | 24 ++++++++++++------------
src/gui/chronopicRegister.cs | 2 +-
src/gui/queryServer.cs | 2 +-
src/gui/run.cs | 12 ++++++------
src/gui/runType.cs | 14 +++++++-------
src/runType.cs | 2 +-
src/stats/runIntervallic.cs | 4 ++--
src/stats/runSimple.cs | 2 +-
11 files changed, 37 insertions(+), 37 deletions(-)
---
diff --git a/src/constants.cs b/src/constants.cs
index 44694d5..de5f8aa 100644
--- a/src/constants.cs
+++ b/src/constants.cs
@@ -365,8 +365,8 @@ public class Constants
public static string TypeJumpsSimple = Catalog.GetString("Simple");
public static string TypeJumpsSimpleWithTC = Catalog.GetString("Simple with TC");
public static string TypeJumpsReactive = Catalog.GetString("Jumps: Reactive");
- public static string TypeRunsSimple = Catalog.GetString("Runs: Simple");
- public static string TypeRunsIntervallic = Catalog.GetString("Runs: Intervallic");
+ public static string TypeRunsSimple = Catalog.GetString("Races: Simple");
+ public static string TypeRunsIntervallic = Catalog.GetString("Races: Intervallic");
//strings
public static string AllJumpsName = Catalog.GetString("See all jumps");
diff --git a/src/execute/run.cs b/src/execute/run.cs
index 706fa8a..2f6bf70 100644
--- a/src/execute/run.cs
+++ b/src/execute/run.cs
@@ -877,11 +877,11 @@ public class RunIntervalExecute : RunExecute
if(intervalTimesString[0] == '-') {
//this dialog can make crash the software because the
non-gui part calls it
//new DialogMessage(Constants.MessageTypes.WARNING,
- // Catalog.GetString("Run will not be
recorded, 1st track is out of time"));
+ // Catalog.GetString("Race will not be
recorded, 1st lap is out of time"));
- feedbackMessage = Catalog.GetString("Run will not be
recorded. Out of time.");
+ feedbackMessage = Catalog.GetString("Race will not be
recorded. Out of time.");
needShowFeedbackMessage = true;
- LogB.Information("Run will not be recorded, 1st track
is out of time");
+ LogB.Information("Race will not be recorded, 1st lap
is out of time");
//mark for not having problems with cancelled
cancel = true;
diff --git a/src/exportSession.cs b/src/exportSession.cs
index ff7d354..c30dd50 100644
--- a/src/exportSession.cs
+++ b/src/exportSession.cs
@@ -547,7 +547,7 @@ public class ExportSession
myData.Add( "\n" +
Catalog.GetString("Person ID") + ":" +
Catalog.GetString("Person name") + ":" +
- Catalog.GetString("run ID") + ":" +
+ Catalog.GetString("Race ID") + ":" +
Catalog.GetString("Type") + ":" +
Catalog.GetString("Distance") + ":" +
Catalog.GetString("Time") + ":" +
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 8f95170..7671de5 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -2700,7 +2700,7 @@ public partial class ChronoJumpWindow
private void on_delete_current_person_from_session_clicked (object o, EventArgs args) {
LogB.Information("delete current person from this session");
ConfirmWindow confirmWin = ConfirmWindow.Show(
- Catalog.GetString("Are you sure you want to delete the current person and all
his/her tests (jumps, runs, pulses, ...) from this session?\n(His/her personal data and tests in other
sessions will remain intact.)"), "",
+ Catalog.GetString("Are you sure you want to delete the current person and all
his/her tests (jumps, races, pulses, ...) from this session?\n(His/her personal data and tests in other
sessions will remain intact.)"), "",
Catalog.GetString("Current Person: ") + currentPerson.Name);
confirmWin.Button_accept.Clicked += new
EventHandler(on_delete_current_person_from_session_accepted);
@@ -5779,14 +5779,14 @@ LogB.Debug("X");
private void on_delete_selected_run_clicked (object o, EventArgs args) {
//notebooks_change(2); see "notebooks_change sqlite problem"
- LogB.Information("delete this run (normal)");
+ LogB.Information("delete this race (normal)");
//1.- check that there's a line selected
//2.- check that this line is a jump and not a person
if (myTreeViewRuns.EventSelectedID > 0) {
//3.- display confirmwindow of deletion
if (preferences.askDeletion) {
- confirmWinJumpRun = ConfirmWindowJumpRun.Show(Catalog.GetString("Do you want
to delete this run?"), "");
+ confirmWinJumpRun = ConfirmWindowJumpRun.Show(Catalog.GetString("Do you want
to delete this race?"), "");
confirmWinJumpRun.Button_accept.Clicked += new
EventHandler(on_delete_selected_run_accepted);
} else {
on_delete_selected_run_accepted(o, args);
@@ -5797,14 +5797,14 @@ LogB.Debug("X");
private void on_delete_selected_run_interval_clicked (object o, EventArgs args) {
//notebooks_change(3); see "notebooks_change sqlite problem"
- LogB.Information("delete this run interval");
+ LogB.Information("delete this race interval");
//1.- check that there's a line selected
//2.- check that this line is a run and not a person (check also if it's a subrun, pass the
parent run)
if (myTreeViewRunsInterval.EventSelectedID > 0) {
//3.- display confirmwindow of deletion
if (preferences.askDeletion) {
- confirmWinJumpRun = ConfirmWindowJumpRun.Show( Catalog.GetString("Do you want
to delete this run?"),
- Catalog.GetString("Attention: Deleting a Intervallic subrun
will delete the whole run"));
+ confirmWinJumpRun = ConfirmWindowJumpRun.Show( Catalog.GetString("Do you want
to delete this race?"),
+ Catalog.GetString("Attention: Deleting a lap will delete the
whole race"));
confirmWinJumpRun.Button_accept.Clicked += new
EventHandler(on_delete_selected_run_interval_accepted);
} else {
on_delete_selected_run_interval_accepted(o, args);
@@ -5813,7 +5813,7 @@ LogB.Debug("X");
}
private void on_delete_selected_run_accepted (object o, EventArgs args) {
- LogB.Information("accept delete this run");
+ LogB.Information("accept delete this race");
int id = myTreeViewRuns.EventSelectedID;
Sqlite.Delete(false, Constants.RunTable, id);
@@ -5837,7 +5837,7 @@ LogB.Debug("X");
}
private void on_delete_selected_run_interval_accepted (object o, EventArgs args) {
- LogB.Information("accept delete this run");
+ LogB.Information("accept delete this race");
int id = myTreeViewRunsInterval.EventSelectedID;
Sqlite.Delete(false, Constants.RunIntervalTable, id);
@@ -5999,13 +5999,13 @@ LogB.Debug("X");
UtilGtk.ComboUpdate(combo_result_jumps,
SqliteJumpType.SelectJumpTypes(false, Constants.AllJumpsName, "",
true), ""); //without filter, only select name
- new DialogMessage(Constants.MessageTypes.INFO, Catalog.GetString("Added simple
jump."));
+ new DialogMessage(Constants.MessageTypes.INFO, Catalog.GetString("Added simple jump
type."));
} else {
createComboSelectJumpsRj(false);
UtilGtk.ComboUpdate(combo_result_jumps_rj,
SqliteJumpType.SelectJumpRjTypes(Constants.AllJumpsName, true), "");
//without filter, only select name
- new DialogMessage(Constants.MessageTypes.INFO, Catalog.GetString("Added reactive
jump."));
+ new DialogMessage(Constants.MessageTypes.INFO, Catalog.GetString("Added reactive jump
type."));
}
updateComboStats();
combo_select_jumps.Active = 0;
@@ -6035,13 +6035,13 @@ LogB.Debug("X");
UtilGtk.ComboUpdate(combo_result_runs,
SqliteRunType.SelectRunTypes(Constants.AllRunsName, true), "");
//without filter, only select name
- new DialogMessage(Constants.MessageTypes.INFO, Catalog.GetString("Added simple
run."));
+ new DialogMessage(Constants.MessageTypes.INFO, Catalog.GetString("Added simple race
type."));
} else {
createComboSelectRunsInterval(false);
UtilGtk.ComboUpdate(combo_result_runs_interval,
SqliteRunIntervalType.SelectRunIntervalTypes(Constants.AllRunsName,
true), ""); //without filter, only select name
- new DialogMessage(Constants.MessageTypes.INFO, Catalog.GetString("Added intervallic
run."));
+ new DialogMessage(Constants.MessageTypes.INFO, Catalog.GetString("Added intervallic
race type."));
}
updateComboStats();
combo_select_runs.Active = 0;
diff --git a/src/gui/chronopicRegister.cs b/src/gui/chronopicRegister.cs
index 013c26f..f40a49f 100644
--- a/src/gui/chronopicRegister.cs
+++ b/src/gui/chronopicRegister.cs
@@ -216,7 +216,7 @@ public class ChronopicRegisterWindow
str += "\n\n";
str += Catalog.GetString("Please, mark Chronopic/s as") +
"\n- " +
- Catalog.GetString("Jumps/runs") + " " + Catalog.GetString("or") +
+ Catalog.GetString("Jumps") + "/" + Catalog.GetString("Races") + " " +
Catalog.GetString("or") +
"\n- " + Catalog.GetString("Encoder");
}
return str;
diff --git a/src/gui/queryServer.cs b/src/gui/queryServer.cs
index 1109826..d41266a 100644
--- a/src/gui/queryServer.cs
+++ b/src/gui/queryServer.cs
@@ -776,7 +776,7 @@ public class QueryServerWindow
testType == Catalog.GetString(Constants.JumpReactiveName))
label_results_num_units.Text = Catalog.GetString("jumps");
else if (testType == Catalog.GetString(Constants.RunSimpleName))
- label_results_num_units.Text = Catalog.GetString("runs");
+ label_results_num_units.Text = Catalog.GetString("races");
string strVariable = UtilGtk.ComboGetActive(combo_variables);
if(result == "0")
diff --git a/src/gui/run.cs b/src/gui/run.cs
index 47b597d..1af3045 100644
--- a/src/gui/run.cs
+++ b/src/gui/run.cs
@@ -591,7 +591,7 @@ public class RepairRunIntervalWindow
this.runInterval = myRun;
- repair_sub_event.Title = Catalog.GetString("Repair intervallic run");
+ repair_sub_event.Title = Catalog.GetString("Repair intervallic race");
System.Globalization.NumberFormatInfo localeInfo = new
System.Globalization.NumberFormatInfo();
localeInfo = System.Globalization.NumberFormatInfo.CurrentInfo;
@@ -633,7 +633,7 @@ public class RepairRunIntervalWindow
private string createTextForTextView (RunType myRunType) {
string runTypeString = string.Format(Catalog.GetString(
- "RunType: {0}."), myRunType.Name);
+ "RaceType: {0}."), myRunType.Name);
string fixedString = "";
if(myRunType.FixedValue > 0) {
@@ -641,8 +641,8 @@ public class RepairRunIntervalWindow
//if it's a run type runsLimited with a fixed value, then don't allow the
creation of more runs
fixedString = "\n" + string.Format(
Catalog.GetPluralString(
- "This run type is fixed to one run.",
- "This run type is fixed to {0} runs.",
+ "This race type is fixed to one lap.",
+ "This race type is fixed to {0} laps.",
myRunType.FixedValue),
myRunType.FixedValue) +
Catalog.GetString("You cannot add more.");
@@ -650,8 +650,8 @@ public class RepairRunIntervalWindow
//if it's a run type timeLimited with a fixed value, then complain when the
total time is higher
fixedString = "\n" + string.Format(
Catalog.GetPluralString(
- "This run type is fixed to one second.",
- "This run type is fixed to {0} seconds.",
+ "This race type is fixed to one second.",
+ "This race type is fixed to {0} seconds.",
myRunType.FixedValue),
myRunType.FixedValue) +
Catalog.GetString("Totaltime cannot be greater.");
diff --git a/src/gui/runType.cs b/src/gui/runType.cs
index 6e7ccf5..d829b06 100644
--- a/src/gui/runType.cs
+++ b/src/gui/runType.cs
@@ -172,7 +172,7 @@ public class RunTypeAddWindow
runTypeExists = true;
if(runTypeExists) {
- string myString = string.Format(Catalog.GetString("Run type: '{0}' exists. Please,
use another name"), name);
+ string myString = string.Format(Catalog.GetString("Race type: '{0}' exists. Please,
use another name"), name);
LogB.Information (myString);
ErrorWindow.Show(myString);
} else {
@@ -248,7 +248,7 @@ public class RunTypeAddWindow
void on_radiobutton_interval_toggled (object o, EventArgs args)
{
- label_distance.Text = "Distance\nof each track";
+ label_distance.Text = "Distance\nof each lap";
vbox_limited.Sensitive = true;
if( ! radiobutton_unlimited.Active) {
hbox_fixed.Sensitive = true;
@@ -356,14 +356,14 @@ public class RunTypeAddWindow
private void on_button_help_rsa_clicked (object o, EventArgs args) {
new DialogMessage(Constants.MessageTypes.HELP,
- Catalog.GetString("On RSA tests, rest time counts as a \"track\".") +
+ Catalog.GetString("On RSA tests, rest time counts as a \"lap\".") +
"\n" + Catalog.GetString("You should write the time in seconds after a
capital 'R' (meaning \"Rest\").") +
"\n\n" + Catalog.GetString("Eg. Aziz et al. (2000) test repeats 8
times the following sequence:") +
"\n\n\t" + Catalog.GetString("Run 40 meters, rest 30 seconds.") +
- "\n\n" + Catalog.GetString("Will be limited by tracks with a fixed value of
16") +
- "\n" + Catalog.GetString("because there are 16 tracks:") +
- "\n" + Catalog.GetString("2 different tracks: ('Run' and 'rest') x 8 times")
+
- "\n\n" + Catalog.GetString("And the 'distance' of each different track will
be:") +
+ "\n\n" + Catalog.GetString("Will be limited by laps with a fixed value of
16") +
+ "\n" + Catalog.GetString("because there are 16 laps:") +
+ "\n" + Catalog.GetString("2 different laps: ('Run' and 'rest') x 8 times") +
+ "\n\n" + Catalog.GetString("And the 'distance' of each different lap will
be:") +
"\n\n\t40, R30"
);
}
diff --git a/src/runType.cs b/src/runType.cs
index b99a0d1..21b1f25 100644
--- a/src/runType.cs
+++ b/src/runType.cs
@@ -386,7 +386,7 @@ public class RunType : EventType
isPredefined = true;
description = Catalog.GetString("Modified time Getup and Go test");
imageFileName = "mtgug.png";
- distancesString = "1-7-19"; //this intervallic run has different distance for
each track
+ distancesString = "1-7-19"; //this intervallic race has different distance for
each lap
longDescription = Catalog.GetString("The instructions given to perform the test were
as follows: \"Sit down with your back resting on the back of the chair and with your two arms resting on your
legs. When you hear the word 'go', stand up without using your arms, kick the ball in front of you as hard as
you possibly can, using the instep of the foot you feel the safest. Then walk at your normal pace while
counting backwards from 15 to 0 out loud. Turn around back the cone, without touching it, and go back to your
seat, stepping into the circles, trying not to touch any of them. Finally, sit down again, trying not to use
your arms\".") +
"\n\n" +
Catalog.GetString("The stopwatches were activated on the word 'go' and the
button that saved the time intervals was pressed also after the following stages: when the subject stood up
and kicked the ball; when the ball passed the 8 m line; and when the subject returned to the seated position
in the same chair (42 cm height from the seat to the ground). The total time needed to perform the test
provided a quantitative evaluation of performance. A qualitative evaluation was performed by the completion
of an AQ. This AQ assesses 6 items with a Likert scale from 0 to 3, where 0 is the equivalent to needing help
in order to perform the task, and 3 is equivalent to performing the task unaided with no mistakes. The
maximum points that can be attained are 18. The items assessed were: (1) standing up from the chair, (2)
kicking the ball, (3) walking whilst counting backwards from 15 to 0, (4) walking around the cone, (5)
walking whilst stepping into the circles, and (6) sitting ba
ck down again.") + "\n\n" +
diff --git a/src/stats/runIntervallic.cs b/src/stats/runIntervallic.cs
index 4013e68..6358def 100644
--- a/src/stats/runIntervallic.cs
+++ b/src/stats/runIntervallic.cs
@@ -262,8 +262,8 @@ public class StatRunIntervallic : Stat
if(numContinuous != -1) {
bestResalted = string.Format(
Catalog.GetPluralString(
- " (best run marked)",
- " (best {0} consecutive runs marked)",
+ " (best race marked)",
+ " (best {0} consecutive laps marked)",
numContinuous),
numContinuous);
}
diff --git a/src/stats/runSimple.cs b/src/stats/runSimple.cs
index 10e58e1..51dff1b 100644
--- a/src/stats/runSimple.cs
+++ b/src/stats/runSimple.cs
@@ -128,7 +128,7 @@ public class StatRunSimple : Stat
strFull[0] + "(" + strFull[2] + ")";
}
- return string.Format(Catalog.GetString("{0} in {1} run on {2}"), selectedValuesString,
jumpType, mySessionString);
+ return string.Format(Catalog.GetString("{0} in {1} race on {2}"), selectedValuesString,
jumpType, mySessionString);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
