helpcenter/Web/Controls/Help/Server/Windows
svetlana maleeva e6a632186d Merge branch 'feature/translations-fr-new' into release/1.6.0
# Conflicts:
#	Web/AdministratorGuides/Mass-mailing.aspx
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.es.resx
#	Web/App_GlobalResources/Resource.fr.resx
#	Web/App_GlobalResources/Resource.it.resx
#	Web/App_GlobalResources/Resource.resx
#	Web/App_GlobalResources/Resource.ru.resx
#	Web/Controls/Help/ArticlesCompleteList/DeveloperEdition/150017_change_themes_de.de.ascx
#	Web/Controls/Help/Installation/Desktop.de.ascx
#	Web/Controls/Help/Installation/Installation.ascx
#	Web/Controls/Help/Installation/Installation.de.ascx
#	Web/Controls/Help/MobApps/MobileProjects/MobileProjects.ascx
#	Web/Controls/Help/MobApps/MobileProjects/MobileProjects.de.ascx
#	Web/Controls/Help/MobApps/MobileProjects/MobileProjects.es.ascx
#	Web/Controls/Help/MobApps/MobileProjects/MobileProjects.fr.ascx
#	Web/Controls/Help/MobApps/MobileProjects/MobileProjects.ru.ascx
#	Web/Controls/Help/Tags/add-event/add-event.de.ascx
#	Web/Controls/Help/Tags/change-color/change-color.ascx
#	Web/Controls/Help/Tags/change-color/change-color.de.ascx
#	Web/Controls/Help/Tags/change-color/change-color.es.ascx
#	Web/Controls/Help/Tags/create-event/create-event.de.ascx
#	Web/Controls/Help/Tags/import-from-yahoo/import-from-yahoo.ascx
#	Web/Controls/Help/Tags/import-from-yahoo/import-from-yahoo.de.ascx
#	Web/Controls/Help/Tags/import-from-yahoo/import-from-yahoo.es.ascx
#	Web/Controls/Help/Tags/import-from-yahoo/import-from-yahoo.fr.ascx
#	Web/Controls/Help/Tags/import-from-yahoo/import-from-yahoo.it.ascx
#	Web/Controls/Help/Tags/import-from-yahoo/import-from-yahoo.ru.ascx
#	Web/Controls/Help/UserGuides/DocsGuides.de.ascx
#	Web/Controls/Help/UserGuides/DocsGuides.fr.ascx
#	Web/Controls/Help/UserGuides/DocsGuides.ru.ascx
#	Web/Controls/Help/UserGuides/DocsSE.ascx
#	Web/Controls/Help/UserGuides/DocsSE.de.ascx
#	Web/Controls/Help/UserGuides/DocsSE.fr.ascx
#	Web/Controls/Help/UserGuides/DocsSE.it.ascx
#	Web/Controls/Help/UserGuides/DocsSE.ru.ascx
#	Web/Controls/Help/UserGuides/DocsUserGuides.ascx
#	Web/Controls/Help/UserGuides/DocsUserGuides.de.ascx
#	Web/Controls/Help/UserGuides/DocsUserGuides.fr.ascx
#	Web/Controls/Help/UserGuides/DocsUserGuides.ru.ascx
#	Web/Controls/Help/UserGuides/GroupsDocuments.ascx
#	Web/Controls/Help/UserGuides/GroupsDocuments.de.ascx
#	Web/Controls/Help/UserGuides/GroupsDocuments.fr.ascx
#	Web/Controls/Help/UserGuides/GroupsDocuments.ru.ascx
2022-08-02 17:14:15 +03:00
..
Community Merge branch 'feature/translations-fr-new' into release/1.6.0 2022-08-02 17:14:15 +03:00
Document Merge branch 'feature/translations-fr-new' into release/1.6.0 2022-08-02 17:14:15 +03:00
Enterprise Merge branch 'feature/translations-fr-new' into release/1.6.0 2022-08-02 17:14:15 +03:00
Opensource/MigrateFromCommunityToEnterprise Add and update translations - fr 2022-07-08 17:37:39 +03:00
Talk/InstallTalk Add and update translations - fr 2022-07-08 17:37:39 +03:00