From b40a88d9e9dcc6806d3e0d8751731b949208c3a2 Mon Sep 17 00:00:00 2001 From: Tomasz Date: Fri, 19 Aug 2016 23:52:18 +0200 Subject: [PATCH] after merge conflict solved --- lang/ilias_de.lang | 3 ++- lang/ilias_en.lang | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lang/ilias_de.lang b/lang/ilias_de.lang index a8e6191a84e4..323711920942 100644 --- a/lang/ilias_de.lang +++ b/lang/ilias_de.lang @@ -16017,4 +16017,5 @@ style#:#preview#:#Vorschau style#:#icons_gallery#:#Symbol Gallerie style#:#cant_delete_style_with_substyles#:#Styles mit Sub Styles können nicht gelöscht werden. style#:#style_assignments_deleted#:#Style Zuweisungen des folgenden Sub Style wurden gelöscht: -style#:#skin_id_exists#:#Es existiert bereits ein Skin mit dieser ID. \ No newline at end of file +style#:#skin_id_exists#:#Es existiert bereits ein Skin mit dieser ID. +style#:#usages#:#Verwendungen: \ No newline at end of file diff --git a/lang/ilias_en.lang b/lang/ilias_en.lang index 9ae1c075c5e0..e9dbb4e5e8da 100644 --- a/lang/ilias_en.lang +++ b/lang/ilias_en.lang @@ -16016,4 +16016,5 @@ style#:#preview#:#Preview style#:#icons_gallery#:#Icons Gallery style#:#cant_delete_style_with_substyles#:#Styles with sub styles cannot be deleted. style#:#style_assignments_deleted#:#Style assignments of the following Sub Style have been deleted: +style#:#skin_id_exists#:#There exists already a skin with this ID. style#:#usages#:#Usages: