[PATCH 1/2] Use Bühlmann in all strings shown to the user

Salvador Cuñat salvador.cunat at gmail.com
Wed Sep 16 12:43:49 PDT 2015


Unify spelling of this name in strings shown to the user, as commented
in mailing list. Internal coding use untouched.

Signed-off-by: Salvador Cuñat <salvador.cunat at gmail.com>
---
 planner.c                | 4 ++--
 qt-ui/plannerSettings.ui | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/planner.c b/planner.c
index a94aafb..7bd76ce 100644
--- a/planner.c
+++ b/planner.c
@@ -580,7 +580,7 @@ static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool
 
 	len = show_disclaimer ? snprintf(buffer, sz_buffer, "<div><b>%s<b></div><br>", disclaimer) : 0;
 	if (prefs.deco_mode == BUEHLMANN){
-		snprintf(temp, sz_temp, translate("gettextFromC", "based on Buhlmann ZHL-16B with GFlow = %d and GFhigh = %d"),
+		snprintf(temp, sz_temp, translate("gettextFromC", "based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d"),
 			diveplan->gflow, diveplan->gfhigh);
 	} else if (prefs.deco_mode == VPMB){
 		if (prefs.conservatism_level == 0)
@@ -588,7 +588,7 @@ static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool
 		else
 			snprintf(temp, sz_temp, translate("gettextFromC", "based on VPM-B at +%d conservatism"), prefs.conservatism_level);
 	} else if (prefs.deco_mode == RECREATIONAL){
-		snprintf(temp, sz_temp, translate("gettextFromC", "recreational mode based on Buhlmann ZHL-16B with GFlow = %d and GFhigh = %d"),
+		snprintf(temp, sz_temp, translate("gettextFromC", "recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d"),
 			diveplan->gflow, diveplan->gfhigh);
 	}
 	len += snprintf(buffer + len, sz_buffer - len, "<div><b>%s</b><br>%s</div><br>",
diff --git a/qt-ui/plannerSettings.ui b/qt-ui/plannerSettings.ui
index 54ea576..2319220 100644
--- a/qt-ui/plannerSettings.ui
+++ b/qt-ui/plannerSettings.ui
@@ -265,7 +265,7 @@
           <item row="4" column="1">
            <widget class="QRadioButton" name="buehlmann_deco">
             <property name="text">
-             <string>Buehlmann deco</string>
+             <string>Bühlmann deco</string>
             </property>
             <property name="checked">
              <bool>true</bool>
-- 
2.5.1



More information about the subsurface mailing list