Skip to content

Commit

Permalink
Merge branch 'master' of github.com:nielsnuebel/kickgdpr
Browse files Browse the repository at this point in the history
# Conflicts:
#	language/de-DE/de-DE.plg_system_kickgdpr.ini
#	language/de-DE/de-DE.plg_system_kickgdpr.sys.ini
#	language/en-GB/en-GB.plg_system_kickgdpr.sys.ini
  • Loading branch information
Niels Nübel committed May 23, 2018
2 parents 93bb8b1 + 0d9f06b commit 36db321
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion language/de-DE/de-DE.plg_system_kickgdpr.ini
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,4 @@ PLG_SYSTEM_KICKGDPR_PARAMETER_CUSTOMCSS_LABEL="Cookie eigener CSS-Style"
PLG_SYSTEM_KICKGDPR_TAB_CUSTOMCSS_DESC="Hier kann eigener CSS-Style hinterlegt werden, welcher im &lt;HEAD&gt;-Bereich der Webseite ausgegeben wird. Bspw. für z-index <strong>.cc-grower {z-index: 1000;}</strong>"
PLG_SYSTEM_KICKGDPR_TAB_CUSTOMCSS="Eigener CSS-Style"

KICKDONATION="Projekt unterstützen?"
KICKDONATION="Projekt unterstützen?"
2 changes: 1 addition & 1 deletion language/de-DE/de-DE.plg_system_kickgdpr.sys.ini
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
PLG_SYSTEM_KICKGDPR="System - Kick GDPR / DSGVO"
PLG_SYSTEM_KICKGDPR_XML_DESCRIPTION="Cookie-Hinweis Plugin basierend auf der Cookie-Consent Lösung zur datenschutzkonformen Cookie-Nutzung inkl. Google Analytics Integration."
PLG_SYSTEM_KICKGDPR_XML_DESCRIPTION="Cookie-Hinweis Plugin basierend auf der Cookie-Consent Lösung zur datenschutzkonformen Cookie-Nutzung inkl. Google Analytics Integration."
2 changes: 1 addition & 1 deletion language/en-GB/en-GB.plg_system_kickgdpr.sys.ini
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
PLG_SYSTEM_KICKGDPR="System - Kick GDPR"
PLG_SYSTEM_KICKGDPR_XML_DESCRIPTION="Cookie hint plugin based on Cookie Consent. Integrates Google Analytics the easy way."
PLG_SYSTEM_KICKGDPR_XML_DESCRIPTION="Cookie hint plugin based on Cookie Consent. Integrates Google Analytics the easy way."

0 comments on commit 36db321

Please sign in to comment.