22 files changed, 28 insertions, 28 deletions
diff --git a/extras/CustomTarget_autocorr.mk b/extras/CustomTarget_autocorr.mk
index 98542be408e7..15280b1b8a23 100644
--- a/extras/CustomTarget_autocorr.mk
+++ b/extras/CustomTarget_autocorr.mk
@@ -41,14 +41,14 @@ extras_AUTOCORR_LANGS := \
 	pt-BR:pt-BR \
 	ro:ro-RO \
 	ru:ru-RU \
-	sh-ME:sh-ME \
-	sh-RS:sh-RS \
-	sh-YU:sh-YU \
 	sk:sk-SK \
 	sl:sl-SI \
+	sr-CS:sr-CS \
+	sr-Latn-CS:sr-Latn-CS \
+	sr-Latn-ME:sr-Latn-ME \
+	sr-Latn-RS:sr-Latn-RS \
 	sr-ME:sr-ME \
 	sr-RS:sr-RS \
-	sr-YU:sr-YU \
 	sv:sv-SE \
 	tr:tr-TR \
 	vi:vi-VN \
@@ -188,18 +188,18 @@ extras_AUTOCORR_XMLFILES := \
 	ru/acor/META-INF/manifest.xml \
 	ru/acor/SentenceExceptList.xml \
 	ru/acor/WordExceptList.xml \
-	sh-ME/acor/DocumentList.xml \
-	sh-ME/acor/META-INF/manifest.xml \
-	sh-ME/acor/SentenceExceptList.xml \
-	sh-ME/acor/WordExceptList.xml \
-	sh-RS/acor/DocumentList.xml \
-	sh-RS/acor/META-INF/manifest.xml \
-	sh-RS/acor/SentenceExceptList.xml \
-	sh-RS/acor/WordExceptList.xml \
-	sh-YU/acor/DocumentList.xml \
-	sh-YU/acor/META-INF/manifest.xml \
-	sh-YU/acor/SentenceExceptList.xml \
-	sh-YU/acor/WordExceptList.xml \
+	sr-Latn-ME/acor/DocumentList.xml \
+	sr-Latn-ME/acor/META-INF/manifest.xml \
+	sr-Latn-ME/acor/SentenceExceptList.xml \
+	sr-Latn-ME/acor/WordExceptList.xml \
+	sr-Latn-RS/acor/DocumentList.xml \
+	sr-Latn-RS/acor/META-INF/manifest.xml \
+	sr-Latn-RS/acor/SentenceExceptList.xml \
+	sr-Latn-RS/acor/WordExceptList.xml \
+	sr-Latn-CS/acor/DocumentList.xml \
+	sr-Latn-CS/acor/META-INF/manifest.xml \
+	sr-Latn-CS/acor/SentenceExceptList.xml \
+	sr-Latn-CS/acor/WordExceptList.xml \
 	sk/acor/DocumentList.xml \
 	sk/acor/META-INF/manifest.xml \
 	sk/acor/SentenceExceptList.xml \
@@ -216,10 +216,10 @@ extras_AUTOCORR_XMLFILES := \
 	sr-RS/acor/META-INF/manifest.xml \
 	sr-RS/acor/SentenceExceptList.xml \
 	sr-RS/acor/WordExceptList.xml \
-	sr-YU/acor/DocumentList.xml \
-	sr-YU/acor/META-INF/manifest.xml \
-	sr-YU/acor/SentenceExceptList.xml \
-	sr-YU/acor/WordExceptList.xml \
+	sr-CS/acor/DocumentList.xml \
+	sr-CS/acor/META-INF/manifest.xml \
+	sr-CS/acor/SentenceExceptList.xml \
+	sr-CS/acor/WordExceptList.xml \
 	sv/acor/BlockList.xml \
 	sv/acor/DocumentList.xml \
 	sv/acor/META-INF/manifest.xml \
@@ -269,14 +269,14 @@ extras_AUTOCORR_MIMETYPEFILES := \
 	pt/acor/mimetype \
 	ro/acor/mimetype \
 	ru/acor/mimetype \
-	sh-ME/acor/mimetype \
-	sh-RS/acor/mimetype \
-	sh-YU/acor/mimetype \
 	sk/acor/mimetype \
 	sl/acor/mimetype \
+	sr-CS/acor/mimetype \
+	sr-Latn-CS/acor/mimetype \
+	sr-Latn-ME/acor/mimetype \
+	sr-Latn-RS/acor/mimetype \
 	sr-ME/acor/mimetype \
 	sr-RS/acor/mimetype \
-	sr-YU/acor/mimetype \
 	sv/acor/mimetype \
 	tr/acor/mimetype \
 	vi/acor/mimetype \
