diff --git a/src/CalcViewModel/DataLoaders/UnitConverterDataConstants.h b/src/CalcViewModel/DataLoaders/UnitConverterDataConstants.h
index db01aab7..fe296c2f 100644
--- a/src/CalcViewModel/DataLoaders/UnitConverterDataConstants.h
+++ b/src/CalcViewModel/DataLoaders/UnitConverterDataConstants.h
@@ -167,7 +167,10 @@ namespace CalculatorApp
             Energy_Kilowatthour = UnitStart + 166,
             Data_Nibble = UnitStart + 167,
             Length_Angstrom = UnitStart + 168,
-            UnitEnd = Length_Angstrom
+            Length_AstronomicalUnit = UnitStart + 169,
+            Length_LightYear = UnitStart + 170,
+            Length_Parsec = UnitStart + 171,
+            UnitEnd = Length_Parsec
         };
     }
 }
diff --git a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp
index 795091e9..dcaa38fe 100644
--- a/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp
+++ b/src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp
@@ -400,6 +400,12 @@ void UnitConverterDataLoader::GetUnits(_In_ unordered_map<ViewMode, vector<Order
     unitMap.emplace(ViewMode::Energy, energyUnits);
 
     vector<OrderedUnit> lengthUnits;
+    lengthUnits.push_back(OrderedUnit{
+        UnitConverterUnits::Length_AstronomicalUnit, GetLocalizedStringName(L"UnitName_AstronomicalUnit"), GetLocalizedStringName(L"UnitAbbreviation_AstronomicalUnit"), 16 });
+    lengthUnits.push_back(OrderedUnit{
+        UnitConverterUnits::Length_LightYear, GetLocalizedStringName(L"UnitName_LightYear"), GetLocalizedStringName(L"UnitAbbreviation_LightYear"), 17 });
+    lengthUnits.push_back(OrderedUnit{
+        UnitConverterUnits::Length_Parsec, GetLocalizedStringName(L"UnitName_Parsec"), GetLocalizedStringName(L"UnitAbbreviation_Parsec"), 18 });
     lengthUnits.push_back(OrderedUnit{
         UnitConverterUnits::Length_Angstrom, GetLocalizedStringName(L"UnitName_Angstrom"), GetLocalizedStringName(L"UnitAbbreviation_Angstrom"), 1 });
     lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Centimeter,
@@ -858,6 +864,9 @@ void UnitConverterDataLoader::GetConversionData(_In_ unordered_map<ViewMode, uno
                                                    { ViewMode::Length, UnitConverterUnits::Length_Millimeter, 0.001 },
                                                    { ViewMode::Length, UnitConverterUnits::Length_Nanometer, 0.000000001 },
                                                    { ViewMode::Length, UnitConverterUnits::Length_Angstrom, 0.0000000001 },
+                                                   { ViewMode::Length, UnitConverterUnits::Length_AstronomicalUnit, 149597870700 },
+                                                   { ViewMode::Length, UnitConverterUnits::Length_LightYear, 9460730472580800 },
+                                                   { ViewMode::Length, UnitConverterUnits::Length_Parsec, 30856775814913672.789139379577965 },
                                                    { ViewMode::Length, UnitConverterUnits::Length_Centimeter, 0.01 },
                                                    { ViewMode::Length, UnitConverterUnits::Length_Meter, 1 },
                                                    { ViewMode::Length, UnitConverterUnits::Length_Kilometer, 1000 },
diff --git a/src/Calculator/Resources/af-ZA/Resources.resw b/src/Calculator/Resources/af-ZA/Resources.resw
index 46fe47d6..6accae00 100644
--- a/src/Calculator/Resources/af-ZA/Resources.resw
+++ b/src/Calculator/Resources/af-ZA/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,24 @@
     <value>Kon nie hierdie skermskoot teruglaai nie.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
-</root>
\ No newline at end of file
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>AE</value>
+    <comment>An abbreviation for a measurement unit of length</comment>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+    <comment>An abbreviation for a measurement unit of length</comment>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>Astronomiese eenheid</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>ligjaar</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsec</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>lj</value>
+  </data>
+</root>
diff --git a/src/Calculator/Resources/am-ET/Resources.resw b/src/Calculator/Resources/am-ET/Resources.resw
index fd7f6ed4..336afb67 100644
--- a/src/Calculator/Resources/am-ET/Resources.resw
+++ b/src/Calculator/Resources/am-ET/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,24 @@
     <value>ይህን ቅጽበታዊ ገጽ እይታ ወደነበረበት መመለስ አልተቻለም።</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
-</root>
\ No newline at end of file
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>AU</value>
+    <comment>An abbreviation for a measurement unit of length</comment>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>ፓ</value>
+    <comment>An abbreviation for a measurement unit of length</comment>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>የአስትሮኖሚያ አምድ</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>የብርሃን ዓመት</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>ፓርሴክ</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>ዓ/ብ</value>
+  </data>
+</root>
diff --git a/src/Calculator/Resources/ar-SA/Resources.resw b/src/Calculator/Resources/ar-SA/Resources.resw
index f961e845..0815d2ec 100644
--- a/src/Calculator/Resources/ar-SA/Resources.resw
+++ b/src/Calculator/Resources/ar-SA/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>تعذرت استعادة هذه اللقطة.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
-</root>
\ No newline at end of file
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>وَ.ف</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>فرسخ فلكي</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>وحدة فلكية</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>سنة ضوئية</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>فرسخ فلكي</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>س.ض</value>
+  </data>
+</root>
diff --git a/src/Calculator/Resources/az-Latn-AZ/Resources.resw b/src/Calculator/Resources/az-Latn-AZ/Resources.resw
index 4f593c54..88231742 100644
--- a/src/Calculator/Resources/az-Latn-AZ/Resources.resw
+++ b/src/Calculator/Resources/az-Latn-AZ/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Bu ani görüntünü bərpa etmək mümkün olmadı.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>AV</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>ps</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>astronomik vahid</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>işıq ili</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsek</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>İİ</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/bg-BG/Resources.resw b/src/Calculator/Resources/bg-BG/Resources.resw
index e4330104..55149ff3 100644
--- a/src/Calculator/Resources/bg-BG/Resources.resw
+++ b/src/Calculator/Resources/bg-BG/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Неуспешно възстановяване на тази моментна снимка.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>АЕ</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>пк</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>астрономическа единица</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>светлинна година</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>парсек</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>св.г</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/ca-ES/Resources.resw b/src/Calculator/Resources/ca-ES/Resources.resw
index 40a2abbf..114ec1fc 100644
--- a/src/Calculator/Resources/ca-ES/Resources.resw
+++ b/src/Calculator/Resources/ca-ES/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>No s'ha pogut restaurar aquesta instantània.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>UA</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>unitat astronòmica</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>any llum</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsec</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>al</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/cs-CZ/Resources.resw b/src/Calculator/Resources/cs-CZ/Resources.resw
index 79556db6..cff8729e 100644
--- a/src/Calculator/Resources/cs-CZ/Resources.resw
+++ b/src/Calculator/Resources/cs-CZ/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Tento snímek se nepovedlo obnovit.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>AJ</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>astronomická jednotka</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>světelný rok</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsek</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>sv. r.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/da-DK/Resources.resw b/src/Calculator/Resources/da-DK/Resources.resw
index 98a3d118..593012e2 100644
--- a/src/Calculator/Resources/da-DK/Resources.resw
+++ b/src/Calculator/Resources/da-DK/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Kunne ikke gendanne dette snapshot.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>AE</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>	astronomisk enhed</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>lysår</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsec</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>ly</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/de-DE/Resources.resw b/src/Calculator/Resources/de-DE/Resources.resw
index 6f9a9168..ba54f45d 100644
--- a/src/Calculator/Resources/de-DE/Resources.resw
+++ b/src/Calculator/Resources/de-DE/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Diese Momentaufnahme konnte nicht wiederhergestellt werden.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>AE</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>astronomische Einheit</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>Lichtjahr</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>Parsec</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>Lj</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/el-GR/Resources.resw b/src/Calculator/Resources/el-GR/Resources.resw
index 6a71d08d..8610fba0 100644
--- a/src/Calculator/Resources/el-GR/Resources.resw
+++ b/src/Calculator/Resources/el-GR/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Δεν ήταν δυνατή η επαναφορά του παρόντος στιγμιότυπου.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>ΑΜ</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>παρσ</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>αστρονομική μονάδα</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>έτος φωτός</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>παράσεκ</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>έφ</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/en-GB/Resources.resw b/src/Calculator/Resources/en-GB/Resources.resw
index 84441779..c7c03be6 100644
--- a/src/Calculator/Resources/en-GB/Resources.resw
+++ b/src/Calculator/Resources/en-GB/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Couldn't restore this snapshot.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>AU</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>	Astronomical unit</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>light‑year</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsec</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>ly</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/en-US/Resources.resw b/src/Calculator/Resources/en-US/Resources.resw
index 384e8096..8996318e 100644
--- a/src/Calculator/Resources/en-US/Resources.resw
+++ b/src/Calculator/Resources/en-US/Resources.resw
@@ -4770,4 +4770,28 @@
     <value>Couldn't restore this snapshot.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>AU</value>
+    <comment>An abbreviation for a measurement unit of length</comment>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+    <comment>An abbreviation for a measurement unit of length</comment>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>	Astronomical unit</value>
+    <comment>A unit of length, Approximately equals the average Earth-Sun distance.</comment>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>light-year</value>
+    <comment>A unit of length, equals the distance that light travels in vacuum in one Julian year.</comment>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsec</value>
+    <comment>A unit of length used to measure the large distances to astronomical objects outside the Solar System.</comment>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>ly</value>
+    <comment>An abbreviation for a measurement unit of length</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/es-ES/Resources.resw b/src/Calculator/Resources/es-ES/Resources.resw
index d64f31a9..2833c848 100644
--- a/src/Calculator/Resources/es-ES/Resources.resw
+++ b/src/Calculator/Resources/es-ES/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>No se pudo restaurar esta instantánea.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>UA</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>unidad astronómica</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>año luz</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsec</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>al</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/es-MX/Resources.resw b/src/Calculator/Resources/es-MX/Resources.resw
index 88ed58f9..ad701886 100644
--- a/src/Calculator/Resources/es-MX/Resources.resw
+++ b/src/Calculator/Resources/es-MX/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>No se pudo restaurar esta instantánea.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>UA</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>unidad astronómica</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>año luz</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsec</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value />
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/et-EE/Resources.resw b/src/Calculator/Resources/et-EE/Resources.resw
index 1ee8084b..e52109f0 100644
--- a/src/Calculator/Resources/et-EE/Resources.resw
+++ b/src/Calculator/Resources/et-EE/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Seda hetktõmmist ei saanud taastada.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>a.e.</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>astronoomiline ühik</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>valgusaasta</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsec</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>va</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/eu-ES/Resources.resw b/src/Calculator/Resources/eu-ES/Resources.resw
index 8860ab24..745da534 100644
--- a/src/Calculator/Resources/eu-ES/Resources.resw
+++ b/src/Calculator/Resources/eu-ES/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4199,4 +4199,22 @@
     <value>Ezin izan da leheneratu argazkia.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value> UA</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>unitate astronomikoa</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>argi‑urte</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsec</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>a.l.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/fa-IR/Resources.resw b/src/Calculator/Resources/fa-IR/Resources.resw
index e4033d58..ce80305b 100644
--- a/src/Calculator/Resources/fa-IR/Resources.resw
+++ b/src/Calculator/Resources/fa-IR/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>این عکس فوری بازیابی نمی‌شود.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value> وَ.ف</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>پ.س</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>واحد نجومی</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>سال نوری</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>پارسک</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>س.ن</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/fi-FI/Resources.resw b/src/Calculator/Resources/fi-FI/Resources.resw
index b84c2ef6..048af829 100644
--- a/src/Calculator/Resources/fi-FI/Resources.resw
+++ b/src/Calculator/Resources/fi-FI/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Tätä tilannevedosta ei voitu palauttaa.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value> AU</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>astronominen yksikkö</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>valovuosi</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsek</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>vv</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/fil-PH/Resources.resw b/src/Calculator/Resources/fil-PH/Resources.resw
index f5e05a59..1344a7b7 100644
--- a/src/Calculator/Resources/fil-PH/Resources.resw
+++ b/src/Calculator/Resources/fil-PH/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Hindi maipanumbalik ang snapshot na ito.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>AU</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>astronomical unit</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>sinag‑taon</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsec</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>ly</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/fr-CA/Resources.resw b/src/Calculator/Resources/fr-CA/Resources.resw
index aba1a9a5..5b38f647 100644
--- a/src/Calculator/Resources/fr-CA/Resources.resw
+++ b/src/Calculator/Resources/fr-CA/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Désolé, nous ne pouvons pas restaurer cette capture instantanée.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>UA</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>unité astronomique</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>année‑lumière</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsec</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>a.l.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/fr-FR/Resources.resw b/src/Calculator/Resources/fr-FR/Resources.resw
index 9ee9a322..8efb467f 100644
--- a/src/Calculator/Resources/fr-FR/Resources.resw
+++ b/src/Calculator/Resources/fr-FR/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Impossible de restaurer cet instantané.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>UA</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>unité astronomique</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>année‑lumière</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsec</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>a.l.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/gl-ES/Resources.resw b/src/Calculator/Resources/gl-ES/Resources.resw
index 9853bc8f..daef6cd9 100644
--- a/src/Calculator/Resources/gl-ES/Resources.resw
+++ b/src/Calculator/Resources/gl-ES/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Non se puido restaurar esta instantánea.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>UA</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>unidade astronómica</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>ano luz</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsec</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>al</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/he-IL/Resources.resw b/src/Calculator/Resources/he-IL/Resources.resw
index dcd43a43..707f4a34 100644
--- a/src/Calculator/Resources/he-IL/Resources.resw
+++ b/src/Calculator/Resources/he-IL/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>לא הצלחנו לשחזר צילום זה.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>י"א</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>פרסק</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>יחידת אסטרונומיה</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>שנת אור</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>פרסק</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>ש"א</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/hi-IN/Resources.resw b/src/Calculator/Resources/hi-IN/Resources.resw
index ff74c0d4..fb29bf12 100644
--- a/src/Calculator/Resources/hi-IN/Resources.resw
+++ b/src/Calculator/Resources/hi-IN/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>इस स्नैपशॉट को पुनर्स्थापित नहीं किया जा सका.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>ख.इ</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>पा.</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>खगोलीय इकाई</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>प्रकाशवर्ष</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>पार्सेक</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>प्र.व</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/hr-HR/Resources.resw b/src/Calculator/Resources/hr-HR/Resources.resw
index 0020ffde..431f24b3 100644
--- a/src/Calculator/Resources/hr-HR/Resources.resw
+++ b/src/Calculator/Resources/hr-HR/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Nije moguće vratiti ovu snimku stanja.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>AJ</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>astronom‑jedinica</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>svjetlosna godina</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsek</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>sg</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/hu-HU/Resources.resw b/src/Calculator/Resources/hu-HU/Resources.resw
index b772ab10..e27a6791 100644
--- a/src/Calculator/Resources/hu-HU/Resources.resw
+++ b/src/Calculator/Resources/hu-HU/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Nem sikerült visszaállítani ezt a pillanatképet.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>CsE</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>psc</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>csillagászati egység</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>fényév</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsec</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>fé</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/id-ID/Resources.resw b/src/Calculator/Resources/id-ID/Resources.resw
index ff0708a2..f4f53cba 100644
--- a/src/Calculator/Resources/id-ID/Resources.resw
+++ b/src/Calculator/Resources/id-ID/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Tidak dapat memulihkan snapshot ini.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>SA</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>satuan astronomi</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>tahun cahaya</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsec</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>tc</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/is-IS/Resources.resw b/src/Calculator/Resources/is-IS/Resources.resw
index ec316e60..29724202 100644
--- a/src/Calculator/Resources/is-IS/Resources.resw
+++ b/src/Calculator/Resources/is-IS/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Ekki tókst að endurheimta þessa skyndimynd.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>SO</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>stjarnfræðileg eining</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>ljósár</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsec</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>ljósár</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/it-IT/Resources.resw b/src/Calculator/Resources/it-IT/Resources.resw
index e2d20bf3..736932f2 100644
--- a/src/Calculator/Resources/it-IT/Resources.resw
+++ b/src/Calculator/Resources/it-IT/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Non è possibile ripristinare questo snapshot.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>UA</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>unità astronomica</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>anno luce</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsec</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>a.l.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/ja-JP/Resources.resw b/src/Calculator/Resources/ja-JP/Resources.resw
index 6128b35f..435c29fa 100644
--- a/src/Calculator/Resources/ja-JP/Resources.resw
+++ b/src/Calculator/Resources/ja-JP/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>このスナップショットを復元できませんでした。</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>天文単位</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>パーセク</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>天文単位</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>光年</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>パーセク</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>光年</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/kk-KZ/Resources.resw b/src/Calculator/Resources/kk-KZ/Resources.resw
index bc0315fa..2a20f96a 100644
--- a/src/Calculator/Resources/kk-KZ/Resources.resw
+++ b/src/Calculator/Resources/kk-KZ/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Бұл есеп суретін қалпына келтіру мүмкін болмады.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value> а.б</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>пк</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>	астрономиялық бірлік</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>жарық жылы</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>парсек</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>ж.ж</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/km-KH/Resources.resw b/src/Calculator/Resources/km-KH/Resources.resw
index d3d24e55..6950d9ba 100644
--- a/src/Calculator/Resources/km-KH/Resources.resw
+++ b/src/Calculator/Resources/km-KH/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>មិនអាចស្ដាររូបថតរហ័សនេះ​ឡើងវិញបានទេ។</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>ឯក.អាស្ត្រ.</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>បា.សេក</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>ឯកតាអាស្ត្រូណូមិច</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>ពេលអ៊ឺរូបភ្លឺ</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsec</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value />
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/kn-IN/Resources.resw b/src/Calculator/Resources/kn-IN/Resources.resw
index 27974c9e..288fc2ca 100644
--- a/src/Calculator/Resources/kn-IN/Resources.resw
+++ b/src/Calculator/Resources/kn-IN/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>ಈ ಸ್ನ್ಯಾಪ್‌ಶಾಟ್ ಅನ್ನು ಪುನಃಸ್ಥಾಪಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>ಖಒ</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value> ಪಾ.</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>ಖಗೋಳೀಯ ಒಗ್ಗಟ್ಟು</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>ಜ್ಯೋತಿರ್ವರ್ಷ</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>ಪಾರ್ಸೆಕ್</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>ಜ್.ವ</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/ko-KR/Resources.resw b/src/Calculator/Resources/ko-KR/Resources.resw
index b9f3c853..aa74bb15 100644
--- a/src/Calculator/Resources/ko-KR/Resources.resw
+++ b/src/Calculator/Resources/ko-KR/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>이 스냅샷을 복원할 수 없습니다.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>천문단위</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>파섹</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>천문단위</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>광년</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>파섹</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>광년</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/lo-LA/Resources.resw b/src/Calculator/Resources/lo-LA/Resources.resw
index 0ce15b5f..7d006937 100644
--- a/src/Calculator/Resources/lo-LA/Resources.resw
+++ b/src/Calculator/Resources/lo-LA/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>ພວກເຮົາບໍ່ສາມາດກູ້ສະແນັບຊັອດນີ້ໄດ້.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value> ຫ.ດ</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>ພາ.ເຊັກ</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>	ຫນ່ວຍດາວທຽມ</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>ປີແສງ</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsec</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>ປປ</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/lt-LT/Resources.resw b/src/Calculator/Resources/lt-LT/Resources.resw
index 3d850ae7..f145af5c 100644
--- a/src/Calculator/Resources/lt-LT/Resources.resw
+++ b/src/Calculator/Resources/lt-LT/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Mums nepavyko atkurti šios momentinės kopijos.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value> AV</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>ps</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>astronominis vienetas</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>šviesmėtis</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsekas</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>šm</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/lv-LV/Resources.resw b/src/Calculator/Resources/lv-LV/Resources.resw
index 291f417a..e242e188 100644
--- a/src/Calculator/Resources/lv-LV/Resources.resw
+++ b/src/Calculator/Resources/lv-LV/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Nevarēja atjaunot šo momentuzņēmumu.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value> AV</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>ps</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>astronomiskā vienība</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>gaismas gads</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parseks</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value />
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/mk-MK/Resources.resw b/src/Calculator/Resources/mk-MK/Resources.resw
index 16f50fe1..99a222c5 100644
--- a/src/Calculator/Resources/mk-MK/Resources.resw
+++ b/src/Calculator/Resources/mk-MK/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Блиц-извештајот не може да се обнови.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>АЕ</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value> пс</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>	астрономска единица</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>светлосна година</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>парсек</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>св.г</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/ml-IN/Resources.resw b/src/Calculator/Resources/ml-IN/Resources.resw
index 745ffbdb..0291954a 100644
--- a/src/Calculator/Resources/ml-IN/Resources.resw
+++ b/src/Calculator/Resources/ml-IN/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>ഈ സ്നാപ്പ്ഷോട്ട് പുനഃസ്ഥാപിക്കാനായില്ല.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>എ.യു</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value> പാ.</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>ആകാശമSkipping</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>പ്രകാശവർഷം</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsec</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>പ്ര.വ</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/ms-MY/Resources.resw b/src/Calculator/Resources/ms-MY/Resources.resw
index 8187eb22..4e6a3f74 100644
--- a/src/Calculator/Resources/ms-MY/Resources.resw
+++ b/src/Calculator/Resources/ms-MY/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Tidak dapat memulihkan petikan ini.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>AU</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>unit astronomi</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>tahun cahaya</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsec</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>th.c</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/nb-NO/Resources.resw b/src/Calculator/Resources/nb-NO/Resources.resw
index 8e3e8fa2..ce136ff7 100644
--- a/src/Calculator/Resources/nb-NO/Resources.resw
+++ b/src/Calculator/Resources/nb-NO/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Kan ikke gjenopprette dette øyeblikksbildet.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>AE</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>astronomisk enhet</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>lysår</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsek</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>lysår</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/nl-NL/Resources.resw b/src/Calculator/Resources/nl-NL/Resources.resw
index bf9f252e..c3d8fac4 100644
--- a/src/Calculator/Resources/nl-NL/Resources.resw
+++ b/src/Calculator/Resources/nl-NL/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Kan deze momentopname niet herstellen.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value> AE</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>astronomische eenheid</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>lichtjaar</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsec</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>lj</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/pl-PL/Resources.resw b/src/Calculator/Resources/pl-PL/Resources.resw
index c3112045..b73b3cd0 100644
--- a/src/Calculator/Resources/pl-PL/Resources.resw
+++ b/src/Calculator/Resources/pl-PL/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Nie można przywrócić tej migawki.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value> j.a.</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>jednostka astronomiczna</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>rok świetlny</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsek</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>lś</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/pt-BR/Resources.resw b/src/Calculator/Resources/pt-BR/Resources.resw
index 2357b42a..5fd563fe 100644
--- a/src/Calculator/Resources/pt-BR/Resources.resw
+++ b/src/Calculator/Resources/pt-BR/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Não foi possível restaurar este instantâneo.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>UA</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>unidade astronômica</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>ano‑luz</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsec</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>al</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/pt-PT/Resources.resw b/src/Calculator/Resources/pt-PT/Resources.resw
index 16e90d44..0f8c093f 100644
--- a/src/Calculator/Resources/pt-PT/Resources.resw
+++ b/src/Calculator/Resources/pt-PT/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Não foi possível restaurar este instantâneo.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>UA</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>unidade astronómica</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>ano‑luz</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsec</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>al</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/ro-RO/Resources.resw b/src/Calculator/Resources/ro-RO/Resources.resw
index b39129a1..b63ad0ad 100644
--- a/src/Calculator/Resources/ro-RO/Resources.resw
+++ b/src/Calculator/Resources/ro-RO/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Nu s-a putut restaura acest instantaneu.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>UA</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>	unitate astronomică</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>an‑lumină</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsec</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>a.l.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/ru-RU/Resources.resw b/src/Calculator/Resources/ru-RU/Resources.resw
index 84b5dc58..329edbf0 100644
--- a/src/Calculator/Resources/ru-RU/Resources.resw
+++ b/src/Calculator/Resources/ru-RU/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Не удалось восстановить этот моментальный снимок.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>а.е.</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value> пк</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>астрономическая единица</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>световой год</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>парсек</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>св.г</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/sk-SK/Resources.resw b/src/Calculator/Resources/sk-SK/Resources.resw
index 97ab892c..bde906dd 100644
--- a/src/Calculator/Resources/sk-SK/Resources.resw
+++ b/src/Calculator/Resources/sk-SK/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Túto snímku sa nepodarilo obnoviť.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value> AJ</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>astronomická jednotka</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>svetelný rok</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsec</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>sv. r.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/sl-SI/Resources.resw b/src/Calculator/Resources/sl-SI/Resources.resw
index a77f0f27..2178f15a 100644
--- a/src/Calculator/Resources/sl-SI/Resources.resw
+++ b/src/Calculator/Resources/sl-SI/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Tega posnetka ni bilo mogoče obnoviti.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value> AE</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>astronomska enota</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>svetlobno leto</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsec</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value />
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/sq-AL/Resources.resw b/src/Calculator/Resources/sq-AL/Resources.resw
index 19b76581..f761c85e 100644
--- a/src/Calculator/Resources/sq-AL/Resources.resw
+++ b/src/Calculator/Resources/sq-AL/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Nuk mund të rikthejmë këtë fotografi.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>NJA</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>ps</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>njësi astronomike</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>dritëviti</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsec</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>v.d.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/sr-Latn-RS/Resources.resw b/src/Calculator/Resources/sr-Latn-RS/Resources.resw
index de430614..e5738e51 100644
--- a/src/Calculator/Resources/sr-Latn-RS/Resources.resw
+++ b/src/Calculator/Resources/sr-Latn-RS/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Nije moguće vratiti ovaj snimak u prethodno stanje.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>AJ</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>astronomijska jedinica</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>svetlosna godina</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsek</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>sg</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/sv-SE/Resources.resw b/src/Calculator/Resources/sv-SE/Resources.resw
index 1f8cedcd..59a4f048 100644
--- a/src/Calculator/Resources/sv-SE/Resources.resw
+++ b/src/Calculator/Resources/sv-SE/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Det gick inte att återställa den här ögonblicksbilden.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value> AE</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>astronomisk enhet	</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>ljusår</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsec</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>ljusår</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/ta-IN/Resources.resw b/src/Calculator/Resources/ta-IN/Resources.resw
index 448ae019..6e2cc7e0 100644
--- a/src/Calculator/Resources/ta-IN/Resources.resw
+++ b/src/Calculator/Resources/ta-IN/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4199,4 +4199,22 @@
     <value>இந்த நொடிப்புச்சேமிப்பை மீட்டெடுக்க முடியவில்லை.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value> வி.அ</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>பா.</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>விண்மீனியல் அலகு</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>ஒளியாண்டு (oḷiyāṇṭu)</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>பர்செக்</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>ஒ.ஆ</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/te-IN/Resources.resw b/src/Calculator/Resources/te-IN/Resources.resw
index 6e71fcbd..90a6c6f8 100644
--- a/src/Calculator/Resources/te-IN/Resources.resw
+++ b/src/Calculator/Resources/te-IN/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>ఈ స్నాప్‌షాట్‌ని పునరుద్ధరించడం సాధ్యపడలేదు.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>ఖ.ఐ</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value> పా.</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>ఖగోళశాస్త్రమ ఏకకం</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>కాంతిసంవత్సరము</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>పార్సెక్</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>కా.సం</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/th-TH/Resources.resw b/src/Calculator/Resources/th-TH/Resources.resw
index bcac9e91..58e2bbe3 100644
--- a/src/Calculator/Resources/th-TH/Resources.resw
+++ b/src/Calculator/Resources/th-TH/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>ไม่สามารถคืนค่าสแนปช็อตนี้ได้</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>หน.ดา</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>พาร์เซก</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>	หน่วยดาราศาสตร์</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>ปีแสง</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>พาร์เซก</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>ปีแสง</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/tr-TR/Resources.resw b/src/Calculator/Resources/tr-TR/Resources.resw
index 1d88b2c8..8339db6e 100644
--- a/src/Calculator/Resources/tr-TR/Resources.resw
+++ b/src/Calculator/Resources/tr-TR/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Bu anlık görüntü geri yüklenemedi.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>AB</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value> ps</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>astronomik birim</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>ışık yılı</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsek</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>i.y.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/uk-UA/Resources.resw b/src/Calculator/Resources/uk-UA/Resources.resw
index 636b790e..05e64560 100644
--- a/src/Calculator/Resources/uk-UA/Resources.resw
+++ b/src/Calculator/Resources/uk-UA/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Не вдалося відновити цей знімок.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>а.о.</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value> пс</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>астрономічна одиниця</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>світловий рік</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>парсек</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>с.р.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/vi-VN/Resources.resw b/src/Calculator/Resources/vi-VN/Resources.resw
index 073aa6fc..0dad3b73 100644
--- a/src/Calculator/Resources/vi-VN/Resources.resw
+++ b/src/Calculator/Resources/vi-VN/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>Không thể khôi phục ảnh chụp nhanh này.</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>ĐVTV</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>đơn vị thiên văn</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>năm ánh sáng</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>parsec</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>nă.l</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Calculator/Resources/zh-CN/Resources.resw b/src/Calculator/Resources/zh-CN/Resources.resw
index 1c9115f5..56c5c22c 100644
--- a/src/Calculator/Resources/zh-CN/Resources.resw
+++ b/src/Calculator/Resources/zh-CN/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,25 @@
     <value>无法还原此快照。</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
-</root>
\ No newline at end of file
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>AU</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>秒差距</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>天文单位</value>
+    <comment>长度单位，近似等于地球与太阳的平均距离。</comment>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>光年</value>
+    <comment>长度单位，等于光在真空中传播一儒略年的距离。</comment>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>秒差距</value>
+    <comment>长度单位，用于测量太阳系外天文物体的大距离。</comment>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>光年</value>
+  </data>
+</root>
diff --git a/src/Calculator/Resources/zh-TW/Resources.resw b/src/Calculator/Resources/zh-TW/Resources.resw
index 3dcd0b46..bad49abe 100644
--- a/src/Calculator/Resources/zh-TW/Resources.resw
+++ b/src/Calculator/Resources/zh-TW/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -4198,4 +4198,22 @@
     <value>無法還原此快照。</value>
     <comment>The error message to notify user that restoring from snapshot has failed.</comment>
   </data>
+  <data name="UnitAbbreviation_AstronomicalUnit" xml:space="preserve">
+    <value>AU</value>
+  </data>
+  <data name="UnitAbbreviation_Parsec" xml:space="preserve">
+    <value>pc</value>
+  </data>
+  <data name="UnitName_AstronomicalUnit" xml:space="preserve">
+    <value>天文單位</value>
+  </data>
+  <data name="UnitName_LightYear" xml:space="preserve">
+    <value>光年</value>
+  </data>
+  <data name="UnitName_Parsec" xml:space="preserve">
+    <value>秒差距</value>
+  </data>
+  <data name="UnitAbbreviation_LightYear" xml:space="preserve">
+    <value>ly</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/CalculatorUnitTests/Test.resw b/src/CalculatorUnitTests/Test.resw
index 346b24c0..fa169767 100644
--- a/src/CalculatorUnitTests/Test.resw
+++ b/src/CalculatorUnitTests/Test.resw
@@ -327,6 +327,15 @@
     <data name="Meters-Angstroms">
         <value>0.0000000001</value>
     </data>
+    <data name="Meters-LightYears">
+        <value>9460730472580800</value>
+    </data>
+    <data name="Meters-AstronomicalUnits">
+        <value>149597870700</value>
+    </data>
+    <data name="AstronomicalUnits-Parsecs">
+        <value>206264.80624709635515647335733078</value>
+    </data>
     <data name="Meters-Centimeters">
         <value>0.01</value>
     </data>