diff --git a/.gitattributes b/.gitattributes
index ec3b2670ae..0df9cffc4a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -593,7 +593,7 @@ components/codetools/languages/codetoolsstrconsts.pt.po svneol=native#text/plain
 components/codetools/languages/codetoolsstrconsts.pt_BR.po svneol=native#text/plain
 components/codetools/languages/codetoolsstrconsts.ru.po svneol=native#text/plain
 components/codetools/languages/codetoolsstrconsts.sk.po svneol=native#text/plain
-components/codetools/languages/codetoolsstrconsts.ua.po svneol=native#text/plain
+components/codetools/languages/codetoolsstrconsts.uk.po svneol=native#text/plain
 components/codetools/languages/codetoolsstrconsts.zh_CN.po svneol=native#text/utf8
 components/codetools/laz2_dom.pas svneol=native#text/plain
 components/codetools/laz2_names.inc svneol=native#text/plain
@@ -2266,7 +2266,7 @@ components/synedit/languages/syneditstrconst.po svneol=native#text/plain
 components/synedit/languages/syneditstrconst.pt.po svneol=native#text/plain
 components/synedit/languages/syneditstrconst.pt_BR.po svneol=native#text/plain
 components/synedit/languages/syneditstrconst.ru.po svneol=native#text/plain
-components/synedit/languages/syneditstrconst.ua.po svneol=native#text/plain
+components/synedit/languages/syneditstrconst.uk.po svneol=native#text/plain
 components/synedit/languages/syneditstrconst.zh_CN.po svneol=native#text/plain
 components/synedit/languages/synhighlighterunixshellscript.de.po svneol=native#text/plain
 components/synedit/languages/synhighlighterunixshellscript.he.po svneol=native#text/plain
@@ -2291,7 +2291,7 @@ components/synedit/languages/synmacrorecorder.po svneol=native#text/plain
 components/synedit/languages/synmacrorecorder.pt.po svneol=native#text/plain
 components/synedit/languages/synmacrorecorder.pt_BR.po svneol=native#text/plain
 components/synedit/languages/synmacrorecorder.ru.po svneol=native#text/plain
-components/synedit/languages/synmacrorecorder.ua.po svneol=native#text/plain
+components/synedit/languages/synmacrorecorder.uk.po svneol=native#text/plain
 components/synedit/languages/synmacrorecorder.zh_CN.po svneol=native#text/utf8
 components/synedit/synbeautifier.pas svneol=native#text/plain
 components/synedit/syncompletion.pas svneol=native#text/pascal
@@ -4295,7 +4295,7 @@ ideintf/languages/objinspstrconsts.pt.po svneol=native#text/plain
 ideintf/languages/objinspstrconsts.pt_BR.po svneol=native#text/plain
 ideintf/languages/objinspstrconsts.ru.po svneol=native#text/plain
 ideintf/languages/objinspstrconsts.sk.po svneol=native#text/plain
-ideintf/languages/objinspstrconsts.ua.po svneol=native#text/plain
+ideintf/languages/objinspstrconsts.uk.po svneol=native#text/plain
 ideintf/languages/objinspstrconsts.zh_CN.po svneol=native#text/plain
 ideintf/lazideintf.pas svneol=native#text/pascal
 ideintf/lazstringgridedit.lfm svneol=native#text/plain
@@ -4824,7 +4824,7 @@ languages/lazaruside.pt_BR.po svneol=native#text/plain
 languages/lazaruside.ru.po svneol=native#text/plain
 languages/lazaruside.sk.po svneol=native#text/plain
 languages/lazaruside.tr.po svneol=native#text/plain
-languages/lazaruside.ua.po svneol=native#text/plain
+languages/lazaruside.uk.po svneol=native#text/plain
 languages/lazaruside.zh_CN.po svneol=native#text/plain
 lazarus.app/Contents/Info.plist svneol=native#text/xml
 lazarus.app/Contents/MacOS/lazarus -text svneol=unset#application/octet-stream
@@ -5618,7 +5618,7 @@ lcl/languages/lclstrconsts.pt_BR.po svneol=native#text/plain
 lcl/languages/lclstrconsts.ru.po svneol=native#text/plain
 lcl/languages/lclstrconsts.sk.po svneol=native#text/plain
 lcl/languages/lclstrconsts.tr.po svneol=native#text/plain
-lcl/languages/lclstrconsts.ua.po svneol=native#text/plain
+lcl/languages/lclstrconsts.uk.po svneol=native#text/plain
 lcl/languages/lclstrconsts.zh_CN.po svneol=native#text/utf8
 lcl/lazconfigstorage.pas svneol=native#text/pascal
 lcl/lazhelphtml.pas svneol=native#text/pascal
diff --git a/components/codetools/languages/codetoolsstrconsts.ua.po b/components/codetools/languages/codetoolsstrconsts.uk.po
similarity index 100%
rename from components/codetools/languages/codetoolsstrconsts.ua.po
rename to components/codetools/languages/codetoolsstrconsts.uk.po
diff --git a/components/synedit/languages/syneditstrconst.ua.po b/components/synedit/languages/syneditstrconst.uk.po
similarity index 100%
rename from components/synedit/languages/syneditstrconst.ua.po
rename to components/synedit/languages/syneditstrconst.uk.po
diff --git a/components/synedit/languages/synmacrorecorder.ua.po b/components/synedit/languages/synmacrorecorder.uk.po
similarity index 100%
rename from components/synedit/languages/synmacrorecorder.ua.po
rename to components/synedit/languages/synmacrorecorder.uk.po
diff --git a/ide/idetranslations.pas b/ide/idetranslations.pas
index 4c4ad0dec7..8e62a1b73a 100644
--- a/ide/idetranslations.pas
+++ b/ide/idetranslations.pas
@@ -111,7 +111,7 @@ begin
     Result:=rsLanguagePortugueseBr
   else if CompareText(ID,'pt')=0 then
     Result:=rsLanguagePortuguese
-  else if CompareText(ID,'ua')=0 then
+  else if CompareText(ID,'uk')=0 then
     Result:=rsLanguageUkrainian
   else if CompareText(ID,'nl')=0 then
     Result:=rsLanguageDutch
diff --git a/ideintf/languages/objinspstrconsts.ua.po b/ideintf/languages/objinspstrconsts.uk.po
similarity index 100%
rename from ideintf/languages/objinspstrconsts.ua.po
rename to ideintf/languages/objinspstrconsts.uk.po
diff --git a/languages/lazaruside.ua.po b/languages/lazaruside.uk.po
similarity index 100%
rename from languages/lazaruside.ua.po
rename to languages/lazaruside.uk.po
diff --git a/lcl/languages/lclstrconsts.ua.po b/lcl/languages/lclstrconsts.uk.po
similarity index 100%
rename from lcl/languages/lclstrconsts.ua.po
rename to lcl/languages/lclstrconsts.uk.po