diff --git a/android-timetracker/app/src/main/java/com/markuspage/android/atimetracker/Report.java b/android-timetracker/app/src/main/java/com/markuspage/android/atimetracker/Report.java
index 64f6bc5..0104747 100644
--- a/android-timetracker/app/src/main/java/com/markuspage/android/atimetracker/Report.java
+++ b/android-timetracker/app/src/main/java/com/markuspage/android/atimetracker/Report.java
@@ -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;
@@ -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));
diff --git a/android-timetracker/app/src/main/java/com/markuspage/android/atimetracker/TaskTimes.java b/android-timetracker/app/src/main/java/com/markuspage/android/atimetracker/TaskTimes.java
index 852afb9..83f4891 100644
--- a/android-timetracker/app/src/main/java/com/markuspage/android/atimetracker/TaskTimes.java
+++ b/android-timetracker/app/src/main/java/com/markuspage/android/atimetracker/TaskTimes.java
@@ -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)
diff --git a/android-timetracker/app/src/main/java/com/markuspage/android/atimetracker/Tasks.java b/android-timetracker/app/src/main/java/com/markuspage/android/atimetracker/Tasks.java
index b6cf1fc..6601ad5 100644
--- a/android-timetracker/app/src/main/java/com/markuspage/android/atimetracker/Tasks.java
+++ b/android-timetracker/app/src/main/java/com/markuspage/android/atimetracker/Tasks.java
@@ -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);
@@ -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));
     }
 
@@ -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();
@@ -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);
 
@@ -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();
@@ -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:
diff --git a/android-timetracker/app/src/main/res/layout/edit_task.xml b/android-timetracker/app/src/main/res/layout/edit_activity.xml
similarity index 88%
rename from android-timetracker/app/src/main/res/layout/edit_task.xml
rename to android-timetracker/app/src/main/res/layout/edit_activity.xml
index eb811cd..c13eb32 100644
--- a/android-timetracker/app/src/main/res/layout/edit_task.xml
+++ b/android-timetracker/app/src/main/res/layout/edit_activity.xml
@@ -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"
diff --git a/android-timetracker/app/src/main/res/values-de/strings.xml b/android-timetracker/app/src/main/res/values-de/strings.xml
index 3ebbba2..e52c347 100644
--- a/android-timetracker/app/src/main/res/values-de/strings.xml
+++ b/android-timetracker/app/src/main/res/values-de/strings.xml
@@ -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>
@@ -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>
@@ -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    -->
@@ -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 -->
@@ -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>
diff --git a/android-timetracker/app/src/main/res/values-es/strings.xml b/android-timetracker/app/src/main/res/values-es/strings.xml
index 10309ce..8d99ce2 100644
--- a/android-timetracker/app/src/main/res/values-es/strings.xml
+++ b/android-timetracker/app/src/main/res/values-es/strings.xml
@@ -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>
@@ -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>
@@ -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    -->
diff --git a/android-timetracker/app/src/main/res/values-fr/strings.xml b/android-timetracker/app/src/main/res/values-fr/strings.xml
index 58e8852..1ee2f0c 100644
--- a/android-timetracker/app/src/main/res/values-fr/strings.xml
+++ b/android-timetracker/app/src/main/res/values-fr/strings.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Translation by Wilfried Kopp -->
 <resources>
     <string name="app_name">A Time Tracker</string>
     
     <string name="start">Démarrer</string>
-    <string name="task_name">Nom de la tâche</string>
-    <string name="add_task_ok">Ajouter tâche</string>
-    <string name="task_name_required">Le nom de la tâche est requis</string>
+    <string name="activity_name">Activity name</string>
+    <string name="add_activity_ok">Add activity</string>
+    <string name="activity_name_required">Le nom de la activity est requis</string>
     <string name="start_time_required">L´heure de début est requis</string>
 
     <string name="change_date_range">Changer la période</string>
@@ -15,13 +14,13 @@
     <string name="restore_from_backup">Restorer depuis backup</string>
 
     <string name="delete_ok">Effacer</string>
