--- android/TrainInfo/src/dk/thoerup/traininfo/TimetableList.java	2011/04/04 15:28:12	1257
+++ android/TrainInfo/src/dk/thoerup/traininfo/TimetableList.java	2011/04/05 13:00:34	1265
@@ -68,21 +68,19 @@
 		String note = departure.getNote() != null ? departure.getNote() : "";
 		note = note.replace("Aflyst", this.getString(R.string.timetablelist_cancelled) );
 		note = note.replace("Kører kun til", this.getString(R.string.timetablelist_goesonlyto) );
-		
-		// tilføj: 
-		// * afgår fra
-		// * eksterne forhold
-		// * teknisk fejl på et signal
-
-		
+		note = note.replace("Afgår fra", this.getString(R.string.timetablelist_startsat) );
+		note = note.replace("Erstattet af", this.getString(R.string.timetablelist_replacedby) );
+		note = note.replace("Eksterne forhold", this.getString(R.string.timetablelist_externalconditions) );
+		note = note.replace("Teknisk fejl på et signal", this.getString(R.string.timetablelist_technicalerroronsignal) );
+		note = note.replace("Materielforhold", this.getString(R.string.timetablelist_equipmentcircumstances) );
+		
+		// TODO: missing translations:
+		// * Forventet rettidig afgang fra <station>
+		// * Forventet rettidig afgang.
 		
 		((TextView)findViewById(R.id.Status)).setText(status);
 		((TextView)findViewById(R.id.Note)).setText(note);
-		
-
-		
-		
-						
+							
 		
 		ProviderFactory.purgeOldEntries(); //cleanup before fetching more data
 		
@@ -188,7 +186,7 @@
 			super.onPostExecute(result);
 			dismissDialog(DLG_PROGRESS);
 	
-			
+			//TODO: differentiate between a communication error and a downed bane.dk site  
 			if (timetables != null) {
 				commFailCounter = 0;
 				TimetableList.this.getListView().invalidateViews();