[PATCH] BUG 3715 added state to label

[Nicole Engard]

---
 .../prog/en/modules/admin/branches.tmpl            |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
index 2d03b63..41b3bfb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
@@ -109,8 +109,8 @@
         <li><label for="branchaddress1">Address Line 1</label><input
type="text" name="branchaddress1" id="branchaddress1" value="<!--
TMPL_VAR name="branchaddress1" escape="HTML" -->" /></li>
         <li><label for="branchaddress2">Address Line 2</label><input
type="text" name="branchaddress2" id="branchaddress2" value="<!--
TMPL_VAR name="branchaddress2" escape="HTML" -->" /></li>
         <li><label for="branchaddress3">Address Line 3</label><input
type="text" name="branchaddress3" id="branchaddress3" value="<!--
TMPL_VAR name="branchaddress3" escape="HTML" -->" /></li>
+        <li><label for="branchcity">City, State</label><input
type="text" name="branchcity" id="branchcity" value="<!-- TMPL_VAR
name="branchcity" escape="HTML" -->" /></li>
         <li><label for="branchzip">Zip/Postal Code</label><input
type="text" name="branchzip" id="branchzip" value="<!-- TMPL_VAR
name="branchzip" escape="HTML" -->" /></li>
-        <li><label for="branchcity">City</label><input type="text"
name="branchcity" id="branchcity" value="<!-- TMPL_VAR
name="branchcity" escape="HTML" -->" /></li>
         <li><label for="branchcountry">Country</label><input
type="text" name="branchcountry" id="branchcountry" value="<!--
TMPL_VAR name="branchcountry" escape="HTML" -->" /></li>
         <li><label for="branchphone">Phone</label><input type="text"
name="branchphone" id="branchphone" value="<!-- TMPL_VAR
name="branchphone" escape="HTML" -->" /></li>
         <li><label for="branchfax">Fax</label><input type="text"
name="branchfax" id="branchfax" value="<!-- TMPL_VAR name="branchfax"
escape="HTML" -->" /></li>
-- 
1.5.6.5

--001636c5c2865e157e0475fec7f7
Content-Type: application/octet-stream; 
	name="0004-BUG-3715-added-state-to-label.patch"
Content-Disposition: attachment; 
	filename="0004-BUG-3715-added-state-to-label.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_g0txtx0g0