-    <string name="delete_task_title">Effacer tâche</string>
-    <string name="delete_task_message">Voulez-vous vraiment effacer \'%s\' et les données associées ?</string>
-    <string name="add_task_title">Ajouter tâche</string>
+    <string name="delete_activity_title">Delete activity</string>
+    <string name="delete_activity_message">Voulez-vous vraiment effacer \'%s\' et les données associées ?</string>
+    <string name="add_activity_title">Add activity</string>
     <string name="change_view_title">Changer la vue</string>
     <string name="generate_report_title">Rapport</string>
     <string name="select_range">Choisir la période…</string>
-    <string name="done">Retour aux tâches</string>
+    <string name="done">Retour aux activities</string>
     <string name="add_time_title">Ajouter période</string>
     <string name="delete_time_message">Voulez-vous vraiment effacer cette période ?</string>
     <string name="delete_time_title">Effacer la période</string>
@@ -29,14 +28,14 @@
     <string name="end_time_label">Heure de fin</string>
     <string name="end_not_greater_than_start">L´heure de fin doit être après l´heure de début</string>
     <string name="range_error_title">Erreur dans la période</string>
-    <string name="report_title">Rapport pour la semaine %1$s à %2$s </string>
+    <string name="report_title">Rapport pour la semaine %1$s à %2$s</string>
     <string name="week">Semaine %s</string>
     <string name="title">A Time Tracker (%s)</string>
     <string name="help">Aide</string>
     <string name="export_view">Exporter</string>
-    <string name="move_time">Assigner cette durée à une autre tâche</string>
-    <string name="edit_task">Modifier la tâche</string>
-    <string name="delete_task">Supprimer la tâche</string>
+    <string name="move_time">Assigner cette durée à une autre activity</string>
+    <string name="edit_activity">Edit activity</string>
+    <string name="delete_activity">Delete activity</string>
     <string name="show_times">Affichage l\'heure</string>
 
     <!--    Settings strings    -->
@@ -45,7 +44,7 @@
     <string name="week_start_day">Premier jour de la semaine</string>
     <string name="hour_mode">Mode 12/24</string>
     <string name="font_size">Taille de police</string>
-    <string name="concurrency">Tâche concurentes multiples</string>
+    <string name="concurrency">Multiple concurrently running activities</string>
     <string name="sound">Son</string>
     <string name="vibrate">Vibrer</string>
     <!-- Settings values -->
@@ -56,8 +55,8 @@
     <string name="small_font">Petit</string>
     <string name="medium_font">Moyen</string>
     <string name="large_font">Grand</string>
-    <string name="concurrent">Les tâche peuvent s´executer simultanément</string>
-    <string name="exclusive">Une seule tâche à la fois</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">Son activé</string>
     <string name="sound_disabled">Son désactivé</string>
     <string name="vibrate_enabled">Vibration activée</string>
@@ -65,37 +64,38 @@
     <string name="time_display">Affichage de l\'heure</string>
     <string name="standard_time">Standard (HH:MM)</string>
     <string name="decimal_time">Décimal (HH.hh)</string>
+    <string name="round_report_time">Arrondir les temps</string>
+    <string name="round_no">Non</string>
+    <string name="round_minutes">Arrondir à %d minutes</string>
 
     <!-- About dialog strings -->
     <string name="version">Version %s</string>
     <string name="author">Open Source Time Tracker</string>
     <string name="purpose">TimeTracker vous aide à enregistrer le temps passé à vos activités. Par exemple, pour enregistrer le temps passé à chaque tâche lors d´un projet professionnel. Il offre la possibilité d´afficher, d´éditer, et de filtrer les entrées et dispose d´une fonction de rapport.</string>
