misc constant name adjustments to match actual text on phones

src/mod/endpoints/mod_skinny/skinny_labels.h

@@ -46,7 +46,7 @@
 #define SKINNY_DISP_RESUME                                		"\200\12"
 #define SKINNY_DISP_ANSWER                                		"\200\13"
 #define SKINNY_DISP_INFO                                  		"\200\14"
-#define SKINNY_DISP_CONFRM                                		"\200\15"
+#define SKINNY_DISP_CONF                                		"\200\15"
 #define SKINNY_DISP_PARK                                  		"\200\16"
 #define SKINNY_DISP_JOIN                                  		"\200\17"
 #define SKINNY_DISP_MEETME                                		"\200\20"

src/mod/endpoints/mod_skinny/skinny_server.c

@@ -49,10 +49,10 @@ struct soft_key_template_definition soft_key_template_default[] = {
 	{ SKINNY_DISP_RESUME, SOFTKEY_RESUME },
 	{ SKINNY_DISP_ANSWER, SOFTKEY_ANSWER },
 	{ SKINNY_DISP_INFO, SOFTKEY_INFO },
-	{ SKINNY_DISP_CONFRM, SOFTKEY_CONFRM },
+	{ SKINNY_DISP_CONF, SOFTKEY_CONF },
 	{ SKINNY_DISP_PARK, SOFTKEY_PARK },
 	{ SKINNY_DISP_JOIN, SOFTKEY_JOIN },
-	{ SKINNY_DISP_MEETME, SOFTKEY_MEETMECONFRM },
+	{ SKINNY_DISP_MEETME, SOFTKEY_MEETMECONF },
 	{ SKINNY_DISP_CALLPICKUP, SOFTKEY_CALLPICKUP },
 	{ SKINNY_DISP_GRPCALLPICKUP, SOFTKEY_GRPCALLPICKUP },
 	{ SKINNY_DISP_DND, SOFTKEY_DND },

src/mod/endpoints/mod_skinny/skinny_tables.c

@@ -179,10 +179,10 @@ SKINNY_DECLARE_STR2ID(skinny_str2button, SKINNY_BUTTONS, -1)
 		{SOFTKEY_RESUME, "SoftkeyResume"},
 		{SOFTKEY_ANSWER , "SoftkeyAnswer"},
 		{SOFTKEY_INFO, "SoftkeyInfo"},
-		{SOFTKEY_CONFRM, "SoftkeyConfrm"},
+		{SOFTKEY_CONF, "SoftkeyConf"},
 		{SOFTKEY_PARK, "SoftkeyPark"},
 		{SOFTKEY_JOIN, "SoftkeyJoin"},
-		{SOFTKEY_MEETMECONFRM, "SoftkeyMeetmeconfrm"},
+		{SOFTKEY_MEETMECONF, "SoftkeyMeetmeconfrm"},
 		{SOFTKEY_CALLPICKUP, "SoftkeyCallpickup"},
 		{SOFTKEY_GRPCALLPICKUP, "SoftkeyGrpcallpickup"},
 		{SOFTKEY_DND, "SoftkeyDnd"},

src/mod/endpoints/mod_skinny/skinny_tables.h

@@ -185,10 +185,10 @@ enum skinny_soft_key_event {
 	SOFTKEY_RESUME = 0x0A,
 	SOFTKEY_ANSWER = 0x0B,
 	SOFTKEY_INFO = 0x0C,
-	SOFTKEY_CONFRM = 0x0D,
+	SOFTKEY_CONF = 0x0D,
 	SOFTKEY_PARK = 0x0E,
 	SOFTKEY_JOIN = 0x0F,
-	SOFTKEY_MEETMECONFRM = 0x10,
+	SOFTKEY_MEETMECONF = 0x10,
 	SOFTKEY_CALLPICKUP = 0x11,
 	SOFTKEY_GRPCALLPICKUP = 0x12,
 	SOFTKEY_DND = 0x13,