Index: src/catalog/gettextheader.cpp
===================================================================
--- src/catalog/gettextheader.cpp
+++ src/catalog/gettextheader.cpp
@@ -363,7 +363,17 @@
 
 
 
-    temp = QStringLiteral("Language-Team: ") % language % QStringLiteral(" <") % mailingList % QStringLiteral(">\\n");
+    Project::LangSource projLangSource = Project::instance()->languageSource();
+    QString projLT = Project::instance()->projLangTeam();
+    if (projLangSource == Project::LangSource::Project) {
+        temp = QStringLiteral("Language-Team: ")%projLT%QStringLiteral("\\n");
+    }
+    else if ((projLangSource == Project::LangSource::Application) && (Settings::overrideLangTeam())) {
+        temp = QStringLiteral("Language-Team: ")%Settings::userLangTeam()%QStringLiteral("\\n");
+    }
+    else {
+        temp = QStringLiteral("Language-Team: ")%language%QStringLiteral(" <")%mailingList%QStringLiteral(">\\n");
+    }
     if (Q_LIKELY(found))
         (*ait) = temp;
     else
Index: src/prefs/lokalize.kcfg
===================================================================
--- src/prefs/lokalize.kcfg
+++ src/prefs/lokalize.kcfg
@@ -23,6 +23,20 @@
 -->
         <default code="true">KEMailSettings().getSetting(KEMailSettings::RealName)</default>
     </entry>
+    <entry key="overrideLangTeam" type="Bool">
+<!--
+        <label>Override Language Team</label>
+            <whatsthis>Use user-provided language team name instead of generating it</whatsthis>
+-->
+        <default>false</default>
+    </entry>
+    <entry key="userLangTeam" type="String">
+<!--
+        <label>Language Team</label>
+            <whatsthis>Translator team's name</whatsthis>
+-->
+        <default></default>
+    </entry>
     <entry key="authorEmail" type="String">
 <!--
             <whatsthis>Translator's email</whatsthis>
Index: src/prefs/prefs.cpp
===================================================================
--- src/prefs/prefs.cpp
+++ src/prefs/prefs.cpp
@@ -113,6 +113,9 @@
     connect(ui_prefs_identity.DefaultLangCode, QOverload<int>::of(&KComboBox::activated), ui_prefs_identity.kcfg_DefaultLangCode, &LangCodeSaver::setLangCode);
     ui_prefs_identity.kcfg_DefaultLangCode->hide();
 
+    connect(ui_prefs_identity.kcfg_overrideLangTeam, &QCheckBox::toggled, ui_prefs_identity.kcfg_userLangTeam, &QLineEdit::setEnabled);
+    connect(ui_prefs_identity.kcfg_overrideLangTeam, &QCheckBox::toggled, ui_prefs_identity.kcfg_userLangTeam, &QLineEdit::focusWidget);
+
     dialog->addPage(w, i18nc("@title:tab", "Identity"), "preferences-desktop-user");
 
 //General
@@ -297,6 +300,11 @@
     ui_prefs_projectmain.poBaseDir->setUrl(QUrl::fromLocalFile(p.poDir()));
     ui_prefs_projectmain.glossaryTbx->setUrl(QUrl::fromLocalFile(p.glossaryPath()));
 
+    auto kcfg_ProjLangTeam = ui_prefs_projectmain.kcfg_ProjLangTeam;
+    connect(ui_prefs_projectmain.kcfg_LanguageSource, static_cast<void(KComboBox::*)(int)>(&KComboBox::currentIndexChanged),
+        this, [kcfg_ProjLangTeam](int index) { kcfg_ProjLangTeam->setEnabled(static_cast<Project::LangSource>(index) == Project::LangSource::Project); });
+    connect(ui_prefs_projectmain.kcfg_LanguageSource, static_cast<void(KComboBox::*)(const QString &)>(&KComboBox::currentIndexChanged),
+        this, [kcfg_ProjLangTeam] { kcfg_ProjLangTeam->setFocus(); });
 
 
 
Index: src/prefs/prefs_identity.ui
===================================================================
--- src/prefs/prefs_identity.ui
+++ src/prefs/prefs_identity.ui
@@ -14,7 +14,16 @@
    <string>Fill in your identity and information about your translation team. This information is used when updating the header of a file.</string>
   </property>
   <layout class="QGridLayout">
-   <property name="margin">
+   <property name="leftMargin">
+    <number>11</number>
+   </property>
+   <property name="topMargin">
+    <number>11</number>
+   </property>
+   <property name="rightMargin">
+    <number>11</number>
+   </property>
+   <property name="bottomMargin">
     <number>11</number>
    </property>
    <property name="spacing">
@@ -33,7 +42,7 @@
    <item row="1" column="0">
     <widget class="QLabel" name="textLabel2">
      <property name="text">