-    <string name="usage">
-    Instructions détaillées à https://github.com/netmackan/ATimeTracker\n\n
-    • Créer des tâches à l´aide des menus\n
-    • Cliquer sur une tâche pour démarrer l´enregistrement, cliquez de nouveau pour l´arrêter\n
-    • Utilisez le menu contextuel sur une tâche pour afficher les détails\n
-    • Changer les options de configuration à l´aide du menu\n
-    • Afficher un rapport hebdomadaire à l´aide du menu\n
-    \n
-    Cliquer sur une autre tâche bascule l´enregistrement sur cette autre tâche.\n
-    \n
-    Le menu contextuel d´une tâche permet d´éditer la tâche (changer son nom), effacer la tâche (y compris les données associées!), ou afficher le détail des enregistrements de la tâche.\n
-    \n
-    <b>Afficher les enregistrements</b>\n
-    \n
-    Le détail des enregsitrements est filtré sur la même période que la sélection faites depuis la vue principale. Donc si vous choisissez d´afficher les durées sur <i>cette semaine</i> et que vous ouvrez le détails des enregistrements, vous verrez uniquement les données de cette semaine. Utilisez le menu <i>Ajouter période</i> pour ajouter des enregistrements manuellement.  Utilisez le menu contextuel afin d´effacer ou éditer une période.\n
-    \n
-    <b>Note:</b> TimeTracker ne vous empechera pas de créer des périodes qui se recouvrent pour la tâche courante ou une autre.
-    </string>
-    <string name="credits"><b>Credits</b>\n
-    \n
-    Based on TimeTracker+ by Sean E. Russell.\n
-    Application icon from Tango Project (tango.freedesktop.org).\n
-    Tranduction en Russe par Денис Гладкий\n
-    Tranduction en Français par Wilfried Kopp
-	</string>
-    <string name="export_csv_success">Exporté avec succès du CSV vers la carte SD sous timetracker.db</string>
+    <string name="usage">Instructions détaillées à https://github.com/netmackan/ATimeTracker\n
+  \n
+       • Créer des tâches à l´aide des menus\n
+       • Cliquer sur une tâche pour démarrer l´enregistrement, cliquez de nouveau pour l´arrêter\n
+       • Utilisez le menu contextuel sur une tâche pour afficher les détails\n
+       • Changer les options de configuration à l´aide du menu\n
+       • Afficher un rapport hebdomadaire à l´aide du menu\n
+       \n
+       Cliquer sur une autre tâche bascule l´enregistrement sur cette autre tâche.\n
+       \n
+       Le menu contextuel d´une tâche permet d´éditer la tâche (changer son nom), effacer la tâche (y compris les données associées!), ou afficher le détail des enregistrements de la tâche.\n
+       \n
+       <b >Afficher les enregistrements</b>\n
+       \n
+       Le détail des enregsitrements est filtré sur la même période que la sélection faites depuis la vue principale. Donc si vous choisissez d´afficher les durées sur <i >cette semaine</i> et que vous ouvrez le détails des enregistrements, vous verrez uniquement les données de cette semaine. Utilisez le menu <i >Ajouter période</i> pour ajouter des enregistrements manuellement.  Utilisez le menu contextuel afin d´effacer ou éditer une période.\n
+       \n
+       <b >Note:</b> TimeTracker ne vous empechera pas de créer des périodes qui se recouvrent pour la tâche courante ou une autre.</string>
+    <string name="credits"><b >Credits</b>\n
+       \n
+       Based on TimeTracker+ by Sean E. Russell.\n
+       Application icon from Tango Project (tango.freedesktop.org).\n
+       Tranduction en Russe par Денис Гладкий\n
+       Tranduction en Français par Wilfried Kopp</string>
+    <string name="export_csv_success">Exporté avec succès du CSV vers la carte SD sous \'%s\'</string>
     <string name="export_csv_fail">Erreur lors de l´exportation CSV. Impossible de créer le fichier. La carte SD est-elle présente ?</string>
     <string name="success">Succès</string>
     <string name="failure">Erreur</string>
diff --git a/android-timetracker/app/src/main/res/values-it/strings.xml b/android-timetracker/app/src/main/res/values-it/strings.xml
index cfb4eec..6dfb51c 100644
--- a/android-timetracker/app/src/main/res/values-it/strings.xml
+++ b/android-timetracker/app/src/main/res/values-it/strings.xml
@@ -4,9 +4,9 @@
     <string name="app_name">A Time Tracker</string>
     
     <string name="start">Inizio</string>
