Merge
diff --git a/src/share/classes/sun/util/resources/sq/LocaleNames_sq.properties b/src/share/classes/sun/util/resources/sq/LocaleNames_sq.properties
index e66c0e1..903dcea 100644
--- a/src/share/classes/sun/util/resources/sq/LocaleNames_sq.properties
+++ b/src/share/classes/sun/util/resources/sq/LocaleNames_sq.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,7 @@
# language names
# key is ISO 639 language code
-sq=shqipe
+sq=shqip
# country names
# key is ISO 3166 country code
diff --git a/test/sun/text/resources/LocaleData b/test/sun/text/resources/LocaleData
index 59dc0eb..87b9d44 100644
--- a/test/sun/text/resources/LocaleData
+++ b/test/sun/text/resources/LocaleData
@@ -7660,3 +7660,6 @@
# bug 7195759
CurrencyNames//ZMW=ZMW
+
+# bug 7114053
+LocaleNames/sq/sq=shqip
diff --git a/test/sun/text/resources/LocaleDataTest.java b/test/sun/text/resources/LocaleDataTest.java
index bd19322..50b8cae 100644
--- a/test/sun/text/resources/LocaleDataTest.java
+++ b/test/sun/text/resources/LocaleDataTest.java
@@ -34,7 +34,7 @@
* 6509039 6609737 6610748 6645271 6507067 6873931 6450945 6645268 6646611
* 6645405 6650730 6910489 6573250 6870908 6585666 6716626 6914413 6916787
* 6919624 6998391 7019267 7020960 7025837 7020583 7036905 7066203 7101495
- * 7003124 7085757 7028073 7171028 7189611 8000983 7195759
+ * 7003124 7085757 7028073 7171028 7189611 8000983 7195759 7114053
* @summary Verify locale data
*
*/