aboutsummaryrefslogtreecommitdiff
path: root/AT91SAM7S256/Resource/TEXT/Ui.txt
diff options
context:
space:
mode:
authorNicolas Schodet2011-07-04 01:23:24 +0200
committerNicolas Schodet2011-07-04 01:27:42 +0200
commitc331530002825a86f12151266a9772167a3a49ce (patch)
tree9a4bb16c6a87e30629da039e82cbf026dc361009 /AT91SAM7S256/Resource/TEXT/Ui.txt
parent0cb650f1cf6f446bbb0186300a198b5936f49bb4 (diff)
parentb0472321014e8fcb110f4cecad734bb6a7e27ae0 (diff)
Merge branch 'jch-import' into jch-mergejch-merge
Conflicts: AT91SAM7S256/Source/BtTest.inc AT91SAM7S256/Source/Functions.inl AT91SAM7S256/Source/Ui.txt AT91SAM7S256/Source/c_cmd.c AT91SAM7S256/Source/c_input.c AT91SAM7S256/Source/c_output.c AT91SAM7S256/Source/c_ui.c AT91SAM7S256/Source/c_ui.h AT91SAM7S256/Source/d_loader.h AT91SAM7S256/Source/d_lowspeed.r AT91SAM7S256/Source/d_output.c AT91SAM7S256/Source/d_output.h
Diffstat (limited to 'AT91SAM7S256/Resource/TEXT/Ui.txt')
-rw-r--r--AT91SAM7S256/Resource/TEXT/Ui.txt10
1 files changed, 0 insertions, 10 deletions
diff --git a/AT91SAM7S256/Resource/TEXT/Ui.txt b/AT91SAM7S256/Resource/TEXT/Ui.txt
index b0ab7ea..98769e6 100644
--- a/AT91SAM7S256/Resource/TEXT/Ui.txt
+++ b/AT91SAM7S256/Resource/TEXT/Ui.txt
@@ -17,9 +17,6 @@ Memory full!
File saved
File exists
overwrite!
-Saved as
-File exist
-overwrite!
File deleted
Files
deleted
@@ -29,11 +26,6 @@ Done
File error!
Deleting all
%s files!
-Press Clear to
-stop DataLogging
-Port occupied!
-H:MM:SS:00
-HH:MM:SS
Sound
Software
NXT
@@ -56,6 +48,4 @@ BT store is
full error!
BT unknown
addr. error!
-Memory is
-full!
Never