-    <string name="task_name">Nome del compito</string>
-    <string name="add_task_ok">Aggiungere compito</string>
-    <string name="task_name_required">Nome del compito richiesto</string>
+    <string name="activity_name">Activity name</string>
+    <string name="add_activity_ok">Add activity</string>
+    <string name="activity_name_required">Nome del activity richiesto</string>
     <string name="start_time_required">Ora di inizio richiesta</string>
 
     <string name="change_date_range">Cambia intervallo</string>
@@ -15,9 +15,9 @@
     <string name="restore_from_backup">Rirpistina backup</string>
 
     <string name="delete_ok">Cancellare</string>
-    <string name="delete_task_title">Eliminare compito</string>
-    <string name="delete_task_message">Sei sicuro di cancellare \'%s\' e tutti dati collegati?</string>
-    <string name="add_task_title">Aggiungere compito</string>
+    <string name="delete_activity_title">Eliminare activity</string>
+    <string name="delete_activity_message">Sei sicuro di cancellare \'%s\' e tutti dati collegati?</string>
+    <string name="add_activity_title">Add activity</string>
     <string name="change_view_title">Cambia vista</string>
     <string name="generate_report_title">Rapporto</string>
     <string name="select_range">Seleziona intervallo…</string>
@@ -34,9 +34,9 @@
     <string name="title">A Time Tracker (%s)</string>
     <string name="help">Assistenza</string>
     <string name="export_view">Esportare</string>
-    <string name="move_time">Assegnare tempo per altro compito</string>
-    <string name="edit_task">Modifica compito</string>
-    <string name="delete_task">Cancellare compito</string>
+    <string name="move_time">Assign time to other activity</string>
+    <string name="edit_activity">Edit activity</string>
+    <string name="delete_activity">Delete activity</string>
     <string name="show_times">Mostrare tempi</string>
 
     <!--    Settings strings    -->
@@ -45,7 +45,7 @@
     <string name="week_start_day">Giorno d\'inizio settimana</string>
     <string name="hour_mode">Modo 12/24</string>
     <string name="font_size">Dimensione del carattere</string>
-    <string name="concurrency">Simultaneità dei compiti</string>
+    <string name="concurrency">Multiple concurrently running activities</string>
     <string name="sound">Audio</string>
     <string name="vibrate">Vibrare</string>
     <!-- Settings values -->
@@ -57,7 +57,7 @@
     <string name="medium_font">Medio</string>
     <string name="large_font">Grande</string>
     <string name="concurrent">Attività simultanee</string>
-    <string name="exclusive">Solo un compito alla volta</string>
+    <string name="exclusive">Only one activity can run at a time</string>
     <string name="sound_enabled">Audio attivo</string>
     <string name="sound_disabled">Audio spento</string>
     <string name="vibrate_enabled">Vibrazione attiva</string>
diff --git a/android-timetracker/app/src/main/res/values-ru/strings.xml b/android-timetracker/app/src/main/res/values-ru/strings.xml
index cde8f56..f1ece14 100644
--- a/android-timetracker/app/src/main/res/values-ru/strings.xml
+++ b/android-timetracker/app/src/main/res/values-ru/strings.xml
@@ -3,9 +3,9 @@
     <string name="app_name">A Time Tracker</string>
     
     <string name="start">Старт</string>
-    <string name="task_name">Название задачи</string>
-    <string name="add_task_ok">Добавить задачу</string>
-    <string name="task_name_required">Требуется указать название задачи</string>
+    <string name="activity_name">Activity name</string>
+    <string name="add_activity_ok">Add activity</string>
+    <string name="activity_name_required">The activity name is required</string>
     <string name="start_time_required">Требуется указать время старта</string>
 
     <string name="change_date_range">Изменить интервал дат</string>
@@ -14,13 +14,13 @@
     <string name="restore_from_backup">Восстановить</string>
 
     <string name="delete_ok">Удалить</string>
