Hopefully last change to po files

While this is a pain for everyone, I decided not to edit out the code
reference noise - after all this is supposed to help translators find
where the text is used in case it's unclear how to translate something.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

Makefile

@@ -237,7 +237,7 @@ $(NSIFILE): $(NSIINPUTFILE) Makefile
 update-po-files:
 	xgettext -o po/subsurface-new.pot -s -k_ -kN_ --keyword=C_:1c,2  --add-comments="++GETTEXT" *.c
 	for i in po/*.po; do \
-		msgmerge -s -U $$i po/subsurface-new.pot ; \
+		msgmerge --no-wrap -s -U $$i po/subsurface-new.pot ; \
 	done
 
 EXTRA_FLAGS =	$(GTKCFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) \

planner.c

@@ -1206,7 +1206,7 @@ void input_plan()
 	char *labeltext;
 	int len;
 
-	disclaimer = _("DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BÜHLMANN "
+	disclaimer = _("DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN "
 			"ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS "
 			"RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO "
 			"PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.");