Changeset 6143 for branches/stable_5.0

Timestamp:

15/08/09 14:13:42 (3 years ago)

Author:

westram

Message:

• backport [6141] (parts changing code, but only strings and comments)

Location:

branches/stable_5.0

Files:

• ARBDB/ad_load.c (modified) (2 diffs)
• ARBDB/adali.c (modified) (1 diff)
• ARBDB/adcomm.c (modified) (2 diffs)
• ARBDB/adlang1.c (modified) (2 diffs)
• ARBDB/admalloc.c (modified) (3 diffs)
• ARBDB/adquery.c (modified) (4 diffs)
• ARBDB/adseqcompr.c (modified) (3 diffs)
• ARBDB/adsocket.c (modified) (5 diffs)
• ARBDB/adtables.c (modified) (1 diff)
• ARBDB/adtools.c (modified) (2 diffs)
• ARBDB/adtree.c (modified) (3 diffs)
• ARBDB/adtune.c (modified) (1 diff)
• ARBDB/adtune.h (modified) (1 diff)
• ARBDB/arb_assert.h (modified) (1 diff)
• ARBDB/arbdb.c (modified) (4 diffs)
• ARBDB/arbdb.h (modified) (2 diffs)
• ARBDB/arbdb_base.h (modified) (2 diffs)
• ARBDBPP/admain.cxx (modified) (1 diff)
• ARBDBPP/adspecies.cxx (modified) (1 diff)
• ARB_GDE/GDE_arbdb_io.cxx (modified) (1 diff)
• AWT/AWT_canio.cxx (modified) (2 diffs)
• AWT/AWT_csp.cxx (modified) (3 diffs)
• AWT/AWT_dtree.cxx (modified) (1 diff)
• AWT/AWT_input_mask.cxx (modified) (1 diff)
• AWT/AWT_query_and_functions.cxx (modified) (6 diffs)
• AWT/AWT_sel_boxes.cxx (modified) (3 diffs)
• AWT/AWT_tree_cmp.cxx (modified) (1 diff)
• CONSENSUS_TREE/CT_mem.cxx (modified) (2 diffs)
• DIST/DI_matr.cxx (modified) (6 diffs)
• DIST/distanalyse.cxx (modified) (1 diff)
• EDIT4/ED4_main.cxx (modified) (1 diff)
• EDIT4/graph_aligner_gui.cxx (modified) (1 diff)
• GDE/MOLPHY/mltree.c (modified) (1 diff)
• GDE/RAxML/parsePartitions.c (modified) (1 diff)
• GENOM/EXP_interface.cxx (modified) (1 diff)
• GENOM/GEN_interface.cxx (modified) (2 diffs)
• GENOM/GEN_translations.cxx (modified) (2 diffs)
• NTREE/AP_csp_2_gnuplot.cxx (modified) (1 diff)
• NTREE/NT_concatenate.cxx (modified) (5 diffs)
• NTREE/NT_dbrepair.cxx (modified) (2 diffs)
• NTREE/NT_extern.cxx (modified) (1 diff)
• NTREE/NT_main.cxx (modified) (1 diff)
• NTREE/ad_spec.cxx (modified) (1 diff)
• NTREE/ad_transpro.cxx (modified) (4 diffs)
• PARSIMONY/AP_buffer.cxx (modified) (1 diff)
• PARSIMONY/AP_tree_nlen.cxx (modified) (1 diff)
• PARSIMONY/PARS_main.cxx (modified) (3 diffs)
• PROBE_DESIGN/probe_design.cxx (modified) (2 diffs)
• RNA3D/RNA3D_OpenGLEngine.cxx (modified) (1 diff)
• SEQ_QUALITY/SQ_main.cxx (modified) (1 diff)
• SL/FAST_ALIGNER/fast_aligner.cxx (modified) (1 diff)
• TOOLS/arb_export_tree.cxx (modified) (1 diff)
• TOOLS/arb_probe.cxx (modified) (2 diffs)
• TOOLS/arb_replace.cxx (modified) (1 diff)
• WINDOW/AW_button.cxx (modified) (6 diffs)
• WINDOW/AW_nawar.cxx (modified) (1 diff)
• arb_install.sh (modified) (2 diffs)

branches/stable_5.0/ARBDB/ad_load.c

@@ -629 +629 @@
             }
             if (!Main->keys[key].key) {
-                GB_internal_error("Some database fields have no field indentifier -> setting to 'main'");
+                GB_internal_error("Some database fields have no field identifier -> setting to 'main'");
                 gb_write_index_key(GB_FATHER(gbd),gbd->index,0);
             }
@@ -1130 +1130 @@
     }
     if (j>=255) {
-        gb_read_bin_error(in,(GBDATA *)gbd,"more then 255 dates are not allowed");
+        gb_read_bin_error(in,(GBDATA *)gbd,"more than 255 dates are not allowed");
         return 1;
     }

branches/stable_5.0/ARBDB/adali.c

@@ -91 +91 @@
                                       "Found %li duplicated species with identical names!\n"
                                       "Fix the problem using\n"
-                                      "   'Search For Equal Fields and Mark Duplikates'\n"
+                                      "   'Search For Equal Fields and Mark Duplicates'\n"
                                       "in ARB_NTREE search tool, save DB and restart ARB."
                                       , duplicates);

branches/stable_5.0/ARBDB/adcomm.c

@@ -1263 +1263 @@
             gb2 = gb_source;
             if (types != type) {
-                GB_internal_error("Type changed in client: Connection abortet\n");
+                GB_internal_error("Type changed in client: Connection aborted\n");
                 return GBCM_SERVER_FAULT;
             }
@@ -2097 +2097 @@
         long pid = getpid();
 
-        if (pid != lastpid) {   // dont install pid multiple times
+        if (pid != lastpid) {   // don't install pid multiple times
             char *pidfile_name;
             {

branches/stable_5.0/ARBDB/adlang1.c

@@ -160 +160 @@
 
                     case GB_BIT:
-                        // 'param=' is same as 'param' or 'param=1' (historical reason, dont change)
+                        // 'param=' is same as 'param' or 'param=1' (historical reason, don't change)
                         *(int *)para->varaddr = (value[0] ? atoi(value) : 1);
                         break;
@@ -1862 +1862 @@
         }
         else {
-            *error = "Container has neighter 'name' nor 'group_name' entry - can't detect container type";
+            *error = "Container has neither 'name' nor 'group_name' entry - can't detect container type";
         }
     }

branches/stable_5.0/ARBDB/admalloc.c

@@ -46 +46 @@
     size_t             size;            /* free size of current table */
     size_t             allsize;     /* full size of all tables */
-    struct gbm_table_struct *first; /* linkes list of tables */
+    struct gbm_table_struct *first; /* link list of tables */
     struct gbm_data_struct  *tables[GBM_MAX_TABLES + 1];    /* free entries */
     long             tablecnt[GBM_MAX_TABLES + 1];  /* number of free entries */
@@ -105 +105 @@
     }
     else {
-        fprintf(stderr,"Panic Error:    Unsufficient memory: tried to get %i*%i bytes : Increase Swap space\n",nelem,elsize);
+        fprintf(stderr,"Panic Error: insufficient memory: tried to get %i*%i bytes\n",nelem,elsize);
     }
     return mem;