-    <string name="delete_task_title">Удалить задачу</string>
-    <string name="delete_task_message">Вы уверены, что хотите удалить \'%s\' и все её записи временных интервалов?</string>
-    <string name="add_task_title">Добавить задачу</string>
+    <string name="delete_activity_title">Delete activity</string>
+    <string name="delete_activity_message">Вы уверены, что хотите удалить \'%s\' и все её записи временных интервалов?</string>
+    <string name="add_activity_title">Add activity</string>
     <string name="change_view_title">Изменить вид</string>
     <string name="generate_report_title">Отчёт</string>
     <string name="select_range">Выбрать интервал…</string>
-    <string name="done">Вернуться к задачам</string>
+    <string name="done">Return to activities</string>
     <string name="add_time_title">Добавить новый временной интервал</string>
     <string name="delete_time_message">Вы уверены, что хотите удалить этот временной интервал?</string>
     <string name="delete_time_title">Удалить временной интервал</string>
@@ -33,9 +33,9 @@
     <string name="title">A Time Tracker (%s)</string>
     <string name="help">Помощь</string>
     <string name="export_view">Экспорт</string>
-    <string name="move_time">Назначить время для задачи</string>
-    <string name="edit_task">Редактирование задачи</string>
-    <string name="delete_task">Удалить задачу</string>
+    <string name="move_time">Assign time to other activity</string>
+    <string name="edit_activity">Edit activity</string>
+    <string name="delete_activity">Delete activity</string>
     <string name="show_times">Показать времена</string>
 
     <!--    Settings strings    -->
@@ -44,7 +44,7 @@
     <string name="week_start_day">Первый день недели</string>
     <string name="hour_mode">12/24 часовой режим</string>
     <string name="font_size">Размер шрифта</string>
-    <string name="concurrency">Несколько одновременно запущенных задач</string>
+    <string name="concurrency">Multiple concurrently running activities</string>
     <string name="sound">Звук</string>
     <string name="vibrate">Вибрация</string>
     <!-- Settings values -->
@@ -55,8 +55,8 @@
     <string name="small_font">Маленький</string>
     <string name="medium_font">Средний</string>
     <string name="large_font">Большой</string>
-    <string name="concurrent">Задачи могут быть запущены одновременно</string>
-    <string name="exclusive">Только одна задача может быть запущена</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">Звук включён</string>
     <string name="sound_disabled">Звук отключен</string>
     <string name="vibrate_enabled">Вибрация включена</string>
diff --git a/android-timetracker/app/src/main/res/values/arrays.xml b/android-timetracker/app/src/main/res/values/arrays.xml
index 88fa540..e1e96b3 100644
--- a/android-timetracker/app/src/main/res/values/arrays.xml
+++ b/android-timetracker/app/src/main/res/values/arrays.xml
@@ -25,7 +25,7 @@
         <item>Set time format (%s)</item>
         <item>Audible click (%s)</item>
         <item>Vibrate on click (%s)</item>
-        <item>Concurrent task tracking (%s)</item>
+        <item>Concurrent activity tracking (%s)</item>
         <item>Font size (%s)</item>
         <item>DB location (%s)</item>
     </string-array>
diff --git a/android-timetracker/app/src/main/res/values/strings.xml b/android-timetracker/app/src/main/res/values/strings.xml
index 1b77893..687ebfa 100644
--- a/android-timetracker/app/src/main/res/values/strings.xml
+++ b/android-timetracker/app/src/main/res/values/strings.xml
@@ -3,9 +3,9 @@
     <string name="app_name">A Time Tracker</string>
     
     <string name="start">Start</string>
-    <string name="task_name">Task name</string>
-    <string name="add_task_ok">Add task</string>
-    <string name="task_name_required">The task name is required</string>
+    <string name="activity_name">Activity name</string>
+    <string name="add_activity_ok">Add activity</string>
+    <string name="activity_name_required">The activity name is required</string>
     <string name="start_time_required">The start time is required</string>
 
     <string name="change_date_range">Change date range</string>
@@ -14,13 +14,13 @@
     <string name="restore_from_backup">Restore from backup</string>
 
     <string name="delete_ok">Delete</string>
