Skip to content

Updated fr (French) translation #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updated fr (French) translation #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
564bba7
#59: Renamed strings from "Task" to "Activity"
netmackan Dec 27, 2018
df4f761
Updated fr (French) translation
ldmpub Dec 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions android-timetracker/app/src/main/java/com/markuspage/android/atimetracker/Report.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ private String[][] getCurrentRange() {
}
// Add the headers
String[] headers = new String[9];
headers[0] = "Task name";
headers[0] = "Activity name";
for (int i = 0; i < 7; i++) {
Day s = Day.fromCalEnum(weekDays[i]);
headers[i + 1] = s.header;
Expand Down Expand Up @@ -368,7 +368,7 @@ private void createHeader(TableLayout mainReport) {
mainReport.addView(row, new TableLayout.LayoutParams());

TextView blank = new TextView(this);
blank.setText("Task");
blank.setText("Activity");
blank.setPadding(PAD, PAD, RPAD, PAD);
blank.setTypeface(Typeface.SANS_SERIF, Typeface.BOLD);
row.addView(blank, new TableRow.LayoutParams(0));
Expand Down
2 changes: 1 addition & 1 deletion android-timetracker/app/src/main/java/com/markuspage/android/atimetracker/TaskTimes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ protected Dialog onCreateDialog(int id) {
switch (id) {
case DELETE_TIME:
return new AlertDialog.Builder(this)
.setTitle(R.string.delete_task_title)
.setTitle(R.string.delete_activity_title)
.setIcon(android.R.drawable.stat_sys_warning)
.setCancelable(true)
.setMessage(R.string.delete_time_message)
Expand Down
26 changes: 13 additions & 13 deletions android-timetracker/app/src/main/java/com/markuspage/android/atimetracker/Tasks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ protected void onResume() {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
menu.add(0, ADD_TASK, 0, R.string.add_task_title).setIcon(android.R.drawable.ic_menu_add);
menu.add(0, ADD_TASK, 0, R.string.add_activity_title).setIcon(android.R.drawable.ic_menu_add);
menu.add(0, REPORT, 1, R.string.generate_report_title).setIcon(android.R.drawable.ic_menu_week);
menu.add(0, CHANGE_VIEW, 2, R.string.change_date_range);
menu.add(0, EXPORT_VIEW, 3, R.string.export_view_to_csv);
Expand All @@ -273,9 +273,9 @@ public boolean onCreateOptionsMenu(Menu menu) {
@Override
public void onCreateContextMenu(ContextMenu menu, View v,
ContextMenuInfo menuInfo) {
menu.setHeaderTitle("Task menu");
menu.add(0, EDIT_TASK, 0, getText(R.string.edit_task));
menu.add(0, DELETE_TASK, 0, getText(R.string.delete_task));
menu.setHeaderTitle("Activities menu");
menu.add(0, EDIT_TASK, 0, getText(R.string.edit_activity));
menu.add(0, DELETE_TASK, 0, getText(R.string.delete_activity));
menu.add(0, SHOW_TIMES, 0, getText(R.string.show_times));
}

Expand Down Expand Up @@ -582,11 +582,11 @@ private void setTitle() {
*/
private Dialog openNewTaskDialog() {
LayoutInflater factory = LayoutInflater.from(this);
final View textEntryView = factory.inflate(R.layout.edit_task, null);
final View textEntryView = factory.inflate(R.layout.edit_activity, null);
return new AlertDialog.Builder(Tasks.this) //.setIcon(R.drawable.alert_dialog_icon)
.setTitle(R.string.add_task_title).setView(textEntryView).setPositiveButton(R.string.add_task_ok, new DialogInterface.OnClickListener() {
.setTitle(R.string.add_activity_title).setView(textEntryView).setPositiveButton(R.string.add_activity_ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
EditText textView = (EditText) textEntryView.findViewById(R.id.task_edit_name_edit);
EditText textView = (EditText) textEntryView.findViewById(R.id.activity_edit_name_edit);
String name = textView.getText().toString();
adapter.addTask(name);
Tasks.this.getListView().invalidate();
Expand All @@ -606,10 +606,10 @@ private Dialog openEditTaskDialog() {
return null;
}
LayoutInflater factory = LayoutInflater.from(this);
final View textEntryView = factory.inflate(R.layout.edit_task, null);
final View textEntryView = factory.inflate(R.layout.edit_activity, null);
return new AlertDialog.Builder(Tasks.this).setView(textEntryView).setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
EditText textView = (EditText) textEntryView.findViewById(R.id.task_edit_name_edit);
EditText textView = (EditText) textEntryView.findViewById(R.id.activity_edit_name_edit);
String name = textView.getText().toString();
selectedTask.setTaskName(name);

Expand All @@ -630,9 +630,9 @@ private Dialog openDeleteTaskDialog() {
if (selectedTask == null) {
return null;
}
String formattedMessage = getString(R.string.delete_task_message,
String formattedMessage = getString(R.string.delete_activity_message,
selectedTask.getTaskName());
return new AlertDialog.Builder(Tasks.this).setTitle(R.string.delete_task_title).setIcon(android.R.drawable.stat_sys_warning).setCancelable(true).setMessage(formattedMessage).setPositiveButton(R.string.delete_ok, new DialogInterface.OnClickListener() {
return new AlertDialog.Builder(Tasks.this).setTitle(R.string.delete_activity_title).setIcon(android.R.drawable.stat_sys_warning).setCancelable(true).setMessage(formattedMessage).setPositiveButton(R.string.delete_ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
adapter.deleteTask(selectedTask);
Tasks.this.getListView().invalidate();
Expand Down Expand Up @@ -705,11 +705,11 @@ protected void onPrepareDialog(int id, Dialog d) {
EditText textView;
switch (id) {
case ADD_TASK:
textView = (EditText) d.findViewById(R.id.task_edit_name_edit);
textView = (EditText) d.findViewById(R.id.activity_edit_name_edit);
textView.setText("");
break;
case EDIT_TASK:
textView = (EditText) d.findViewById(R.id.task_edit_name_edit);
textView = (EditText) d.findViewById(R.id.activity_edit_name_edit);
textView.setText(selectedTask.getTaskName());
break;
default:
Expand Down
6 changes: 3 additions & 3 deletions ...ker/app/src/main/res/layout/edit_task.xml → ...app/src/main/res/layout/edit_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
android:layout_height="fill_parent">

<TextView
android:id="@+id/task_edit_name_label"
android:id="@+id/activity_edit_name_label"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginLeft="10dip"
android:layout_marginTop="5dip"
android:layout_marginBottom="5dip"
android:text="@string/task_name"
android:text="@string/activity_name"
android:gravity="left"
android:textAppearance="?android:attr/textAppearanceMedium" />
<EditText
android:id="@+id/task_edit_name_edit"
android:id="@+id/activity_edit_name_edit"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_marginTop="0dip"
Expand Down
26 changes: 13 additions & 13 deletions android-timetracker/app/src/main/res/values-de/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<string name="app_name">A Time Tracker</string>

<string name="start">Start</string>
<string name="task_name">Aufgabe</string>
<string name="add_task_ok">Füge Aufgabe hinzu</string>
<string name="task_name_required">Ein Aufgabenname ist erforderlich</string>
<string name="activity_name">Aktivität</string>
<string name="add_activity_ok">Füge Aktivität hinzu</string>
<string name="activity_name_required">Ein Aktivitätname ist erforderlich</string>
<string name="start_time_required">Eine Startzeit ist erforderlich</string>

<string name="change_date_range">Zeitbereich ändern</string>
Expand All @@ -14,13 +14,13 @@
<string name="restore_from_backup">Von Speicher wiederherstellen</string>

<string name="delete_ok">Löschen</string>
<string name="delete_task_title">Lösche Aufgabe</string>
<string name="delete_task_message">Bist du sicher, dass du \'%s\' und alle zugehörigen Zeiten löschen möchtest?</string>
<string name="add_task_title">Füge Aufgabe hinzu</string>
<string name="delete_activity_title">Lösche Aktivität</string>
<string name="delete_activity_message">Bist du sicher, dass du \'%s\' und alle zugehörigen Zeiten löschen möchtest?</string>
<string name="add_activity_title">Füge Aktivität hinzu</string>
<string name="change_view_title">Wechsel Ansicht</string>
<string name="generate_report_title">Bericht</string>
<string name="select_range">Zeitbereich auswählen…</string>
<string name="done">Zurück zu Aufgaben</string>
<string name="done">Zurück zu activities</string>
<string name="add_time_title">Neue Zeiten hinzufügen</string>
<string name="delete_time_message">Bist du sicher, dass du diese Zeiten löschen möchtest?</string>
<string name="delete_time_title">Lösche Zeiten</string>
Expand All @@ -33,9 +33,9 @@
<string name="title">A Time Tracker (%s)</string>
<string name="help">Hilfe</string>
<string name="export_view">Export</string>
<string name="move_time">Weise Zeit einer anderen Aufgabe zu</string>
<string name="edit_task">Bearbeite Aufgabe</string>
<string name="delete_task">Lösche Aufgabe</string>
<string name="move_time">Weise Zeit einer anderen Aktivität zu</string>
<string name="edit_activity">Bearbeite Aktivität</string>
<string name="delete_activity">Lösche Aktivität</string>
<string name="show_times">Zeige Zeiten</string>

<!-- Settings strings -->
Expand All @@ -44,7 +44,7 @@
<string name="week_start_day">Start der Woche</string>
<string name="hour_mode">12/24-Stunden-Modus</string>
<string name="font_size">Schriftgröße</string>
<string name="concurrency">Mehrere gleichzeitig laufende Aufgaben</string>
<string name="concurrency">Mehrere gleichzeitig laufende Activities</string>
<string name="sound">Sound</string>
<string name="vibrate">Vibration</string>
<!-- Settings values -->
Expand All @@ -55,8 +55,8 @@
<string name="small_font">Klein</string>
<string name="medium_font">Mittel</string>
<string name="large_font">Groß</string>
<string name="concurrent">Aufgaben können gleichzeitig laufen</string>
<string name="exclusive">Nur eine Aufgabe kann gleichzeitig laufen</string>
<string name="concurrent">Activities can run at the same time</string>
<string name="exclusive">Only one activity can run at a time</string>
<string name="sound_enabled">Sound aktiviert</string>
<string name="sound_disabled">Sound deaktiviert</string>
<string name="vibrate_enabled">Vibration aktiviert</string>
Expand Down
16 changes: 8 additions & 8 deletions android-timetracker/app/src/main/res/values-es/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<string name="app_name">A Time Tracker</string>

<string name="start">Iniciar</string>
<string name="task_name">Nombre de la actividad</string>
<string name="add_task_ok">Añadir actividad</string>
<string name="task_name_required">Nombre de la actividad obligatorio</string>
<string name="activity_name">Nombre de la actividad</string>
<string name="add_activity_ok">Añadir actividad</string>
<string name="activity_name_required">Nombre de la actividad obligatorio</string>
<string name="start_time_required">Hora de la actividad obligatorio</string>

<string name="change_date_range">Cambiar periodo</string>
Expand All @@ -15,9 +15,9 @@
<string name="restore_from_backup">Restaurar copia de seguridad</string>

<string name="delete_ok">Eliminar</string>
<string name="delete_task_title">Eliminar actividad</string>
<string name="delete_task_message">De verdad quiere eliminar \'%s\' y los datos asociados?</string>
<string name="add_task_title">Añadir actividad</string>
<string name="delete_activity_title">Eliminar actividad</string>
<string name="delete_activity_message">De verdad quiere eliminar \'%s\' y los datos asociados?</string>
<string name="add_activity_title">Añadir actividad</string>
<string name="change_view_title">Cambiar vista</string>
<string name="generate_report_title">Reporte</string>
<string name="select_range">Elegir periodo…</string>
Expand All @@ -35,8 +35,8 @@
<string name="help">Ayuda</string>
<string name="export_view">Exportar</string>
<string name="move_time">Asignar este tiempo a otra actividad</string>
<string name="edit_task">Modificar la actividad</string>
<string name="delete_task">Eliminar la actividad</string>
<string name="edit_activity">Modificar la actividad</string>
<string name="delete_activity">Eliminar la actividad</string>
<string name="show_times">Mostrar tiempos</string>

<!-- Settings strings -->
Expand Down
Loading