-      <string comment="@label:textbox">Email:</string>
+      <string comment="@label:textbox">&amp;Email:</string>
      </property>
      <property name="wordWrap">
       <bool>false</bool>
@@ -46,7 +55,7 @@
    <item row="0" column="0">
     <widget class="QLabel" name="textLabel2_2">
      <property name="text">
-      <string comment="@label:textbox">Name:</string>
+      <string comment="@label:textbox">&amp;Name:</string>
      </property>
      <property name="wordWrap">
       <bool>false</bool>
@@ -56,7 +65,7 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="1">
+   <item row="0" column="2">
     <widget class="QLineEdit" name="kcfg_authorName">
      <property name="toolTip">
       <string>Your name, in English</string>
@@ -69,14 +78,14 @@
    <item row="3" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
-      <string comment="@label:textbox">Default mailing list:</string>
+      <string comment="@label:textbox">&amp;Default mailing list:</string>
      </property>
      <property name="buddy">
       <cstring>kcfg_DefaultMailingList</cstring>
      </property>
     </widget>
    </item>
-   <item row="3" column="1">
+   <item row="3" column="2">
     <widget class="QLineEdit" name="kcfg_DefaultMailingList">
      <property name="toolTip">
       <string>The email of your team mailing list</string>
@@ -86,7 +95,7 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="1">
+   <item row="2" column="2">
     <widget class="KComboBox" name="DefaultLangCode">
      <property name="toolTip">
       <string>Language you translate to</string>
@@ -96,7 +105,7 @@
      </property>
     </widget>
    </item>
-   <item row="7" column="0" colspan="2">
+   <item row="8" column="0" colspan="3">
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -109,7 +118,7 @@
      </property>
     </spacer>
    </item>
-   <item row="1" column="1">
+   <item row="1" column="2">
     <widget class="QLineEdit" name="kcfg_authorEmail">
      <property name="toolTip">
       <string>Write your email</string>
@@ -119,14 +128,14 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="1">
+   <item row="6" column="2">
     <widget class="LangCodeSaver" name="kcfg_DefaultLangCode">
      <property name="enabled">
       <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item row="4" column="1">
+   <item row="5" column="2">
     <widget class="QLineEdit" name="kcfg_authorLocalizedName">
      <property name="toolTip">
       <string>Your name in your own language</string>
@@ -136,13 +145,30 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="0">
+   <item row="5" column="0">
     <widget class="QLabel" name="label_2">
      <property name="text">
       <string comment="@label:textbox">Localized name:</string>
      </property>
     </widget>
    </item>
+   <item row="4" column="0">
+    <widget class="QCheckBox" name="kcfg_overrideLangTeam">
+     <property name="text">
+      <string>Default Language-Team:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="2">
+    <widget class="QLineEdit" name="kcfg_userLangTeam">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>
Index: src/project/prefs_projectmain.ui
===================================================================
--- src/project/prefs_projectmain.ui
+++ src/project/prefs_projectmain.ui
@@ -11,11 +11,15 @@
    </rect>
   </property>
   <layout class="QGridLayout">
-   <item row="6" column="1">
-    <widget class="RelPathSaver" name="kcfg_PoBaseDir"/>
+   <item row="6" column="0">
+    <widget class="QLabel" name="l2">
+     <property name="text">
+      <string comment="@label:textbox">Glossary:</string>
+     </property>
+    </widget>
    </item>
    <item row="7" column="1">
-    <widget class="RelPathSaver" name="kcfg_GlossaryTbx"/>
+    <widget class="LangCodeSaver" name="kcfg_LangCode"/>
    </item>
    <item row="1" column="0">
     <widget class="QLabel" name="l0">
@@ -24,6 +28,19 @@
      </property>
     </widget>
    </item>
+   <item row="2" column="1">
+    <widget class="QLineEdit" name="kcfg_MailingList"/>
+   </item>
+   <item row="0" column="1">
+    <widget class="QLineEdit" name="kcfg_ProjectID">
+     <property name="toolTip">
+      <string>Project ID is used to differentiate translation memories of absolutely different projects and languages.
+
+For example, if you have several projects for translating KDE applications
+(e.g. they are in different repositories), use same ID for all of them.</string>
+     </property>
+    </widget>
+   </item>
    <item row="1" column="1">
     <widget class="KComboBox" name="LangCode">
      <property name="minimumSize">
@@ -37,10 +54,10 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="1">
-    <widget class="KUrlRequester" name="poBaseDir">
+   <item row="6" column="1">
+    <widget class="KUrlRequester" name="glossaryTbx">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -51,16 +68,29 @@
        <height>16</height>
       </size>
      </property>