-    <string name="delete_task_title">Delete Task</string>
-    <string name="delete_task_message">Are you sure you want to delete \'%s\' and all of it\'s time records?</string>
-    <string name="add_task_title">Add task</string>
+    <string name="delete_activity_title">Delete Activity</string>
+    <string name="delete_activity_message">Are you sure you want to delete \'%s\' and all of it\'s time records?</string>
+    <string name="add_activity_title">Add activity</string>
     <string name="change_view_title">Change view</string>
     <string name="generate_report_title">Report</string>
     <string name="select_range">Select range…</string>
-    <string name="done">Return to tasks</string>
+    <string name="done">Return to activities</string>
     <string name="add_time_title">Add a new time range</string>
     <string name="delete_time_message">Are you sure you want to delete this time range?</string>
     <string name="delete_time_title">Delete Time Range</string>
@@ -33,9 +33,9 @@
     <string name="title">A Time Tracker (%s)</string>
     <string name="help">Help</string>
     <string name="export_view">Export</string>
-    <string name="move_time">Assign time to other task</string>
-    <string name="edit_task">Edit Task</string>
-    <string name="delete_task">Delete Task</string>
+    <string name="move_time">Assign time to other activity</string>
+    <string name="edit_activity">Edit Activity</string>
+    <string name="delete_activity">Delete Activity</string>
     <string name="show_times">Show Times</string>
 
     <!--    Settings strings    -->
@@ -44,7 +44,7 @@
     <string name="week_start_day">Week start day</string>
     <string name="hour_mode">12/24 hour mode</string>
     <string name="font_size">Font size</string>
-    <string name="concurrency">Multiple concurrently running tasks</string>
+    <string name="concurrency">Multiple concurrently running activities</string>
     <string name="sound">Sound</string>
     <string name="vibrate">Vibrate</string>
     <!-- Settings values -->
@@ -55,8 +55,8 @@
     <string name="small_font">Small</string>
     <string name="medium_font">Medium</string>
     <string name="large_font">Large</string>
-    <string name="concurrent">Tasks can run at the same time</string>
-    <string name="exclusive">Only one task can run at a time</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 enabled</string>
     <string name="sound_disabled">Sound disabled</string>
     <string name="vibrate_enabled">Vibrate enabled</string>
@@ -77,28 +77,28 @@
         time sheet report as well.</string>
     <string name="usage">
     Detailed instructions are at https://github.com/netmackan/ATimeTracker\n\n
-    • Create some tasks using the menu\n
-    • Tap a task to start timing; tap it again to stop timing\n
-    • Use the context menu for a task to list times\n
+    • Create some activities using the menu\n
+    • Tap a activity to start timing; tap it again to stop timing\n
+    • Use the context menu for a activity to list times\n
     • Change configuration options with the menu\n
     • View a weekly report with the menu\n
     \n
-    Tapping a different task switches timing to the other task.\n
+    Tapping a different activity switches timing to the other activity.\n
     \n
-    The task context menu allows you to edit tasks (change their names), delete tasks
-    (including all of the time history for that task!), or view the time log for that
-    task.\n
+    The activity context menu allows you to edit activities (change their names), delete activities
+    (including all of the time history for that activity!), or view the time log for that
+    activity.\n
     \n
     <b>Time Log view</b>\n
     \n
-    The time log for a task is filtered on the same range that you selected for the
-    main task view, so if you filtered the task view for <i>This Week</i> and you open
+    The time log for a activity is filtered on the same range that you selected for the
+    main activity view, so if you filtered the activity view for <i>This Week</i> and you open
     the time log, then you\'ll only see times for this week.  Use the <i>Add Time</i> 
     menu item to manually insert times into the time log.  Use the context menu
     for a time to delete or edit a time range.\n
     \n
     <b>Note</b> that TimeTracker will not prevent you from creating times that overlap
-    with times in other (or the same) task.
+    with times in other (or the same) activity.
     </string>
     <string name="credits"><b>Credits</b>\n
     \n