Merge RC 0.8 in feature/refactor

10 files changed, 46 insertions, 0 deletions

diff --git a/l10n/de.js b/l10n/de.js
index 83d71b06..c96122b9 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -55,6 +55,10 @@ OC.L10N.register(
     "Create poll" : "Umfrage erstellen",
     "participated" : "abgestimmt",
     "Yourself" : "Dir",
+    "You did not vote" : "Du hast nicht abgestimmt",
+    "You voted" : "Du hast abgestimmt",
+    "You did not comment" : "Du hast nicht kommentiert",
+    "You commented" : "Du hast kommentiert",
     "Select" : "Wählen",
     "Close" : "Schließen",
     "Users" : "Benutzer",
diff --git a/l10n/de.json b/l10n/de.json
index bb89302c..2d3745d9 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -53,6 +53,10 @@
 	"Create poll" : "Umfrage erstellen",
 	"participated" : "abgestimmt",
 	"Yourself" : "Dir",
+    "You did not vote" : "Du hast nicht abgestimmt",
+    "You voted" : "Du hast abgestimmt",
+    "You did not comment" : "Du hast nicht kommentiert",
+    "You commented" : "Du hast kommentiert",
 	"Select" : "Wählen",
 	"Close" : "Schließen",
 	"Users" : "Benutzer",
diff --git a/l10n/de.php b/l10n/de.php
index cc27b5c2..331240c3 100644
--- a/l10n/de.php
+++ b/l10n/de.php
@@ -54,6 +54,10 @@ $TRANSLATIONS = array(
 	"Create poll" => "Umfrage erstellen",
 	"participated" => "abgestimmt",
 	"Yourself" => "Dir",
+    "You did not vote" => "Du hast nicht abgestimmt",
+    "You voted" => "Du hast abgestimmt",
+    "You did not comment" => "Du hast nicht kommentiert",
+    "You commented" => "Du hast kommentiert",
 	"Select" => "Wählen",
 	"Close" => "Schließen",
 	"Users" => "Benutzer",
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
index d60283f0..629aef62 100644
--- a/l10n/de_DE.json
+++ b/l10n/de_DE.json
@@ -53,6 +53,10 @@
 	"Create poll" : "Umfrage erstellen",
 	"participated" : "abgestimmt",
 	"Yourself" : "Ihnen",
+    "You did not vote" : "Sie haben nicht abgestimmt",
+    "You voted" : "Sie haben abgestimmt",
+    "You did not comment" : "Sie haben nicht kommentiert",
+    "You commented" : "Sie haben kommentiert",
 	"Select" : "Wählen",
 	"Close" : "Schließen",
 	"Users" : "Benutzer",
diff --git a/l10n/en.js b/l10n/en.js
index 48c8d528..d9459d79 100644
--- a/l10n/en.js
+++ b/l10n/en.js
@@ -21,6 +21,7 @@ OC.L10N.register(
     "hidden" : "hidden",
     "public" : "public",
     "registered" : "registered",
+    "expired" : "expired",
     "delete" : "delete",
     "Next" : "Next",
     "Cancel" : "Cancel",
@@ -55,6 +56,10 @@ OC.L10N.register(
     "Create poll" : "Create poll",
     "participated" : "participated",
     "Yourself" : "Yourself",
+    "You did not vote" : "You did not vote",
+    "You voted" : "You voted",
+    "You did not comment" : "You did not comment",
+    "You commented" : "You commented",
     "Select" : "Select",
     "Close" : "Close",
     "Users" : "Users",
diff --git a/l10n/en.json b/l10n/en.json
index 8d747490..ce7cff18 100644
--- a/l10n/en.json
+++ b/l10n/en.json
@@ -19,6 +19,7 @@
 	"hidden" : "hidden",
 	"public" : "public",
 	"registered" : "registered",
+    "expired" : "expired",
 	"delete" : "delete",
 	"Next" : "Next",
 	"Cancel" : "Cancel",
@@ -53,6 +54,10 @@
 	"Home" : "Home",
 	"participated" : "participated",
 	"Yourself" : "Yourself",
+    "You did not vote" : "You did not vote",
+    "You voted" : "You voted",
+    "You did not comment" : "You did not comment",
+    "You commented" : "You commented",
 	"Select" : "Select",
 	"Close" : "Close",
 	"Users" : "Users",
diff --git a/l10n/en.php b/l10n/en.php
index cf6def25..21e37edc 100644
--- a/l10n/en.php
+++ b/l10n/en.php
@@ -20,6 +20,7 @@ $TRANSLATIONS = array(
 	"hidden" => "hidden",
 	"public" => "public",
 	"registered" => "registered",
+    "expired" => "expired",
 	"delete" => "delete",
 	"Next" => "Next",
 	"Cancel" => "Cancel",
@@ -54,6 +55,10 @@ $TRANSLATIONS = array(
 	"Create poll" => "Create poll",
 	"participated" => "participated",
 	"Yourself" => "Yourself",
+    "You did not vote" => "You did not vote",
+    "You voted" => "You voted",
+    "You did not comment" => "You did not comment",
+    "You commented" => "You commented",
 	"Select" => "Select",
 	"Close" => "Close",
 	"Users" => "Users",
diff --git a/l10n/fr.js b/l10n/fr.js
index 79f7b3f4..9dfec42b 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -21,6 +21,7 @@ OC.L10N.register(
     "hidden" : "caché",
     "public" : "public",
     "registered" : "inscription",
+    "expired" : "expired",
     "delete" : "effacer",
     "Next" : "Suivant",
     "Cancel" : "Annuler",
@@ -55,6 +56,10 @@ OC.L10N.register(
     "Home" : "Home",
     "participated" : "participer",
     "Yourself" : "Vous-même",
+    "You did not vote" : "You did not vote",
+    "You voted" : "You voted",
+    "You did not comment" : "You did not comment",
+    "You commented" : "You commented",
     "Select" : "Selectionner",
     "Close" : "Fermer",
     "Users" : "Utilisateurs",
diff --git a/l10n/fr.json b/l10n/fr.json
index 49b41935..60bb6d5c 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -19,6 +19,7 @@
 	"hidden" : "caché",
 	"public" : "public",
 	"registered" : "inscrit",
+    "expired" : "expired",
 	"delete" : "effacer",
 	"Next" : "Suivant",
 	"Cancel" : "Annuler",
@@ -53,6 +54,10 @@
 	"Home" : "Home",
 	"participated" : "participer",
 	"Yourself" : "Vous-même",
+    "You did not vote" : "You did not vote",
+    "You voted" : "You voted",
+    "You did not comment" : "You did not comment",
+    "You commented" : "You commented",
 	"Select" : "Selectionner",
 	"Close" : "Fermer",
 	"Users" : "Utilisateurs",
diff --git a/l10n/fr.php b/l10n/fr.php
index 9936143f..50a41987 100644
--- a/l10n/fr.php
+++ b/l10n/fr.php
@@ -20,6 +20,7 @@ $TRANSLATIONS = array(
 	"hidden" => "caché",
 	"public" => "public",
 	"registered" => "inscription",
+    "expired" => "expired",
 	"delete" => "effacer",
 	"Next" => "Suivant",
 	"Cancel" => "Annuler",
@@ -54,6 +55,10 @@ $TRANSLATIONS = array(
 	"Home" => "Home",
 	"participated" => "participer",
 	"Yourself" => "Vous-même",
+    "You did not vote" => "You did not vote",
+    "You voted" => "You voted",
+    "You did not comment" => "You did not comment",
+    "You commented" => "You commented",
 	"Select" => "Selectionner",
 	"Close" => "Fermer",
 	"Users" => "Utilisateurs",