 -include $(top_srcdir)/autodocs-ycp.ami
 +# AUTODOCS_YCP=$(srcdir)/../../src/*.ycp
 +# include $(top_srcdir)/autodocs-ycp.ami
-diff --git a/keyboard/src/include/keyboard/dialogs.ycp b/keyboard/src/include/keyboard/dialogs.ycp
-index b28f038..dac9a4a 100644
---- a/keyboard/src/include/keyboard/dialogs.ycp
-+++ b/keyboard/src/include/keyboard/dialogs.ycp
-@@ -23,7 +23,7 @@
-  *	keyboard/dialogs.ycp
-  *
-  * Authors:
-- *	Klaus   Kmpf <kkaempf@suse.de>
-+ *	Klaus   Kämpf <kkaempf@suse.de>
-  *	Michael Hager <mike@suse.de>
-  *	Stefan  Hundhammer <sh@suse.de>
-  *
 diff --git a/keyboard/testsuite/Makefile.am b/keyboard/testsuite/Makefile.am
 index d9b12b0..e85fbc8 100644
 --- a/keyboard/testsuite/Makefile.am

-include $(top_srcdir)/autodocs-ycp.ami
+# AUTODOCS_YCP=$(srcdir)/../../src/*.ycp
+# include $(top_srcdir)/autodocs-ycp.ami
diff --git a/language/src/clients/select_language.ycp b/language/src/clients/select_language.ycp
index cd0c0c7..7194f02 100644
--- a/language/src/clients/select_language.ycp
+++ b/language/src/clients/select_language.ycp
@@ -27,7 +27,7 @@
  *	yast2-country
  *
  * Authors:
- *	Klaus   Kmpf <kkaempf@suse.de>
+ *	Klaus   Kämpf <kkaempf@suse.de>
  *	Michael Hager <mike@suse.de>
  *	Stefan  Hundhammer <sh@suse.de>
  *	Thomas Roelz <tom@suse.de>
@@ -561,7 +561,7 @@ In the selection box, specify additional languages to use on your system.
 		    // no yast translation for nn_NO, use nb_NO as a backup
 		    if (language == "nn_NO")
 		    {
-			y2milestone ("Nynorsk not translated, using Bokml");
+			y2milestone ("Nynorsk not translated, using Bokmål");
 			Language::WfmSetGivenLanguage ("nb_NO");
 		    }
 		    else
diff --git a/language/testsuite/Makefile.am b/language/testsuite/Makefile.am
index d9b12b0..e85fbc8 100644
--- a/language/testsuite/Makefile.am

index 0e1a7fa..dbab02c 100644
--- a/timezone/src/include/timezone/dialogs.ycp
+++ b/timezone/src/include/timezone/dialogs.ycp
@@ -124,20 +124,6 @@
       return ret;
   }