-     <property name="toolTip">
-      <string>This is main setting. Set this to path of a folder with translation files
-for your project (or a subproject for your target language).</string>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="l4">
+     <property name="text">
+      <string comment="@label:textbox">Mailing list:</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="1">
-    <widget class="KUrlRequester" name="glossaryTbx">
+   <item row="0" column="0">
+    <widget class="QLabel" name="l3">
+     <property name="text">
+      <string comment="@label:textbox">ID:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="9" column="1">
+    <widget class="RelPathSaver" name="kcfg_GlossaryTbx"/>
+   </item>
+   <item row="5" column="1">
+    <widget class="KUrlRequester" name="poBaseDir">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -71,9 +101,29 @@
        <height>16</height>
       </size>
      </property>
+     <property name="toolTip">
+      <string>This is main setting. Set this to path of a folder with translation files
+for your project (or a subproject for your target language).</string>
+     </property>
     </widget>
    </item>
-   <item row="3" column="0">
+   <item row="8" column="1">
+    <widget class="RelPathSaver" name="kcfg_PoBaseDir"/>
+   </item>
+   <item row="10" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="5" column="0">
     <widget class="QLabel" name="l1">
      <property name="text">
       <string comment="@label:textbox">Root folder:</string>
@@ -84,61 +134,44 @@
     </widget>
    </item>
    <item row="4" column="0">
-    <widget class="QLabel" name="l2">
-     <property name="text">
-      <string comment="@label:textbox">Glossary:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1">
-    <widget class="QLineEdit" name="kcfg_ProjectID">
-     <property name="toolTip">
-      <string>Project ID is used to differentiate translation memories of absolutely different projects and languages.
-
-For example, if you have several projects for translating KDE applications
-(e.g. they are in different repositories), use same ID for all of them.</string>
-     </property>
+    <widget class="KComboBox" name="kcfg_LanguageSource">
+     <item>
+      <property name="text">
+       <string>Automatic</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Application</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Project</string>
+      </property>
+     </item>
     </widget>
    </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="l3">
-     <property name="text">
-      <string comment="@label:textbox">ID:</string>
+   <item row="4" column="1">
+    <widget class="QLineEdit" name="kcfg_ProjLangTeam">
+     <property name="enabled">
+      <bool>false</bool>
      </property>
     </widget>
    </item>
-   <item row="2" column="1">
-    <widget class="QLineEdit" name="kcfg_MailingList"/>
-   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="l4">
+   <item row="3" column="0">
+    <widget class="QLabel" name="l5">
      <property name="text">
-      <string comment="@label:textbox">Mailing list:</string>
+      <string>Language-Team:</string>
      </property>
     </widget>
    </item>
-   <item row="8" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="5" column="1">
-    <widget class="LangCodeSaver" name="kcfg_LangCode"/>
-   </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
-   <extends>QFrame</extends>
+   <extends>QWidget</extends>
    <header>kurlrequester.h</header>
    <container>1</container>
   </customwidget>
@@ -148,12 +181,12 @@
    <header>kcombobox.h</header>
   </customwidget>
   <customwidget>
-   <class>RelPathSaver</class>
+   <class>LangCodeSaver</class>
    <extends>QLineEdit</extends>
    <header>prefs.h</header>
   </customwidget>
   <customwidget>
-   <class>LangCodeSaver</class>
+   <class>RelPathSaver</class>
    <extends>QLineEdit</extends>
    <header>prefs.h</header>
   </customwidget>
Index: src/project/projectbase.kcfg
===================================================================
--- src/project/projectbase.kcfg
+++ src/project/projectbase.kcfg
@@ -26,6 +26,33 @@
     <entry name="MailingList"  type="String">
         <default code="true">getMailingList()</default>
     </entry>
+    <entry name="UserLangTeam" type="String">
+<!--
+        <label>User Language Team in Lokalize settings</label>
+-->
+        <default></default>
+    </entry>
+    <entry name="OverrideLangTeam" type="Bool">
+<!--
+        <label>Override Lokalize Language Team</label>
+-->
+        <default>false</default>
+    </entry>
+    <entry name="ProjLangTeam" type="String">
+<!--
+        <label>Project Language Team</label>
+-->
+        <default></default>
+    </entry>
+    <entry name="LanguageSource" type="Enum">
+            <choices name="LangSource">
+            <choice name="Automatic" />
+            <choice name="Application" />
+            <choice name="Project" />
+            <choice name="Undefined" />
+        </choices>
+        <default>Application</default>
+    </entry>
     <entry name="PoBaseDir"  type="String">
 <!--
         <label>The base directory for PO files (translations)</label>
Index: src/project/projectbase.kcfgc
===================================================================
--- src/project/projectbase.kcfgc
+++ src/project/projectbase.kcfgc
@@ -3,3 +3,4 @@
 Singleton=false
 Mutators=true
 GlobalEnums=true
+UseEnumTypes=true