@@ -186 +186 @@
     }
     else {
-        fprintf(stderr,"Panic Error:    Unsufficient memory: tried to get %i*%i bytes : Increase Swap space\n",nelem,elsize);
+        fprintf(stderr,"Panic Error: insufficient memory: tried to get %i*%i bytes\n",nelem,elsize);
     }
 

branches/stable_5.0/ARBDB/adquery.c

@@ -93 +93 @@
        GB_STRING/GB_LINK: compares string (case_sensitive or not)
        GB_INT: compares values
-       GB_FLOAT: dito (val MUST be a 'double*')
+       GB_FLOAT: ditto (val MUST be a 'double*')
        others: not implemented yet
 
@@ -283 +283 @@
         case down_level:    return GB_find_subcontent_by_quark((GBDATA*)gbc, key_quark, type, val, case_sens, after);
         case down_2_level:  return find_sub_sub_by_quark((GBDATA*)gbc, key, key_quark, type, val, case_sens, after);
-        default:            GB_internal_errorf("Unknown seach type %li",gbs); return NULL;
+        default:            GB_internal_errorf("Unknown search type %li",gbs); return NULL;
     }
 }
@@ -316 +316 @@
 
 GBDATA *GB_child(GBDATA *father) {
-    // return first child (or NULL if no childs)
+    // return first child (or NULL if no children)
     return GB_find(father, NULL, down_level);
 }
 GBDATA *GB_nextChild(GBDATA *child) {
-    // return next child after 'child' (or NULL if no more childs)
+    // return next child after 'child' (or NULL if no more children)
     return GB_find(child, NULL, this_level|search_next);
 }
