diff --git a/src/objects/zcl_abapgit_object_clas.clas.abap b/src/objects/zcl_abapgit_object_clas.clas.abap
index 19dc4d150..7c96b38f9 100644
--- a/src/objects/zcl_abapgit_object_clas.clas.abap
+++ b/src/objects/zcl_abapgit_object_clas.clas.abap
@@ -357,9 +357,17 @@ CLASS zcl_abapgit_object_clas IMPLEMENTATION.
 
   METHOD serialize_descr.
 
-    DATA: lt_descriptions TYPE zif_abapgit_definitions=>ty_seocompotx_tt.
+    DATA: lt_descriptions TYPE zif_abapgit_definitions=>ty_seocompotx_tt,
+          lv_language     TYPE spras.
+
+    IF io_xml->i18n_params( )-serialize_master_lang_only = abap_true.
+      lv_language = mv_language.
+    ENDIF.
+
+    lt_descriptions = mi_object_oriented_object_fct->read_descriptions(
+      iv_obejct_name = iv_clsname
+      iv_language = lv_language ).
 
-    lt_descriptions = mi_object_oriented_object_fct->read_descriptions( iv_clsname ).
     IF lines( lt_descriptions ) = 0.
       RETURN.
     ENDIF.
diff --git a/src/objects/zcl_abapgit_object_cus0.clas.abap b/src/objects/zcl_abapgit_object_cus0.clas.abap
index ad53cdb69..de75ce766 100644
--- a/src/objects/zcl_abapgit_object_cus0.clas.abap
+++ b/src/objects/zcl_abapgit_object_cus0.clas.abap
@@ -175,7 +175,7 @@ CLASS ZCL_ABAPGIT_OBJECT_CUS0 IMPLEMENTATION.
            ls_img_activity-header-ltime.
 
     IF io_xml->i18n_params( )-serialize_master_lang_only = abap_true.
