chore(*): Merge upstream master

.github/CONTRIBUTING.md

@@ -75,6 +75,29 @@ Example status workflows:
 1. `status: pending-localization` this status tells that there are changes in the localization strings that need to be translated. When you make such changes, put this status badge without removing the other applicable ones and assign a person to do the translations.
 2. `status: localized` this status is for issues that were with a pending translation status and have already been localized. Place this status label once these translation changes have been included in the current pull request, or the changes are already pulled with a different pull request.
 
+## Localization - applicable to components' string resources
+There are several ways to localize components' string resources:
+
+1. Using custom resource strings:
+    1.1. Localize a given instance of component - each component which supports localization has input property `resourceStrings`. Setting a newly instantiated object to this property will localize only that given component's instance.
+    1.2. Localize all resources for a component type - each component which supports localization has input property `resourceStrings`. To localize all instances of a given component in the application the following steps should be performed - get the value of the input property `resourceStrings` of the component to be localized; do not create a new instance but replace the existing strings within the object. By default all components of a given type in an application share one instance of the resource strings. Replacing a value in that instance affects all components of that type in the application.
+    1.3. Localize all resources for all components - use global method `getCurrentResourceStrings` to get an object containing current resource strings for all components. To provide localized resources just pass an object of type `IResourceStrings` to the global method `changei18n`.
+
+2. Using npm package:
+We've created new repository which will hold the resource strings for languages different than English:
+https://github.com/IgniteUI/igniteui-angular-i18n
+A npm package should be published each time we release new version of IgniteUI for Angular. Its version should correspond to the version of the igniteui-angular npm package.
+One could localize an application by importing the corresponding localized resource strings from the localization package (`igniteui-angular-i18n`) and use the methods described in the previous bullet to localize the whole application or part of it.
+Example:
+Inside app.module you can perform:
+_import { IgxResouceStringsJA } from ‘igniteui-angular-i18n’;_
+And then:
+_Changei18n(IgxResouceStringsJA);_
+
+###Resource strings keys naming convention
+Each key in the `IResourceStrings` (and `IGridResourceStrings`, `ITimePickerResourceStrings`, etc.) is prefixed with components' selector and followed by the resource string key. Having components' selectors as prefixes allows us to have same resource strings keys for more than one component.
+Example: _igx_grid_groupByArea_message_.
+
 # Commit message conventions
 When committing a message you need to follow this template convention:
 `<type>(<scope>): <subject> <issue|optional>`

CHANGELOG.md

@@ -6,10 +6,14 @@ All notable changes for each version of this project will be documented in this
 ### Features
 - **New component** `IgxBannerComponent`:
     - Allows the developer to easily display a highly templateable message that requires minimal user interaction (1-2 actions) to be dismissed. Read up more information about the IgxBannerComponent in the official [documentation](https://www.infragistics.com/products/ignite-ui-angular/angular/components/banner.html) or the [ReadMe](https://github.com/IgniteUI/igniteui-angular/tree/master/projects/igniteui-angular/src/lib/banner/README.md)
+- `igxGrid`
+    - Added a new `igxToolbarCustomContent` directive which can be used to mark an `ng-template` which provides a custom content for the IgxGrid's toolbar ([#2983](https://github.com/IgniteUI/igniteui-angular/issues/2983))
 - `IgxIconModule`:
     - **Breaking change** `igxIconService` is now provided in root (providedIn: 'root') and `IgxIconModule.forRoot()` method is deprecated.
     - **Breaking change** `glyphName` property of the `igxIconComponent` is deprecated.
-
+- `IgxTreeGrid`:
+    - You can now export the tree grid both to CSV and Excel.
+    - The hierarchy and the records' expanded states would be reflected in the exported Excel worksheet.
 
 ## 7.0.2
 ### Features
@@ -21,7 +25,7 @@ All notable changes for each version of this project will be documented in this
 - `igxNavbar`:
     - Added a new `igx-action-icon` directive that can be used to provide a custom template to be used instead of the default action icon on the left-most part of the navbar.
     (If `igx-action-icon` is provided, the default action icon will not be used.)
-    
+
 ### Bug fixes
 
 - `igxGrid`
@@ -43,7 +47,7 @@ All notable changes for each version of this project will be documented in this
 
 ## 6.2.3
 - `igxGrid`
-    - `resourceStrings` property added, which allows changing/localizing strings for component. If a new instance is set, 
+    - `resourceStrings` property added, which allows changing/localizing strings for component. If a new instance is set,
     the changes will be applied to the particular instance of the component:
     ```typescript
         this.grid.resourceStrings = {
@@ -93,7 +97,7 @@ All notable changes for each version of this project will be documented in this
 - `igxDropDown`
     - Added a new property `maxHeight`, defining the max height of the drop down. ([#3001](https://github.com/IgniteUI/igniteui-angular/issues/3001))
 - Added migrations for Sass theme properties changes in 6.2.0 ([#2994](https://github.com/IgniteUI/igniteui-angular/issues/2994))
-- Themes 
+- Themes
     - Introducing schemas for easier bootstrapping of component themes.
     - **Breaking change** removed $variant from `igx-checkbox-theme`, `igx-ripple-theme`, `igx-switch-theme`, `igx-input-group-theme`, `igx-slider-theme`, and `igx-tooltip-theme`. Use the `$schema` prop, now available on all component themes to change the look for a specific theme. See the [Theming](https://www.infragistics.com/products/ignite-ui-angular/angular/components/themes/schemas.html) documentation to learn more.
 

extras/template/strings/shell-strings.json

@@ -24,14 +24,14 @@
         "Static": "スタティック",
         "Components": "コンポーネント",
         "Get Started": "はじめに",
-        "Name": "名",
+        "Name": "名前",
         "Description": "説明",
         "Type": "型",
         "Default Value": "デフォルト値",
         "Authors": "作者",
         "Example": "例",
         "Used by": "次で使用",
-        "See": "次を参照してください:",
+        "See": "参照先",
         "Requires": "必須",
         "Default value": "デフォルト値",
         "Optional": "オプション",