diff --git a/extras/Package_autocorr.mk b/extras/Package_autocorr.mk
index 9ecd63c1d996..4e4a1eae4811 100644
--- a/extras/Package_autocorr.mk
+++ b/extras/Package_autocorr.mk
@@ -43,14 +43,14 @@ $(eval $(call gb_Package_add_files,extras_autocorr,$(LIBO_SHARE_FOLDER)/autocorr
 	acor_pt-PT.dat \
 	acor_ro-RO.dat \
 	acor_ru-RU.dat \
-	acor_sh-ME.dat \
-	acor_sh-RS.dat \
-	acor_sh-YU.dat \
 	acor_sk-SK.dat \
 	acor_sl-SI.dat \
+	acor_sr-CS.dat \
+	acor_sr-Latn-CS.dat \
+	acor_sr-Latn-ME.dat \
+	acor_sr-Latn-RS.dat \
 	acor_sr-ME.dat \
 	acor_sr-RS.dat \
-	acor_sr-YU.dat \
 	acor_sv-SE.dat \
 	acor_tr-TR.dat \
 	acor_vi-VN.dat \
diff --git a/extras/source/autotext/lang/sr-YU/acor/DocumentList.xml b/extras/source/autotext/lang/sr-CS/acor/DocumentList.xml
index b7f1c4f05867..b7f1c4f05867 100644
--- a/extras/source/autotext/lang/sr-YU/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/sr-CS/acor/DocumentList.xml
diff --git a/extras/source/autotext/lang/sh-ME/acor/META-INF/manifest.xml b/extras/source/autotext/lang/sr-CS/acor/META-INF/manifest.xml
index a7d1e4726292..a7d1e4726292 100644
--- a/extras/source/autotext/lang/sh-ME/acor/META-INF/manifest.xml
+++ b/extras/source/autotext/lang/sr-CS/acor/META-INF/manifest.xml
diff --git a/extras/source/autotext/lang/sr-YU/acor/SentenceExceptList.xml b/extras/source/autotext/lang/sr-CS/acor/SentenceExceptList.xml
index dd741a73884e..dd741a73884e 100644
--- a/extras/source/autotext/lang/sr-YU/acor/SentenceExceptList.xml
+++ b/extras/source/autotext/lang/sr-CS/acor/SentenceExceptList.xml
diff --git a/extras/source/autotext/lang/sr-YU/acor/WordExceptList.xml b/extras/source/autotext/lang/sr-CS/acor/WordExceptList.xml
index 07a4aef92213..07a4aef92213 100644
--- a/extras/source/autotext/lang/sr-YU/acor/WordExceptList.xml
+++ b/extras/source/autotext/lang/sr-CS/acor/WordExceptList.xml
diff --git a/extras/source/autotext/lang/sh-ME/acor/mimetype b/extras/source/autotext/lang/sr-CS/acor/mimetype
index e69de29bb2d1..e69de29bb2d1 100644
--- a/extras/source/autotext/lang/sh-ME/acor/mimetype
+++ b/extras/source/autotext/lang/sr-CS/acor/mimetype
diff --git a/extras/source/autotext/lang/sh-ME/acor/DocumentList.xml b/extras/source/autotext/lang/sr-Latn-CS/acor/DocumentList.xml
index d7d7fdac2c07..d7d7fdac2c07 100644
--- a/extras/source/autotext/lang/sh-ME/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/sr-Latn-CS/acor/DocumentList.xml
diff --git a/extras/source/autotext/lang/sh-RS/acor/META-INF/manifest.xml b/extras/source/autotext/lang/sr-Latn-CS/acor/META-INF/manifest.xml
index a7d1e4726292..a7d1e4726292 100644
--- a/extras/source/autotext/lang/sh-RS/acor/META-INF/manifest.xml
+++ b/extras/source/autotext/lang/sr-Latn-CS/acor/META-INF/manifest.xml
diff --git a/extras/source/autotext/lang/sh-ME/acor/SentenceExceptList.xml b/extras/source/autotext/lang/sr-Latn-CS/acor/SentenceExceptList.xml
index 9d3463e9ae27..9d3463e9ae27 100644
--- a/extras/source/autotext/lang/sh-ME/acor/SentenceExceptList.xml
+++ b/extras/source/autotext/lang/sr-Latn-CS/acor/SentenceExceptList.xml
diff --git a/extras/source/autotext/lang/sh-ME/acor/WordExceptList.xml b/extras/source/autotext/lang/sr-Latn-CS/acor/WordExceptList.xml
index 61ac42f5a76e..61ac42f5a76e 100644
--- a/extras/source/autotext/lang/sh-ME/acor/WordExceptList.xml
+++ b/extras/source/autotext/lang/sr-Latn-CS/acor/WordExceptList.xml
diff --git a/extras/source/autotext/lang/sh-RS/acor/mimetype b/extras/source/autotext/lang/sr-Latn-CS/acor/mimetype
index e69de29bb2d1..e69de29bb2d1 100644
--- a/extras/source/autotext/lang/sh-RS/acor/mimetype
+++ b/extras/source/autotext/lang/sr-Latn-CS/acor/mimetype
diff --git a/extras/source/autotext/lang/sh-RS/acor/DocumentList.xml b/extras/source/autotext/lang/sr-Latn-ME/acor/DocumentList.xml
index d7d7fdac2c07..d7d7fdac2c07 100644
--- a/extras/source/autotext/lang/sh-RS/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/sr-Latn-ME/acor/DocumentList.xml
diff --git a/extras/source/autotext/lang/sh-YU/acor/META-INF/manifest.xml b/extras/source/autotext/lang/sr-Latn-ME/acor/META-INF/manifest.xml
index a7d1e4726292..a7d1e4726292 100644
--- a/extras/source/autotext/lang/sh-YU/acor/META-INF/manifest.xml
+++ b/extras/source/autotext/lang/sr-Latn-ME/acor/META-INF/manifest.xml
diff --git a/extras/source/autotext/lang/sh-RS/acor/SentenceExceptList.xml b/extras/source/autotext/lang/sr-Latn-ME/acor/SentenceExceptList.xml
index 9d3463e9ae27..9d3463e9ae27 100644
--- a/extras/source/autotext/lang/sh-RS/acor/SentenceExceptList.xml
+++ b/extras/source/autotext/lang/sr-Latn-ME/acor/SentenceExceptList.xml
diff --git a/extras/source/autotext/lang/sh-RS/acor/WordExceptList.xml b/extras/source/autotext/lang/sr-Latn-ME/acor/WordExceptList.xml
index 61ac42f5a76e..61ac42f5a76e 100644
--- a/extras/source/autotext/lang/sh-RS/acor/WordExceptList.xml
+++ b/extras/source/autotext/lang/sr-Latn-ME/acor/WordExceptList.xml
diff --git a/extras/source/autotext/lang/sh-YU/acor/mimetype b/extras/source/autotext/lang/sr-Latn-ME/acor/mimetype
index e69de29bb2d1..e69de29bb2d1 100644
--- a/extras/source/autotext/lang/sh-YU/acor/mimetype
+++ b/extras/source/autotext/lang/sr-Latn-ME/acor/mimetype
diff --git a/extras/source/autotext/lang/sh-YU/acor/DocumentList.xml b/extras/source/autotext/lang/sr-Latn-RS/acor/DocumentList.xml
index d7d7fdac2c07..d7d7fdac2c07 100644
--- a/extras/source/autotext/lang/sh-YU/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/sr-Latn-RS/acor/DocumentList.xml
diff --git a/extras/source/autotext/lang/sr-YU/acor/META-INF/manifest.xml b/extras/source/autotext/lang/sr-Latn-RS/acor/META-INF/manifest.xml
index a7d1e4726292..a7d1e4726292 100644
--- a/extras/source/autotext/lang/sr-YU/acor/META-INF/manifest.xml
+++ b/extras/source/autotext/lang/sr-Latn-RS/acor/META-INF/manifest.xml
diff --git a/extras/source/autotext/lang/sh-YU/acor/SentenceExceptList.xml b/extras/source/autotext/lang/sr-Latn-RS/acor/SentenceExceptList.xml
index 9d3463e9ae27..9d3463e9ae27 100644
--- a/extras/source/autotext/lang/sh-YU/acor/SentenceExceptList.xml
+++ b/extras/source/autotext/lang/sr-Latn-RS/acor/SentenceExceptList.xml
diff --git a/extras/source/autotext/lang/sh-YU/acor/WordExceptList.xml b/extras/source/autotext/lang/sr-Latn-RS/acor/WordExceptList.xml
index 61ac42f5a76e..61ac42f5a76e 100644
--- a/extras/source/autotext/lang/sh-YU/acor/WordExceptList.xml
+++ b/extras/source/autotext/lang/sr-Latn-RS/acor/WordExceptList.xml
diff --git a/extras/source/autotext/lang/sr-YU/acor/mimetype b/extras/source/autotext/lang/sr-Latn-RS/acor/mimetype
index e69de29bb2d1..e69de29bb2d1 100644
--- a/extras/source/autotext/lang/sr-YU/acor/mimetype
+++ b/extras/source/autotext/lang/sr-Latn-RS/acor/mimetype