-      DELETE ls_img_activity-texts WHERE spras <> sy-langu.
+      DELETE ls_img_activity-texts WHERE spras <> mv_language.
     ENDIF.
 
     io_xml->add( iv_name = 'CUS0'
diff --git a/src/objects/zcl_abapgit_object_cus1.clas.abap b/src/objects/zcl_abapgit_object_cus1.clas.abap
index 397c6d5ec..d446b920f 100644
--- a/src/objects/zcl_abapgit_object_cus1.clas.abap
+++ b/src/objects/zcl_abapgit_object_cus1.clas.abap
@@ -188,7 +188,7 @@ CLASS ZCL_ABAPGIT_OBJECT_CUS1 IMPLEMENTATION.
            ls_customzing_activity-activity_header-luser.
 
     IF io_xml->i18n_params( )-serialize_master_lang_only = abap_true.
-      DELETE ls_customzing_activity-activity_title WHERE spras <> sy-langu.
+      DELETE ls_customzing_activity-activity_title WHERE spras <> mv_language.
     ENDIF.
 
     io_xml->add( iv_name = 'CUS1'
diff --git a/src/objects/zcl_abapgit_object_cus2.clas.abap b/src/objects/zcl_abapgit_object_cus2.clas.abap
index bf2317a9f..d259395cf 100644
--- a/src/objects/zcl_abapgit_object_cus2.clas.abap
+++ b/src/objects/zcl_abapgit_object_cus2.clas.abap
@@ -164,7 +164,7 @@ CLASS ZCL_ABAPGIT_OBJECT_CUS2 IMPLEMENTATION.
            ls_customizing_attribute-header-luser.
 
     IF io_xml->i18n_params( )-serialize_master_lang_only = abap_true.
-      DELETE ls_customizing_attribute-titles WHERE spras <> sy-langu.
+      DELETE ls_customizing_attribute-titles WHERE spras <> mv_language.
     ENDIF.
 
     io_xml->add( iv_name = 'CUS2'
diff --git a/src/objects/zcl_abapgit_object_intf.clas.abap b/src/objects/zcl_abapgit_object_intf.clas.abap
index 5f301dfcc..649d42c0c 100644
--- a/src/objects/zcl_abapgit_object_intf.clas.abap
+++ b/src/objects/zcl_abapgit_object_intf.clas.abap
@@ -33,7 +33,7 @@ ENDCLASS.
 
 
 
-CLASS ZCL_ABAPGIT_OBJECT_INTF IMPLEMENTATION.
+CLASS zcl_abapgit_object_intf IMPLEMENTATION.
 
 
   METHOD constructor.
@@ -140,7 +140,8 @@ CLASS ZCL_ABAPGIT_OBJECT_INTF IMPLEMENTATION.
       lt_descriptions TYPE zif_abapgit_definitions=>ty_seocompotx_tt,
       ls_vseointerf   TYPE vseointerf,
       ls_clskey       TYPE seoclskey,
-      lt_lines        TYPE tlinetab.
+      lt_lines        TYPE tlinetab,
+      lv_language     TYPE spras.
 
 
     ls_clskey-clsname = ms_item-obj_name.
@@ -168,7 +169,14 @@ CLASS ZCL_ABAPGIT_OBJECT_INTF IMPLEMENTATION.
                    ig_data = lt_lines ).
     ENDIF.
 
-    lt_descriptions = mi_object_oriented_object_fct->read_descriptions( ls_clskey-clsname ).
+    IF io_xml->i18n_params( )-serialize_master_lang_only = abap_true.
+      lv_language = mv_language.
+    ENDIF.
+
+    lt_descriptions = mi_object_oriented_object_fct->read_descriptions(
+      iv_obejct_name = ls_clskey-clsname
+      iv_language = lv_language ).
+
     IF lines( lt_descriptions ) > 0.
       io_xml->add( iv_name = 'DESCRIPTIONS'
                    ig_data = lt_descriptions ).
diff --git a/src/objects/zcl_abapgit_oo_base.clas.abap b/src/objects/zcl_abapgit_oo_base.clas.abap
index 7704fdd8b..73bd05cb7 100644
--- a/src/objects/zcl_abapgit_oo_base.clas.abap
+++ b/src/objects/zcl_abapgit_oo_base.clas.abap
@@ -238,10 +238,20 @@ CLASS zcl_abapgit_oo_base IMPLEMENTATION.
 
 
   METHOD zif_abapgit_oo_object_fnc~read_descriptions.
-    SELECT * FROM seocompotx INTO TABLE rt_descriptions
-      WHERE clsname   = iv_obejct_name
-        AND descript <> ''
-      ORDER BY PRIMARY KEY.                               "#EC CI_SUBRC
+    IF iv_language IS INITIAL.
+      " load all languages
+      SELECT * FROM seocompotx INTO TABLE rt_descriptions
+             WHERE clsname   = iv_obejct_name
+               AND descript <> ''
+             ORDER BY PRIMARY KEY.                        "#EC CI_SUBRC
+    ELSE.
+      " load master language
+      SELECT * FROM seocompotx INTO TABLE rt_descriptions
+              WHERE clsname   = iv_obejct_name
+                AND langu = iv_language
+                AND descript <> ''
+              ORDER BY PRIMARY KEY.                       "#EC CI_SUBRC
+    ENDIF.
   ENDMETHOD.
 
 
diff --git a/src/objects/zif_abapgit_oo_object_fnc.intf.abap b/src/objects/zif_abapgit_oo_object_fnc.intf.abap
index b97f47c2b..4842635d5 100644
--- a/src/objects/zif_abapgit_oo_object_fnc.intf.abap
+++ b/src/objects/zif_abapgit_oo_object_fnc.intf.abap
@@ -123,6 +123,7 @@ INTERFACE zif_abapgit_oo_object_fnc PUBLIC.
     read_descriptions
       IMPORTING
         iv_obejct_name         TYPE seoclsname
+        iv_language            TYPE spras OPTIONAL
       RETURNING
         VALUE(rt_descriptions) TYPE zif_abapgit_definitions=>ty_seocompotx_tt,
     delete