@@ -772 +772 @@
 
 char *gbs_search_next_seperator(const char *source,const char *seps){
-    /* search the next seperator */
+    /* search the next separator */
     static char tab[256];
     static int flag = 0;

branches/stable_5.0/ARBDB/adseqcompr.c

@@ -11 +11 @@
 
 #if defined(DEBUG)
-/* dont do optimize, only create tree and save to DB */
+/* don't do optimize, only create tree and save to DB */
 /* #define SAVE_COMPRESSION_TREE_TO_DB */
 #endif /* DEBUG */
@@ -526 +526 @@
 
                         if (GB_read_clock(gbd) >= main_clock){
-                            GB_warning("A Species seems to be more than once in the tree");
+                            GB_warning("A species seems to be more than once in the tree");
                         }
                         else {
@@ -619 +619 @@
                             GBDATA *gbd = masters[si]->gbd;
 
-                            ad_assert(mi>si); /* we don't want a rekursion, because we cannot uncompress sequence compressed masters, Main->gb_master_data is wrong */
+                            ad_assert(mi>si); /* we don't want a recursion, because we cannot uncompress sequence compressed masters, Main->gb_master_data is wrong */
 
                             if (gb_read_nr(gbd) != si) { /* Check database */

branches/stable_5.0/ARBDB/adsocket.c

@@ -415 +415 @@
 
 /** read two values:    length and any user long
- *  if data are send be gbcm_write_two than b should be zero
+ *  if data are send be gbcm_write_two then b should be zero
  *  and is not used !!! */
 
@@ -735 +735 @@
     }
     if (buffer == MAP_FAILED){
-        GB_export_errorf("GB_map_file: Error Out of Memory: mmap failes (errno: %i)", errno);
+        GB_export_errorf("GB_map_file: Error: Out of Memory: mmap failed (errno: %i)", errno);
         return NULL;
     }
@@ -826 +826 @@
     
     // runs a command in an xterm
-    // if 'background' is true -> run asyncronous
-    // if 'wait_only_if_error' is true -> asyncronous does wait for keypress only if cmd fails
+    // if 'background' is true -> run asynchronous
+    // if 'wait_only_if_error' is true -> asynchronous does wait for keypress only if cmd fails
 
     void       *strstruct = GBS_stropen(1024);
@@ -1266 +1266 @@
 GB_CSTR GB_concat_path(GB_CSTR anypath_left, GB_CSTR anypath_right) {
     // concats left and right part of a path.
-    // '/' is inserted inbetween
+    // '/' is inserted in-between
     //
     // if one of the arguments is NULL = > returns the other argument
@@ -1355 +1355 @@
 
     if (error) {
-        // dont care if anything fails here..
+        // don't care if anything fails here..
         if (fp) { fclose(fp); fp = 0; }
         if (file) { unlink(file); file = 0; }

branches/stable_5.0/ARBDB/adtables.c

@@ -9 +9 @@
 /* *************** tables, for ARB BIO storage *******************
 
- *  hierarchical organisation:
+ *  hierarchical organization:
 
 

branches/stable_5.0/ARBDB/adtools.c

@@ -839 +839 @@
 {
     /* generates a call to 'arb_notify', meant to be inserted into some external system call.
-     * When that call is executed, the callback instanciated here will be called.
+     * When that call is executed, the callback instantiated here will be called.
      *
-     * Tip : To return variable results from the shell skript, use the name of an environment
+     * Tip : To return variable results from the shell script, use the name of an environment
      *       variable in 'message' (e.g. "$RESULT")
      */
@@ -926 +926 @@
             }
             else {
-                /* callback the instanciating DB client */
+                /* callback the instantiating DB client */
                 error = GB_write_string(gb_message, message);
             }

branches/stable_5.0/ARBDB/adtree.c

@@ -59 +59 @@
     else { // root node
         if (delNode->tree_is_one_piece_of_memory) {
-            // dont change root -> copy instead
+            // don't change root -> copy instead
             memcpy(delNode, tree, sizeof(GBT_TREE));
             tree = delNode;
@@ -85 +85 @@
             if (species_hash) {
                 gb_node = (GBDATA*)GBS_read_hash(species_hash, tree->name);
-                ad_assert(tree->gb_node == 0); // dont call linked tree with 'species_hash'!
+                ad_assert(tree->gb_node == 0); // don't call linked tree with 'species_hash'!
             }
             else gb_node = tree->gb_node;
@@ -525 +525 @@
 /** Loads a tree from the database into any user defined structure.
     make sure that the first eight members members of your
-    structure looks exectly like GBT_TREE, You should send the size
+    structure looks exactly like GBT_TREE, You should send the size
     of your structure ( minimum sizeof GBT_TREE) to this
     function.
 
-    If size < 0 then the tree is allocated as just one big piece of memery,
+    If size < 0 then the tree is allocated as just one big piece of memory,
     which can be freed by free((char *)root_of_tree) + deleting names or
     by GBT_delete_tree.

branches/stable_5.0/ARBDB/adtune.c

@@ -11 +11 @@
 const int GB_MAX_QUICK_SAVES      = 10;       /* maximum number of quick saves */
 
-const int GB_MAX_LOCAL_SEARCH = 256;           /* Maximum number of childs before doing a earch in the database server */
+const int GB_MAX_LOCAL_SEARCH = 256;           /* Maximum number of children before doing a search in the database server */
 
 const int GBTUM_SHORT_STRING_SIZE = 128;       /* the maximum strlen which is stored in short string format */

branches/stable_5.0/ARBDB/adtune.h

@@ -12 +12 @@
 extern const int GB_MAX_QUICK_SAVES     ;       /* maximum number of quick saves */
 
-extern const int GB_MAX_LOCAL_SEARCH        ;       /* Maximum number of childs before doing a earch in the database server */
+extern const int GB_MAX_LOCAL_SEARCH        ;       /* Maximum number of children before doing a search in the database server */
 
 extern const int GBTUM_SHORT_STRING_SIZE    ;       /* the maximum strlen which is stored in short string format */

branches/stable_5.0/ARBDB/arb_assert.h

@@ -20 +20 @@
  * to avoid ARBDB dependency!
  * 
- * ASSERT_CRASH                 if assert fails debugger stops at assert makro
+ * ASSERT_CRASH                 if assert fails debugger stops at assert macro
  * ASSERT_BACKTRACE_AND_CRASH   like ASSERT_CRASH - with backtrace
  * ASSERT_ERROR                 assert prints an error and ARB exits

branches/stable_5.0/ARBDB/arbdb.c

@@ -278 +278 @@
 GB_ERROR gb_unfold(GBCONTAINER *gbd, long deep, int index_pos)
 {
-    /* get data from server if deep than get subitems too.
+    /* get data from server.
+     * if deep, then get subitems too.
      * If index_pos >= 0, get indexed item from server
      *               <0, get all items
@@ -1621 +1622 @@
 
 
-/** if the temporary flag is set, than that entry (including all subentries) will not be saved*/
+/** if the temporary flag is set, then that entry (including all subentries) will not be saved*/
 GB_ERROR GB_set_temporary(GBDATA *gbd)
 {
@@ -1653 +1654 @@
     /* Starts a read only transaction !!;
        be sure that all data is cached
-       be extremely carefull !!!!! */
+       be extremely careful !!!!! */
     
     GB_MAIN_TYPE *Main = GB_MAIN(gbd);
@@ -2336 +2337 @@
 
     if (GB_read_clients(gb_main)>0)
-        return GB_export_errorf("There are %li clients (editors, tree programms) connected to this server,\n"
+        return GB_export_errorf("There are %li clients (editors, tree programs) connected to this server,\n"
                                 "please close clients and rerun operation",
                                 GB_read_clients(gb_main));

branches/stable_5.0/ARBDB/arbdb.h

@@ -56 +56 @@
 #else
 
-typedef long GB_REL_STRING;       /* relative adress */
-typedef long GB_REL_GBDATA;       /* relative adress */
-typedef long GB_REL_CONTAINER;    /* relative adress */
+typedef long GB_REL_STRING;       /* relative address */
+typedef long GB_REL_GBDATA;       /* relative address */
+typedef long GB_REL_CONTAINER;    /* relative address */
 
 #endif /*MEMORY_TEST==1*/
@@ -82 +82 @@
     unsigned int        unused: 1;  /* last bit saved */
     unsigned int        user_flags:8;
-    unsigned int        temporary:1;    /* ==1 -> dont save entry */
+    unsigned int        temporary:1;    /* ==1 -> don't save entry */
     unsigned int        saved_flags:8;
 };

branches/stable_5.0/ARBDB/arbdb_base.h

@@ -41 +41 @@
  * The following function handle char*'s, which either own a heap copy or are NULL.
  *
- * freeset:  assigns a heap-copy to a variable (variable is automatically free'd)
+ * freeset:  assigns a heap-copy to a variable (variable is automatically freed)
  * freedup:  similar to freeset, but strdup's the rhs-expression
  * reassign: similar to freeset, but rhs must be variable and will be set to NULL
@@ -48 +48 @@
  * Note: freeset, freedup and reassign may safely use the changed variable in the rhs-expression!
  *
- * @@@ the complete section could go into a seperate header,
+ * @@@ the complete section could go into a separate header,
  * but it makes no sense atm, cause we need GB_strdup for C compilation
  * (using a macro would evaluate 'str' in nulldup twice - which is not ok)

branches/stable_5.0/ARBDBPP/admain.cxx

@@ -53 +53 @@
     } else
     {
-        return new AD_ERR("database doesnt exist");
+        return new AD_ERR("database doesn't exist");
     }
 }

branches/stable_5.0/ARBDBPP/adspecies.cxx

@@ -178 +178 @@
     if (ad_species->gb_species != gb_species) {
         // muessen uebereinstimmen
-        new AD_ERR(" strange CALLBACK occured - int AD_SPECIES",CORE);
+        new AD_ERR(" strange CALLBACK occurred - int AD_SPECIES",CORE);
     }
 

branches/stable_5.0/ARB_GDE/GDE_arbdb_io.cxx

@@ -60 +60 @@
         size_t fl = filter->filter_len;
         if (fl < maxalignlen) {
-            aw_message("Warning Your filter is shorter than the alignment len");
+            aw_message("Warning: Your filter is shorter than the alignment len");
             maxalignlen = fl;
         }

branches/stable_5.0/AWT/AWT_canio.cxx

@@ -166 +166 @@
         }
 
-        // contraints and automatica: 
+        // constraints and automatics: 
     
         awr->awar(AWAR_PRINT_TREE_PSIZEX)->set_minmax(0.1, 100);
@@ -522 +522 @@
             if (usableSize<0.1) aw_message("Usable size very low. Wrong overlap amount?");
         }
-        usableSize += papersize * wantedpages; // add (partial) page (dont subtract overlapAmount)
+        usableSize += papersize * wantedpages; // add (partial) page (don't subtract overlapAmount)
     }
     else {

branches/stable_5.0/AWT/AWT_csp.cxx

@@ -96 +96 @@
     if (!error) {
         gb_ali = GB_entry(gb_sai,alignment_name);
-        if (!gb_ali) error = GB_export_error("Please select a valid Column Statist");
+        if (!gb_ali) error = GB_export_error("Please select a valid Column Statistic");
     }
     if (!error) {
         gb_freqs = GB_entry(gb_ali,"FREQUENCIES");
-        if (!gb_ali) error = GB_export_error("Please select a valid Column Statist");
+        if (!gb_ali) error = GB_export_error("Please select a valid Column Statistic");
     }
     if (error) {
@@ -128 +128 @@
     }
 
-    if (!error && use_helix) {            // calculate weigths and helix filter
+    if (!error && use_helix) {            // calculate weights and helix filter
         BI_helix helix;
         error = helix.init(this->gb_main,alignment_name);
@@ -158 +158 @@
     GB_UINT4 *freqi[256];
     for (i=0;i<256; i++) freqi[i] = 0;
-    int wf;                 // ********* read the frequence statistic
+    int wf;                 // ********* read the frequency statistic
     for (gb_freq = GB_child(gb_freqs); gb_freq; gb_freq = GB_nextChild(gb_freq)) {
         char *key = GB_read_key(gb_freq);

branches/stable_5.0/AWT/AWT_dtree.cxx

@@ -1857 +1857 @@
 
             if (!error) {
-                aw_message(GBS_global_string("Tree '%s' lost all leafes and has been deleted", tree_name));
+                aw_message(GBS_global_string("Tree '%s' lost all leaves and has been deleted", tree_name));
 #if defined(DEVEL_RALF)
 #warning somehow update selected tree

branches/stable_5.0/AWT/AWT_input_mask.cxx

@@ -2387 +2387 @@
             }
             else if (item_type == AWT_IT_UNKNOWN) {
-                aw_message(GBS_global_string("Unkown @ITEMTYPE '%s' in '%s'", descriptor->get_itemtypename(), descriptor->get_internal_maskname()));
+                aw_message(GBS_global_string("Unknown @ITEMTYPE '%s' in '%s'", descriptor->get_itemtypename(), descriptor->get_internal_maskname()));
             }
         }

branches/stable_5.0/AWT/AWT_query_and_functions.cxx

@@ -418 +418 @@
 // Mark listed species
 // mark = 1 -> mark listed
-// mark | 8 -> don'd change rest
+// mark | 8 -> don't change rest
 void awt_do_mark_list(void *dummy, struct adaqbsstruct *cbs, long mark)
 {
@@ -1021 +1021 @@
 
 #if defined(DEBUG)
-            printf("query: search indentical %s in field %s%s\n",
+            printf("query: search identical %s in field %s%s\n",
                    (ext_query == AWT_EXT_QUERY_COMPARE_WORDS ? "words" : "values"),
                    first_key,
@@ -1296 +1296 @@
         AWT_advice("'Move to hitlist' now depends on the values selected for\n"
                    " * 'Search/Add/Keep species' and\n"
-                   " * 'that match/dont match the query'\n"
+                   " * 'that match/don't match the query'\n"
                    "in the search tool.",
                    AWT_ADVICE_TOGGLE|AWT_ADVICE_HELP,
@@ -1479 +1479 @@
         if (type != AWT_QUERY_MATCH) {
             AWT_advice("'Find equal entries' now depends on the values selected for\n"
-                       " * 'that match/dont match the query'\n"
+                       " * 'that match/don't match the query'\n"
                        "in the search tool.",
                        AWT_ADVICE_TOGGLE|AWT_ADVICE_HELP,
@@ -2333 +2333 @@
                             else {
                                 char *name = GBT_read_string(gb_item,"name");
-                                error = GB_export_errorf("Field '%s' of %s '%s' has incombatible type", key, cbs->selector->item_name, name);
+                                error = GB_export_errorf("Field '%s' of %s '%s' has incompatible type", key, cbs->selector->item_name, name);
                                 free(name);
                             }
@@ -2701 +2701 @@
         aws->create_toggle_field(cbs->awar_by,"","");
         aws->insert_toggle("that match the query","M",(int)AWT_QUERY_MATCH);
-        aws->insert_toggle("that dont match the q.","D",(int)AWT_QUERY_DONT_MATCH);
+        aws->insert_toggle("that don't match the q.","D",(int)AWT_QUERY_DONT_MATCH);
         aws->insert_toggle("that are marked","A",(int)AWT_QUERY_MARKED);
         aws->update_toggle_field();

branches/stable_5.0/AWT/AWT_sel_boxes.cxx

@@ -126 +126 @@
 // ******************** selection boxes on pt-servers ********************
 
-#define PT_SERVERNAME_LENGTH        23 // thats for buttons
+#define PT_SERVERNAME_LENGTH        23 // that's for buttons
 #define PT_SERVERNAME_SELLIST_WIDTH 30 // this for lists
 #define PT_SERVER_TRACKLOG_TIMER    10000 // every 10 seconds
@@ -596 +596 @@
 
     AW_window_simple *aws       = new AW_window_simple;
-    char             *window_id = GBS_global_string_copy("SAVE_SELECTCION_BOX_%s", var_id);
+    char             *window_id = GBS_global_string_copy("SAVE_SELECTION_BOX_%s", var_id);
 
     aws->init(aw_root, window_id, "SAVE BOX");
@@ -850 +850 @@
             if (callback) error = GB_remove_last_notification(gb_main);
         }
-        else { // sucessfully started editor
+        else { // successfully started editor
             // Can't be sure editor really started when callback is used (see command above).
-            // But it doesnt matter, cause arb_notify is called anyway and removes all callbacks
+            // But it doesn't matter, cause arb_notify is called anyway and removes all callbacks
             if (callback) {
                 // add timed callback tracking file change

branches/stable_5.0/AWT/AWT_tree_cmp.cxx

@@ -307 +307 @@
 
                 if (!compare_node_info) {
-                    aw_status("Copy Node Informations");
+                    aw_status("Copy Node Information");
                     ssr->copy_node_infos(log, delete_old_nodes, nodes_with_marked_only);
                 }

branches/stable_5.0/CONSENSUS_TREE/CT_mem.cxx

@@ -1 @@
-/* Modul zur Verwaltung des Speicherplatzes */
+/* memory handling */
 
 #include <stdlib.h>
@@ -12 +12 @@
 
     if (!p) {
-        fprintf(stderr, "Error occured in Module CONSENSUS! Not enough Memory left\n");
+        fprintf(stderr, "Error occurred in Module CONSENSUS! Not enough Memory left\n");
         return 0;
     }

branches/stable_5.0/DIST/DI_matr.cxx

@@ -527 +527 @@
     if (!out) return "Cannot open file";
 
-    aw_openstatus("Calculating Distanz Matrix");
+    aw_openstatus("Calculating Distance Matrix");
     aw_status("Calculating global rate matrix");
 
@@ -548 +548 @@
     char *seq1,*seq2;
     s_len = tree_root->filter->real_len;
-    fprintf(out,"\nDistanzmatrix (Helixdist Helixlen Nonhelixdist Nonhelixlen):");
+    fprintf(out,"\nDistance matrix (Helixdist Helixlen Nonhelixdist Nonhelixlen):");
     fprintf(out,"\n%li",nentries);
     const int MAXDISTDEBUG = 1000;
@@ -652 +652 @@
         GB_ERROR error = haeschoe("outfile");
         if (error) return error;
-        return "Your matrizes have been written to 'outfile'\nSorry I can not make a tree";
+        return "Your matrices have been written to 'outfile'\nSorry I can not make a tree";
     }
     int user_matrix_enabled = awr->awar(AWAR_DIST_MATRIX_DNA_ENABLED)->read_int();
@@ -830 +830 @@
                             }
                             if (N==0) N=1;
-                            if (transformation == DI_TRANSFORMATION_OLSEN){ // Calc sum square freq inividually for each line
+                            if (transformation == DI_TRANSFORMATION_OLSEN){ // Calc sum square freq individually for each line
                                 S_square = 0.0;
                                 for (i=0;i<AP_MAX; i++) S_square+= frequencies[i]*frequencies[i];
@@ -1168 +1168 @@
 {
     AW_window_simple *aws = new AW_window_simple;
-    aws->init( aw_root, "SELECT_CHARS_TO_CANCEL_COLOUM", "CANCEL SELECT");
+    aws->init( aw_root, "SELECT_CHARS_TO_CANCEL_COLUMN", "CANCEL SELECT");
     aws->load_xfig("di_cancel.fig");
 
@@ -1388 +1388 @@
     }
 
-    aw_openstatus("Analysing data...");
+    aw_openstatus("Analyzing data...");
     aw_status("Read the database");
 

branches/stable_5.0/DIST/distanalyse.cxx

@@ -65 +65 @@
 
     if (min_len * 1.3 < max_len) {
-        aw_message("Warning: The length of sequences differ significantly\n"
-                   "        be carefull, neighbour joining is sensitiv to\n"
+        aw_message("Warning: The length of sequences differs significantly\n"
+                   "        be careful, neighbour joining is sensitive to\n"
                    "        this kind of error");
     }

branches/stable_5.0/EDIT4/ED4_main.cxx

@@ -528 +528 @@
                 "\n"
                 "Options:\n"
-                "-c config          loads configuration 'config' (dafault: 'default_configuration')\n"
+                "-c config          loads configuration 'config' (default: 'default_configuration')\n"
                 "\n"
                 );

branches/stable_5.0/EDIT4/graph_aligner_gui.cxx

@@ -118 +118 @@
     GB_ERROR gb_error;
 
-    // start pt server if neccessary
+    // start pt server if necessary
     gb_error = arb_look_and_start_server(AISC_MAGIC_NUMBER,tmp.str().c_str(),
                                          GLOBAL_gb_main);
     if (gb_error) {
-        cerr << "Canot contact PT server. Aborting" << endl;
+        cerr << "Cannot contact PT server. Aborting" << endl;
         cerr << " ID: \"" << tmp.str().c_str()
              << "\" PORT: \"" << pt_server

branches/stable_5.0/GDE/MOLPHY/mltree.c

@@ -1511 +1511 @@
         }
         if (allsame > 0)
-                printf("\nsame bootstrap likelihood occured %d times\n", allsame);
+                printf("\nsame bootstrap likelihood occurred %d times\n", allsame);
         free_dvector(boots);
         free_ivector(addweight);

branches/stable_5.0/GDE/RAxML/parsePartitions.c

@@ -935 +935 @@
   if (!f)
     {
-      printf( "Could not open external AA subsitution model file: %s\n", proteinModelFileName);
+      printf( "Could not open external AA substitution model file: %s\n", proteinModelFileName);
       exit(-1);
     }

branches/stable_5.0/GENOM/EXP_interface.cxx

@@ -250 +250 @@
 
     aws->create_menu("More search",     "s" );
-    aws->insert_menu_topic("exp_search_equal_fields_within_db","Search For Equal Fields and Mark Duplikates",               "E", "search_duplicates.hlp", AWM_ALL, (AW_CB)awt_search_equal_entries, cbs, 0);
-    aws->insert_menu_topic("exp_search_equal_words_within_db", "Search For Equal Words Between Fields and Mark Duplikates", "W", "search_duplicates.hlp", AWM_ALL, (AW_CB)awt_search_equal_entries, cbs, 1);
+    aws->insert_menu_topic("exp_search_equal_fields_within_db","Search For Equal Fields and Mark Duplicates",               "E", "search_duplicates.hlp", AWM_ALL, (AW_CB)awt_search_equal_entries, cbs, 0);
+    aws->insert_menu_topic("exp_search_equal_words_within_db", "Search For Equal Words Between Fields and Mark Duplicates", "W", "search_duplicates.hlp", AWM_ALL, (AW_CB)awt_search_equal_entries, cbs, 1);
 
     aws->button_length(7);

branches/stable_5.0/GENOM/GEN_interface.cxx

@@ -527 +527 @@
 
     aws->at("toggle");
-    aws->label("Complentary strand");
+    aws->label("Complementary strand");
     aws->create_toggle(AWAR_GENE_COMPLEMENT);
 
@@ -681 +681 @@
 
     aws->create_menu("More search",     "s" );
-    aws->insert_menu_topic("gen_search_equal_fields_within_db", "Search For Equal Fields and Mark Duplikates",               "E", "search_duplicates.hlp", AWM_ALL, (AW_CB)awt_search_equal_entries, cbs, 0);
-    aws->insert_menu_topic("gen_search_equal_words_within_db",  "Search For Equal Words Between Fields and Mark Duplikates", "W", "search_duplicates.hlp", AWM_ALL, (AW_CB)awt_search_equal_entries, cbs, 1);
+    aws->insert_menu_topic("gen_search_equal_fields_within_db", "Search For Equal Fields and Mark Duplicates",               "E", "search_duplicates.hlp", AWM_ALL, (AW_CB)awt_search_equal_entries, cbs, 0);
+    aws->insert_menu_topic("gen_search_equal_words_within_db",  "Search For Equal Words Between Fields and Mark Duplicates", "W", "search_duplicates.hlp", AWM_ALL, (AW_CB)awt_search_equal_entries, cbs, 1);
 
     aws->button_length(7);

branches/stable_5.0/GENOM/GEN_translations.cxx

@@ -60 +60 @@
     GRS_NO_CHANGE           = 0,  // no translation found
     GRS_FAILED              = 1,  // error is set
-    GRS_TRANSLATION_REMOVED = 2,  // translation was present, reproducable and has been removed
+    GRS_TRANSLATION_REMOVED = 2,  // translation was present, reproducible and has been removed
     GRS_TRANSLATION_FAILED  = 4,  // translation differed (wrote ARB translation to field  'ARB_translation')
     GRS_START_CODON_WRONG   = 8,  // translation differed only in start codon
@@ -227 +227 @@
         if (first_warning) { // show details once 
             warn(cd,
-                 "Note: Reproducable translations were removed from database.\n"
+                 "Note: Reproducible translations were removed from database.\n"
                  "      Failed translations were left in database and an additional\n"
                  "      field 'ARB_translation' was added.");
             warn(cd, GBS_global_string("- %i genes had no translation entry", no_entry));
-            warn(cd, GBS_global_string("- %i translations were reproducable", ok));
+            warn(cd, GBS_global_string("- %i translations were reproducible", ok));
             first_warning = false;
         }

branches/stable_5.0/NTREE/AP_csp_2_gnuplot.cxx

@@ -458 +458 @@
     aws->at("smooth");
     aws->create_option_menu(AP_AWAR_CSP_SMOOTH);
-    aws->insert_option("Dont Smooth","D",0);
+    aws->insert_option("Don't smooth","D",0);
     aws->insert_option("Smooth 1","1",1);
     aws->insert_option("Smooth 2","2",2);

branches/stable_5.0/NTREE/NT_concatenate.cxx

@@ -339 +339 @@
     int no_of_sel_alignments = aws->get_no_of_entries(con_alignment_list); //getting number of selected alignments
     int found[no_of_sel_alignments], missing[no_of_sel_alignments];
-    for (int j = 0; j<no_of_sel_alignments; j++) { found[j] = 0; missing[j] = 0; }  //initialising found and missing alis
+    for (int j = 0; j<no_of_sel_alignments; j++) { found[j] = 0; missing[j] = 0; }  //initializing found and missing alis
 
     const char *const_ali_name = con_alignment_list->first_element();
@@ -396 +396 @@
                     else {
                         char *speciesName = GB_read_string(GB_entry(gb_species, "full_name"));
-                        char *question    = GBS_global_string_copy("\"%s\" alignment doesn`t exist in \"%s\"!", const_ali_name, speciesName);
+                        char *question    = GBS_global_string_copy("\"%s\" alignment doesn't exist in \"%s\"!", const_ali_name, speciesName);
                         int skip_ali      = ask_about_missing_alignment.get_answer(question, "Insert Gaps for Missing Alignment,Skip Missing Alignment", "all", true);
                         if (!skip_ali) {
@@ -750 +750 @@
 
         if (!gb_species_field) {
-            // exit if species doesnt have any data in the selected field
+            // exit if species doesn't have any data in the selected field
             error = GBS_global_string("Species '%s' does not contain data in selected field '%s'", name, merge_field_name);
         }
@@ -765 +765 @@
 
                 if (!gb_next_species_field) {
-                    // exit if species doesnt have any data in the selected field
+                    // exit if species doesn't have any data in the selected field
                     error = GBS_global_string("Species '%s' does not contain data in selected field '%s'", next_name, merge_field_name);
                 }
@@ -897 +897 @@
     aws->at("merge_species");
     aws->callback(AW_POPUP, (AW_CL)NT_createMergeSimilarSpeciesWindow, 0);
-    aws->create_button("MERGE_SPECIES","MERGE SIMILAR SPECEIES","M");
+    aws->create_button("MERGE_SPECIES","MERGE SIMILAR SPECIES","M");
 
     aws->at("merge_concatenate");

branches/stable_5.0/NTREE/NT_dbrepair.cxx

@@ -295 +295 @@
                     GBDATA *gb_pos_begin = GB_entry(gb_gene, "pos_begin"); // test for old format
                     if (!gb_pos_begin) {
-                        error = "Neighter 'pos_begin' nor 'pos_start' found - format of gene location is unknown";
+                        error = "Neither 'pos_begin' nor 'pos_start' found - format of gene location is unknown";
                     }
                 }
@@ -946 +946 @@
             }
 
-            // now all redundencies should be eliminated and we can assign dictionaries to affected keys
+            // now all redundancies should be eliminated and we can assign dictionaries to affected keys
             if (!error) {
                 for (Keys::iterator ki = keys.begin(); !error && ki != keys.end(); ++ki) {

branches/stable_5.0/NTREE/NT_extern.cxx

@@ -732 +732 @@
                                  "    [which part of ARB?]\n"
                                  "\n"
-                                 "The bug [ ] is reproducable\n"
+                                 "The bug [ ] is reproducible\n"
                                  "        [ ] occurs randomly\n"
                                  "        [ ] occurs with specific data\n"

branches/stable_5.0/NTREE/NT_main.cxx

@@ -268 +268 @@
         GB_ERROR error = GBCMS_open(":",0,GLOBAL_gb_main);
         if (error) {
-            aw_message("THIS PROGRAM IS NOT THE ONLY DB SERVER !!!\nDONT USE ANY ARB PROGRAM !!!!");
+            aw_message("THIS PROGRAM IS NOT THE ONLY DB SERVER !!!\nDON'T USE ANY ARB PROGRAM !!!!");
         }else{
             aw_root->add_timed_callback(NT_SERVE_DB_TIMER, (AW_RCB)serve_db_interrupt,0,0);

branches/stable_5.0/NTREE/ad_spec.cxx

@@ -1306 +1306 @@
 
     aws->create_menu("More search",     "s" );
-    aws->insert_menu_topic("spec_search_equal_fields_within_db","Search For Equal Fields and Mark Duplikates",                "E", "search_duplicates.hlp", AWM_ALL, (AW_CB)awt_search_equal_entries, cbs, 0);
-    aws->insert_menu_topic("spec_search_equal_words_within_db", "Search For Equal Words Between Fields and Mark Duplikates",  "W", "search_duplicates.hlp", AWM_ALL, (AW_CB)awt_search_equal_entries, cbs, 1);
+    aws->insert_menu_topic("spec_search_equal_fields_within_db","Search For Equal Fields and Mark Duplicates",                "E", "search_duplicates.hlp", AWM_ALL, (AW_CB)awt_search_equal_entries, cbs, 0);
+    aws->insert_menu_topic("spec_search_equal_words_within_db", "Search For Equal Words Between Fields and Mark Duplicates",  "W", "search_duplicates.hlp", AWM_ALL, (AW_CB)awt_search_equal_entries, cbs, 1);
     aws->insert_menu_topic("spec_search_next_relativ_of_sel",   "Search Next Relatives of SELECTED Species in PT_Server ...", "R", 0,                       AWM_ALL, (AW_CB)AW_POPUP, (AW_CL)ad_spec_next_neighbours_create, cbs);
     aws->insert_menu_topic("spec_search_next_relativ_of_listed","Search Next Relatives of LISTED Species in PT_Server ...",   "L", 0,                       AWM_ALL, (AW_CB)AW_POPUP, (AW_CL)ad_spec_next_neighbours_listed_create, cbs);

branches/stable_5.0/NTREE/ad_transpro.cxx

@@ -338 +338 @@
 #define SYNC_LENGTH 4
 // every X in amino-alignment, it represents 1 to 3 bases in DNA-Alignment
-// SYNC_LENGTH is the # of codons which will be syncronized (ahead!)
+// SYNC_LENGTH is the # of codons which will be synchronized (ahead!)
 // before deciding "X was realigned correctly"
 
@@ -505 +505 @@
                                 delete sync_possible_with_catchup;
                                 failed = 1;
-                                fail_reason = "Can't syncronize after 'X'";
+                                fail_reason = "Can't synchronize after 'X'";
                                 break;
                             }
@@ -521 +521 @@
                         else if (!synchronizeCodons(protein, d, x_count, x_count*3, &catchUp, allowed_code, allowed_code_left)) {
                             failed = 1;
-                            fail_reason = "Can't syncronize after 'X'";
+                            fail_reason = "Can't synchronize after 'X'";
                             break;
                         }
@@ -641 +641 @@
             nt_assert(strlen(buffer) == (unsigned)ali_len);
 
-            // re-alignment sucessfull
+            // re-alignment successful
             error             = GB_write_string(gb_dest_data, buffer);
             if (!error) error = GBT_write_string(gb_species, "codon_start", "1"); // after re-alignment codon_start is always 1

branches/stable_5.0/PARSIMONY/AP_buffer.cxx

@@ -78 +78 @@
     } else {
         if ( pointer->next == 0) {
-            new AP_ERR("AP_STACK: get()"," more get() than element in stack");
+            new AP_ERR("AP_STACK: get()"," more get() than elements in stack");
             pointer = 0;
             return 0;

branches/stable_5.0/PARSIMONY/AP_tree_nlen.cxx

@@ -1079 +1079 @@
             cout << "\n";
             if (!rek_deep){
-                cout << "NEW REKURSION\n\n";
+                cout << "NEW RECURSION\n\n";
             }
             cout.flush();

branches/stable_5.0/PARSIMONY/PARS_main.cxx

@@ -899 +899 @@
 
 // -----------------------------
-//      add marked / seleted
+//      add marked / selected
 // -----------------------------
 
@@ -1088 +1088 @@
     aws->at_newline();
 
-    aws->label("Relativ vert. Dist");
+    aws->label("Relative vert. Dist");
     aws->create_input_field(AWAR_DTREE_VERICAL_DIST,4);
     aws->at_newline();
@@ -1540 +1540 @@
         awm->insert_menu_topic("calc_branch_lenths", "Calculate Branch Lengths", "L", "pa_branchlengths.hlp", AWM_ALL, (AW_CB)NT_branch_lengths, (AW_CL)ntw, 0);
         awm->insert_separator();
-        awm->insert_menu_topic("calc_upper_bootstrap_indep", "Calculate Upper Bootstrap Limit (dependend NNI)",   "d", "pa_bootstrap.hlp", AWM_ALL, (AW_CB)NT_bootstrap,        (AW_CL)ntw, 0);
-        awm->insert_menu_topic("calc_upper_bootstrap_dep",   "Calculate Upper Bootstrap Limit (independend NNI)", "i", "pa_bootstrap.hlp", AWM_ALL, (AW_CB)NT_bootstrap,        (AW_CL)ntw, 1);
+        awm->insert_menu_topic("calc_upper_bootstrap_indep", "Calculate Upper Bootstrap Limit (dependent NNI)",   "d", "pa_bootstrap.hlp", AWM_ALL, (AW_CB)NT_bootstrap,        (AW_CL)ntw, 0);
+        awm->insert_menu_topic("calc_upper_bootstrap_dep",   "Calculate Upper Bootstrap Limit (independent NNI)", "i", "pa_bootstrap.hlp", AWM_ALL, (AW_CB)NT_bootstrap,        (AW_CL)ntw, 1);
         awm->insert_menu_topic("tree_remove_remark",         "Remove Bootstrap Values",                           "V", "trm_boot.hlp",     AWM_ALL, (AW_CB)NT_remove_bootstrap, (AW_CL)ntw, 0);
     }

branches/stable_5.0/PROBE_DESIGN/probe_design.cxx

@@ -1228 +1228 @@
         sprintf(buffer,"probe_design/exceptions/nr%i/MODE",i);
         aws->create_option_menu( buffer, NULL , "" );
-        aws->insert_option( "dont use", "d", -1 );
-        aws->insert_option( "dont split", "d", 0 );
+        aws->insert_option( "don't use", "d", -1 );
+        aws->insert_option( "don't split", "d", 0 );
         aws->insert_option( "split", "d", 1 );
         aws->update_option_menu();
@@ -1755 +1755 @@
     GBS_strcat(strstruct,   "echo Contents of directory ARBHOME/lib/pts:;echo;"
                "(cd $ARBHOME/lib/pts; ls -l);"
-               "echo; echo Disk Space for PT_server files:; echo;"
+               "echo; echo Disk space for PT_server files:; echo;"
                "df $ARBHOME/lib/pts;");
-    GBS_strcat(strstruct,"echo;echo Running ARB Programms:;");
+    GBS_strcat(strstruct,"echo;echo 'Running ARB programs:';");
 
     {

branches/stable_5.0/RNA3D/RNA3D_OpenGLEngine.cxx

@@ -111 +111 @@
     const GLubyte *vendor = NULL;
     vendor = glGetString(GL_VENDOR);   cout<<"Vendor  : "<<vendor<<endl;
-    vendor = glGetString(GL_RENDERER); cout<<"Rederer : "<<vendor<<endl;
+    vendor = glGetString(GL_RENDERER); cout<<"Renderer: "<<vendor<<endl;
     vendor = glGetString(GL_VERSION);  cout<<"Version : "<<vendor<<endl;
 }

branches/stable_5.0/SEQ_QUALITY/SQ_main.cxx

@@ -171 +171 @@
                     break;
                 default:
-                    aw_message("An error occured while traversing the tree.\nPlease fix the tree before running the quality check tool.");
+                    aw_message("An error occurred while traversing the tree.\nPlease fix the tree before running the quality check tool.");
                     break;
                 }

branches/stable_5.0/SL/FAST_ALIGNER/fast_aligner.cxx

@@ -2707 +2707 @@
     aws->create_option_menu(FA_AWAR_MIRROR, "Turn check", "");
     aws->insert_option        ("Never turn sequence",         "", FA_TURN_NEVER);
-    aws->insert_default_option("User acknowledgement",        "", FA_TURN_INTERACTIVE);
+    aws->insert_default_option("User acknowledgment",         "", FA_TURN_INTERACTIVE);
     aws->insert_option        ("Automatically turn sequence", "", FA_TURN_ALWAYS);
     aws->update_option_menu();

branches/stable_5.0/TOOLS/arb_export_tree.cxx

@@ -16 +16 @@
                         "syntax: arb_export_tree [--bifurcated] TREE_NAME\n"
                         "        --bifurcated     write a bifurcated tree (default is a trifurcated tree)\n"
-                        "        --nobranchlens   do not write branchlenghts\n"
+                        "        --nobranchlens   do not write branchlengths\n"
                         "        --doublequotes   use doublequotes (default is singlequotes)\n"
                         "\n"

branches/stable_5.0/TOOLS/arb_probe.cxx

@@ -332 +332 @@
 
     P.DESIGNCPLIPOUTPUT = getInt("designmaxhits",100,10,10000,  "Maximum Number of Probe Design Suggestions");
-    P.DESINGNAMES       = getString("designnames","",       "List of short names seperated by '#'");
+    P.DESINGNAMES       = getString("designnames","",       "List of short names separated by '#'");
     P.sequence          = 0;
     while  ((P.DESIGNSEQUENCE = getString("designsequence",0,       "Additional Sequences, will be added to the target group"))) {
@@ -349 +349 @@
 
     P.MINPOS = getInt("desingminpos",0,0,10000,  "Minimum ecoli position");
-    P.MAXPOS = getInt("desingmaxpos",10000,0,10000,  "Maximumm ecoli position");
+    P.MAXPOS = getInt("desingmaxpos",10000,0,10000,  "Maximum ecoli position");
 
     P.MISHIT     = getInt("designmishit",0,0,10000,  "Number of allowed hits outside the selected group");

branches/stable_5.0/TOOLS/arb_replace.cxx

@@ -22 +22 @@
         printf("syntax: arb_replace [-l/L/p] \"old=newdata\" [filepattern]\n");
         //         printf("     %s %s %s %s",argv[0],argv[1],argv[2],argv[3]);
-        printf("        -l      linemode, parse each line seperatedly\n");
-        printf("        -L      linemode, parse each line seperatedly, delete empty lines\n");
+        printf("        -l      linemode, parse each line separately\n");
+        printf("        -L      linemode, parse each line separately, delete empty lines\n");
         printf("        -p      patchmode, (no wildcards allowed, rightside<leftside)\n");
         return -1;

branches/stable_5.0/WINDOW/AW_button.cxx

@@ -76 +76 @@
         free(var_value);
     }
-    root->value_changed = false;     // Maybe value changed is set because Motig calls me
+    root->value_changed = false;     // Maybe value changed is set because Motif calls me
 }
 
@@ -1987 +1987 @@
     if (destinationList) clear_selection_list(destinationList);
     else {
-        printf(" Destination list not initialised!!\n");
+        printf(" Destination list not initialized!!\n");
         return 0;
     }
@@ -2071 +2071 @@
         }
         else {
-            res = fprintf( fd, "%s\n", list_table->displayed ); // save plain (no interpratation)
+            res = fprintf( fd, "%s\n", list_table->displayed ); // save plain (no interpretation)
         }
 
@@ -2107 +2107 @@
 
             if (ko) {
-                if (selection_list->value_equal_display) { // here no komma should occur
+                if (selection_list->value_equal_display) { // here no comma should occur
                     if (correct_old_format == -1) {
                         correct_old_format = aw_ask_sure(GBS_global_string("'%s' seems to be in old selection-list-format. Try to correct?", *fname));
@@ -2114 +2114 @@
                     if (correct_old_format == 1) {
                         *ko = '#'; // restore (was converted by old-version save)
-                        ko  = 0; // ignore komma
+                        ko  = 0; // ignore comma
                     }
                 }
@@ -2120 +2120 @@
 
             if (ko) *(ko++) = 0;
-            else ko         = pl; // if no komma -> display same as value
+            else ko         = pl; // if no comma -> display same as value
 
             while (*ko == ' ' || *ko == '\t') ko++;

branches/stable_5.0/WINDOW/AW_nawar.cxx

@@ -557 +557 @@
                 break;
             default:
-                GB_warningf("AWAR '%s' cannot be created because of inallowed type",var_name);
+                GB_warningf("AWAR '%s' cannot be created because of disallowed type",var_name);
                 break;
         }

branches/stable_5.0/arb_install.sh

@@ -52 +52 @@
 seperator
 echo 'Enter path where to install ARB ?'
-echo '  ARB is not a single programm but a set of programs, datafiles ...'
+echo '  ARB is not a single program but a set of programs, datafiles ...'
 echo '  To install ARB correctly all files are stored in a single '
 echo '  directory. This script creates such a directory and copies all'
@@ -247 +247 @@
 seperator
 echo 'NameServer installation'
-echo '  The NameServer is a programm, that synchronizes all species names'
+echo '  The NameServer is a program, that synchronizes all species names'
 echo '  of the databases of different users.'
 echo '  Users that import foreign data into their database and want to'