RnJvbSBkYTc0ZTk0ZDc2ZWM4MmJhMTVlZDdlZWZkOTYwZWI4N2I4ZWUyNWFjIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBOaWNvbGUgRW5nYXJkIDxuZW5nYXJkQGdtYWlsLmNvbT4KRGF0
ZTogVGh1LCAxNSBPY3QgMjAwOSAxMjowMTowMCAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIEJVRyAz
NzE1IGFkZGVkIHN0YXRlIHRvIGxhYmVsCkNvbnRlbnQtVHlwZTogdGV4dC9wbGFpbjsgY2hhcnNl
dD0idXRmLTgiCgotLS0KIC4uLi9wcm9nL2VuL21vZHVsZXMvYWRtaW4vYnJhbmNoZXMudG1wbCAg
ICAgICAgICAgIHwgICAgMiArLQogMSBmaWxlcyBjaGFuZ2VkLCAxIGluc2VydGlvbnMoKyksIDEg
ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEva29oYS10bXBsL2ludHJhbmV0LXRtcGwvcHJvZy9l
bi9tb2R1bGVzL2FkbWluL2JyYW5jaGVzLnRtcGwgYi9rb2hhLXRtcGwvaW50cmFuZXQtdG1wbC9w
cm9nL2VuL21vZHVsZXMvYWRtaW4vYnJhbmNoZXMudG1wbAppbmRleCAyZDAzYjYzLi40MWIzYmZi
IDEwMDY0NAotLS0gYS9rb2hhLXRtcGwvaW50cmFuZXQtdG1wbC9wcm9nL2VuL21vZHVsZXMvYWRt
aW4vYnJhbmNoZXMudG1wbAorKysgYi9rb2hhLXRtcGwvaW50cmFuZXQtdG1wbC9wcm9nL2VuL21v
ZHVsZXMvYWRtaW4vYnJhbmNoZXMudG1wbApAQCAtMTA5LDggKzEwOSw4IEBACiAgICAgICAgIDxs
aT48bGFiZWwgZm9yPSJicmFuY2hhZGRyZXNzMSI+QWRkcmVzcyBMaW5lIDE8L2xhYmVsPjxpbnB1
dCB0eXBlPSJ0ZXh0IiBuYW1lPSJicmFuY2hhZGRyZXNzMSIgaWQ9ImJyYW5jaGFkZHJlc3MxIiB2
YWx1ZT0iPCEtLSBUTVBMX1ZBUiBuYW1lPSJicmFuY2hhZGRyZXNzMSIgZXNjYXBlPSJIVE1MIiAt
LT4iIC8+PC9saT4KICAgICAgICAgPGxpPjxsYWJlbCBmb3I9ImJyYW5jaGFkZHJlc3MyIj5BZGRy
ZXNzIExpbmUgMjwvbGFiZWw+PGlucHV0IHR5cGU9InRleHQiIG5hbWU9ImJyYW5jaGFkZHJlc3My
IiBpZD0iYnJhbmNoYWRkcmVzczIiIHZhbHVlPSI8IS0tIFRNUExfVkFSIG5hbWU9ImJyYW5jaGFk
ZHJlc3MyIiBlc2NhcGU9IkhUTUwiIC0tPiIgLz48L2xpPgogICAgICAgICA8bGk+PGxhYmVsIGZv
cj0iYnJhbmNoYWRkcmVzczMiPkFkZHJlc3MgTGluZSAzPC9sYWJlbD48aW5wdXQgdHlwZT0idGV4
dCIgbmFtZT0iYnJhbmNoYWRkcmVzczMiIGlkPSJicmFuY2hhZGRyZXNzMyIgdmFsdWU9IjwhLS0g
VE1QTF9WQVIgbmFtZT0iYnJhbmNoYWRkcmVzczMiIGVzY2FwZT0iSFRNTCIgLS0+IiAvPjwvbGk+
CisgICAgICAgIDxsaT48bGFiZWwgZm9yPSJicmFuY2hjaXR5Ij5DaXR5LCBTdGF0ZTwvbGFiZWw+
PGlucHV0IHR5cGU9InRleHQiIG5hbWU9ImJyYW5jaGNpdHkiIGlkPSJicmFuY2hjaXR5IiB2YWx1
ZT0iPCEtLSBUTVBMX1ZBUiBuYW1lPSJicmFuY2hjaXR5IiBlc2NhcGU9IkhUTUwiIC0tPiIgLz48
L2xpPgogICAgICAgICA8bGk+PGxhYmVsIGZvcj0iYnJhbmNoemlwIj5aaXAvUG9zdGFsIENvZGU8
L2xhYmVsPjxpbnB1dCB0eXBlPSJ0ZXh0IiBuYW1lPSJicmFuY2h6aXAiIGlkPSJicmFuY2h6aXAi
IHZhbHVlPSI8IS0tIFRNUExfVkFSIG5hbWU9ImJyYW5jaHppcCIgZXNjYXBlPSJIVE1MIiAtLT4i
IC8+PC9saT4KLSAgICAgICAgPGxpPjxsYWJlbCBmb3I9ImJyYW5jaGNpdHkiPkNpdHk8L2xhYmVs
PjxpbnB1dCB0eXBlPSJ0ZXh0IiBuYW1lPSJicmFuY2hjaXR5IiBpZD0iYnJhbmNoY2l0eSIgdmFs
dWU9IjwhLS0gVE1QTF9WQVIgbmFtZT0iYnJhbmNoY2l0eSIgZXNjYXBlPSJIVE1MIiAtLT4iIC8+
PC9saT4KICAgICAgICAgPGxpPjxsYWJlbCBmb3I9ImJyYW5jaGNvdW50cnkiPkNvdW50cnk8L2xh
YmVsPjxpbnB1dCB0eXBlPSJ0ZXh0IiBuYW1lPSJicmFuY2hjb3VudHJ5IiBpZD0iYnJhbmNoY291
bnRyeSIgdmFsdWU9IjwhLS0gVE1QTF9WQVIgbmFtZT0iYnJhbmNoY291bnRyeSIgZXNjYXBlPSJI
VE1MIiAtLT4iIC8+PC9saT4KICAgICAgICAgPGxpPjxsYWJlbCBmb3I9ImJyYW5jaHBob25lIj5Q
aG9uZTwvbGFiZWw+PGlucHV0IHR5cGU9InRleHQiIG5hbWU9ImJyYW5jaHBob25lIiBpZD0iYnJh
bmNocGhvbmUiIHZhbHVlPSI8IS0tIFRNUExfVkFSIG5hbWU9ImJyYW5jaHBob25lIiBlc2NhcGU9
IkhUTUwiIC0tPiIgLz48L2xpPgogICAgICAgICA8bGk+PGxhYmVsIGZvcj0iYnJhbmNoZmF4Ij5G
YXg8L2xhYmVsPjxpbnB1dCB0eXBlPSJ0ZXh0IiBuYW1lPSJicmFuY2hmYXgiIGlkPSJicmFuY2hm
YXgiIHZhbHVlPSI8IS0tIFRNUExfVkFSIG5hbWU9ImJyYW5jaGZheCIgZXNjYXBlPSJIVE1MIiAt
LT4iIC8+PC9saT4KLS0gCjEuNS42LjUKCg==
--001636c5c2865e157e0475fec7f7--