Merge branch 'master' into rakekniven-patch-1

53 files changed, 88 insertions, 80 deletions

diff --git a/apps/workflowengine/l10n/de.js b/apps/workflowengine/l10n/de.js
index d0846bf90be..e2513515921 100644
--- a/apps/workflowengine/l10n/de.js
+++ b/apps/workflowengine/l10n/de.js
@@ -49,7 +49,7 @@ OC.L10N.register(
     "Select a filter" : "Filter auswählen",
     "Select a comparator" : "Wähle einen Komparator",
     "Select a file type" : "Dateityp auswählen",
-    "e.g. httpd/unix-directory" : "z.B. httpd/unix-directory",
+    "e.g. httpd/unix-directory" : "z. B. httpd/unix-directory",
     "Folder" : "Ordner",
     "Images" : "Bilder",
     "Office documents" : "Office Dokumente",
diff --git a/apps/workflowengine/l10n/de.json b/apps/workflowengine/l10n/de.json
index 45b5db023fa..9e1d2211ae8 100644
--- a/apps/workflowengine/l10n/de.json
+++ b/apps/workflowengine/l10n/de.json
@@ -47,7 +47,7 @@
     "Select a filter" : "Filter auswählen",
     "Select a comparator" : "Wähle einen Komparator",
     "Select a file type" : "Dateityp auswählen",
-    "e.g. httpd/unix-directory" : "z.B. httpd/unix-directory",
+    "e.g. httpd/unix-directory" : "z. B. httpd/unix-directory",
     "Folder" : "Ordner",
     "Images" : "Bilder",
     "Office documents" : "Office Dokumente",
diff --git a/apps/workflowengine/l10n/de_DE.js b/apps/workflowengine/l10n/de_DE.js
index 52515a22796..526b88d87c8 100644
--- a/apps/workflowengine/l10n/de_DE.js
+++ b/apps/workflowengine/l10n/de_DE.js
@@ -54,7 +54,7 @@ OC.L10N.register(
     "Images" : "Bilder",
     "Office documents" : "Office-Dokumente",
     "PDF documents" : "PDF-Dokumente",
-    "Custom mimetype" : "Benutzerdefinierter Mime-Typ",
+    "Custom mimetype" : "Benutzerdefinierter MIME-Typ",
     "Select a tag" : "Schlagwort auswählen",
     "No results" : "Keine Ergebnisse",
     "%s (invisible)" : "%s (unsichtbar)",
diff --git a/apps/workflowengine/l10n/de_DE.json b/apps/workflowengine/l10n/de_DE.json
index 9c6debcdbe5..7102c73c8a7 100644
--- a/apps/workflowengine/l10n/de_DE.json
+++ b/apps/workflowengine/l10n/de_DE.json
@@ -52,7 +52,7 @@
     "Images" : "Bilder",
     "Office documents" : "Office-Dokumente",
     "PDF documents" : "PDF-Dokumente",
-    "Custom mimetype" : "Benutzerdefinierter Mime-Typ",
+    "Custom mimetype" : "Benutzerdefinierter MIME-Typ",
     "Select a tag" : "Schlagwort auswählen",
     "No results" : "Keine Ergebnisse",
     "%s (invisible)" : "%s (unsichtbar)",
diff --git a/apps/workflowengine/l10n/es.js b/apps/workflowengine/l10n/es.js
index beb2440def4..5fdfded87c0 100644
--- a/apps/workflowengine/l10n/es.js
+++ b/apps/workflowengine/l10n/es.js
@@ -116,4 +116,4 @@ OC.L10N.register(
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
 },
-"nplurals=2; plural=(n != 1);");
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/workflowengine/l10n/es.json b/apps/workflowengine/l10n/es.json
index aac2196baf2..b4119870a2e 100644
--- a/apps/workflowengine/l10n/es.json
+++ b/apps/workflowengine/l10n/es.json
@@ -113,5 +113,5 @@
     "User group membership" : "Pertenencia a un grupo de usuarios",
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/apps/workflowengine/l10n/es_419.js b/apps/workflowengine/l10n/es_419.js
index 1fb9cc0968e..69840e65583 100644
--- a/apps/workflowengine/l10n/es_419.js
+++ b/apps/workflowengine/l10n/es_419.js
@@ -60,4 +60,4 @@ OC.L10N.register(
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
 },
-"nplurals=2; plural=(n != 1);");
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/workflowengine/l10n/es_419.json b/apps/workflowengine/l10n/es_419.json
index f2f42dcefef..f86304753b3 100644
--- a/apps/workflowengine/l10n/es_419.json
+++ b/apps/workflowengine/l10n/es_419.json
@@ -57,5 +57,5 @@
     "User group membership" : "Membresia al grupo de usuarios",
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/apps/workflowengine/l10n/es_AR.js b/apps/workflowengine/l10n/es_AR.js
index 8712207652d..1ec50d036a4 100644
--- a/apps/workflowengine/l10n/es_AR.js
+++ b/apps/workflowengine/l10n/es_AR.js
@@ -61,4 +61,4 @@ OC.L10N.register(
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
 },
-"nplurals=2; plural=(n != 1);");
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/workflowengine/l10n/es_AR.json b/apps/workflowengine/l10n/es_AR.json
index 73207b7b31f..2b6d5e78056 100644
--- a/apps/workflowengine/l10n/es_AR.json
+++ b/apps/workflowengine/l10n/es_AR.json
@@ -58,5 +58,5 @@
     "User group membership" : "Membresia al grupo de usuarios",
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/apps/workflowengine/l10n/es_CL.js b/apps/workflowengine/l10n/es_CL.js
index 1fb9cc0968e..69840e65583 100644
--- a/apps/workflowengine/l10n/es_CL.js
+++ b/apps/workflowengine/l10n/es_CL.js
@@ -60,4 +60,4 @@ OC.L10N.register(
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
 },
-"nplurals=2; plural=(n != 1);");
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/workflowengine/l10n/es_CL.json b/apps/workflowengine/l10n/es_CL.json
index f2f42dcefef..f86304753b3 100644
--- a/apps/workflowengine/l10n/es_CL.json
+++ b/apps/workflowengine/l10n/es_CL.json
@@ -57,5 +57,5 @@
     "User group membership" : "Membresia al grupo de usuarios",
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/apps/workflowengine/l10n/es_CO.js b/apps/workflowengine/l10n/es_CO.js
index 1fb9cc0968e..69840e65583 100644
--- a/apps/workflowengine/l10n/es_CO.js
+++ b/apps/workflowengine/l10n/es_CO.js
@@ -60,4 +60,4 @@ OC.L10N.register(
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
 },
-"nplurals=2; plural=(n != 1);");
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/workflowengine/l10n/es_CO.json b/apps/workflowengine/l10n/es_CO.json
index f2f42dcefef..f86304753b3 100644
--- a/apps/workflowengine/l10n/es_CO.json
+++ b/apps/workflowengine/l10n/es_CO.json
@@ -57,5 +57,5 @@
     "User group membership" : "Membresia al grupo de usuarios",
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/apps/workflowengine/l10n/es_CR.js b/apps/workflowengine/l10n/es_CR.js
index 1fb9cc0968e..69840e65583 100644
--- a/apps/workflowengine/l10n/es_CR.js
+++ b/apps/workflowengine/l10n/es_CR.js
@@ -60,4 +60,4 @@ OC.L10N.register(
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
 },
-"nplurals=2; plural=(n != 1);");
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/workflowengine/l10n/es_CR.json b/apps/workflowengine/l10n/es_CR.json
index f2f42dcefef..f86304753b3 100644
--- a/apps/workflowengine/l10n/es_CR.json
+++ b/apps/workflowengine/l10n/es_CR.json
@@ -57,5 +57,5 @@
     "User group membership" : "Membresia al grupo de usuarios",
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/apps/workflowengine/l10n/es_DO.js b/apps/workflowengine/l10n/es_DO.js
index 1fb9cc0968e..69840e65583 100644
--- a/apps/workflowengine/l10n/es_DO.js
+++ b/apps/workflowengine/l10n/es_DO.js
@@ -60,4 +60,4 @@ OC.L10N.register(
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
 },
-"nplurals=2; plural=(n != 1);");
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/workflowengine/l10n/es_DO.json b/apps/workflowengine/l10n/es_DO.json
index f2f42dcefef..f86304753b3 100644
--- a/apps/workflowengine/l10n/es_DO.json
+++ b/apps/workflowengine/l10n/es_DO.json
@@ -57,5 +57,5 @@
     "User group membership" : "Membresia al grupo de usuarios",
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/apps/workflowengine/l10n/es_EC.js b/apps/workflowengine/l10n/es_EC.js
index 1fb9cc0968e..69840e65583 100644
--- a/apps/workflowengine/l10n/es_EC.js
+++ b/apps/workflowengine/l10n/es_EC.js
@@ -60,4 +60,4 @@ OC.L10N.register(
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
 },
-"nplurals=2; plural=(n != 1);");
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/workflowengine/l10n/es_EC.json b/apps/workflowengine/l10n/es_EC.json
index f2f42dcefef..f86304753b3 100644
--- a/apps/workflowengine/l10n/es_EC.json
+++ b/apps/workflowengine/l10n/es_EC.json
@@ -57,5 +57,5 @@
     "User group membership" : "Membresia al grupo de usuarios",
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/apps/workflowengine/l10n/es_GT.js b/apps/workflowengine/l10n/es_GT.js
index 1fb9cc0968e..69840e65583 100644
--- a/apps/workflowengine/l10n/es_GT.js
+++ b/apps/workflowengine/l10n/es_GT.js
@@ -60,4 +60,4 @@ OC.L10N.register(
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
 },
-"nplurals=2; plural=(n != 1);");
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/workflowengine/l10n/es_GT.json b/apps/workflowengine/l10n/es_GT.json
index f2f42dcefef..f86304753b3 100644
--- a/apps/workflowengine/l10n/es_GT.json
+++ b/apps/workflowengine/l10n/es_GT.json
@@ -57,5 +57,5 @@
     "User group membership" : "Membresia al grupo de usuarios",
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/apps/workflowengine/l10n/es_HN.js b/apps/workflowengine/l10n/es_HN.js
index 1fb9cc0968e..69840e65583 100644
--- a/apps/workflowengine/l10n/es_HN.js
+++ b/apps/workflowengine/l10n/es_HN.js
@@ -60,4 +60,4 @@ OC.L10N.register(
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
 },
-"nplurals=2; plural=(n != 1);");
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/workflowengine/l10n/es_HN.json b/apps/workflowengine/l10n/es_HN.json
index f2f42dcefef..f86304753b3 100644
--- a/apps/workflowengine/l10n/es_HN.json
+++ b/apps/workflowengine/l10n/es_HN.json
@@ -57,5 +57,5 @@
     "User group membership" : "Membresia al grupo de usuarios",
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/apps/workflowengine/l10n/es_MX.js b/apps/workflowengine/l10n/es_MX.js
index a559326dda3..5952ddad1ce 100644
--- a/apps/workflowengine/l10n/es_MX.js
+++ b/apps/workflowengine/l10n/es_MX.js
@@ -61,4 +61,4 @@ OC.L10N.register(
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
 },
-"nplurals=2; plural=(n != 1);");
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/workflowengine/l10n/es_MX.json b/apps/workflowengine/l10n/es_MX.json
index fd0c4e7bdb0..efe941bbdaa 100644
--- a/apps/workflowengine/l10n/es_MX.json
+++ b/apps/workflowengine/l10n/es_MX.json
@@ -58,5 +58,5 @@
     "User group membership" : "Membresia al grupo de usuarios",
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/apps/workflowengine/l10n/es_NI.js b/apps/workflowengine/l10n/es_NI.js
index 1fb9cc0968e..69840e65583 100644
--- a/apps/workflowengine/l10n/es_NI.js
+++ b/apps/workflowengine/l10n/es_NI.js
@@ -60,4 +60,4 @@ OC.L10N.register(
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
 },
-"nplurals=2; plural=(n != 1);");
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/workflowengine/l10n/es_NI.json b/apps/workflowengine/l10n/es_NI.json
index f2f42dcefef..f86304753b3 100644
--- a/apps/workflowengine/l10n/es_NI.json
+++ b/apps/workflowengine/l10n/es_NI.json
@@ -57,5 +57,5 @@
     "User group membership" : "Membresia al grupo de usuarios",
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/apps/workflowengine/l10n/es_PA.js b/apps/workflowengine/l10n/es_PA.js
index 1fb9cc0968e..69840e65583 100644
--- a/apps/workflowengine/l10n/es_PA.js
+++ b/apps/workflowengine/l10n/es_PA.js
@@ -60,4 +60,4 @@ OC.L10N.register(
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
 },
-"nplurals=2; plural=(n != 1);");
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/workflowengine/l10n/es_PA.json b/apps/workflowengine/l10n/es_PA.json
index f2f42dcefef..f86304753b3 100644
--- a/apps/workflowengine/l10n/es_PA.json
+++ b/apps/workflowengine/l10n/es_PA.json
@@ -57,5 +57,5 @@
     "User group membership" : "Membresia al grupo de usuarios",
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/apps/workflowengine/l10n/es_PE.js b/apps/workflowengine/l10n/es_PE.js
index 1fb9cc0968e..69840e65583 100644
--- a/apps/workflowengine/l10n/es_PE.js
+++ b/apps/workflowengine/l10n/es_PE.js
@@ -60,4 +60,4 @@ OC.L10N.register(
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
 },
-"nplurals=2; plural=(n != 1);");
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/workflowengine/l10n/es_PE.json b/apps/workflowengine/l10n/es_PE.json
index f2f42dcefef..f86304753b3 100644
--- a/apps/workflowengine/l10n/es_PE.json
+++ b/apps/workflowengine/l10n/es_PE.json
@@ -57,5 +57,5 @@
     "User group membership" : "Membresia al grupo de usuarios",
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/apps/workflowengine/l10n/es_PR.js b/apps/workflowengine/l10n/es_PR.js
index 1fb9cc0968e..69840e65583 100644
--- a/apps/workflowengine/l10n/es_PR.js
+++ b/apps/workflowengine/l10n/es_PR.js
@@ -60,4 +60,4 @@ OC.L10N.register(
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
 },
-"nplurals=2; plural=(n != 1);");
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/workflowengine/l10n/es_PR.json b/apps/workflowengine/l10n/es_PR.json
index f2f42dcefef..f86304753b3 100644
--- a/apps/workflowengine/l10n/es_PR.json
+++ b/apps/workflowengine/l10n/es_PR.json
@@ -57,5 +57,5 @@
     "User group membership" : "Membresia al grupo de usuarios",
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/apps/workflowengine/l10n/es_PY.js b/apps/workflowengine/l10n/es_PY.js
index 1fb9cc0968e..69840e65583 100644
--- a/apps/workflowengine/l10n/es_PY.js
+++ b/apps/workflowengine/l10n/es_PY.js
@@ -60,4 +60,4 @@ OC.L10N.register(
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
 },
-"nplurals=2; plural=(n != 1);");
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/workflowengine/l10n/es_PY.json b/apps/workflowengine/l10n/es_PY.json
index f2f42dcefef..f86304753b3 100644
--- a/apps/workflowengine/l10n/es_PY.json
+++ b/apps/workflowengine/l10n/es_PY.json
@@ -57,5 +57,5 @@
     "User group membership" : "Membresia al grupo de usuarios",
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/apps/workflowengine/l10n/es_SV.js b/apps/workflowengine/l10n/es_SV.js
index 1fb9cc0968e..213682ef075 100644
--- a/apps/workflowengine/l10n/es_SV.js
+++ b/apps/workflowengine/l10n/es_SV.js
@@ -60,4 +60,4 @@ OC.L10N.register(
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
 },
-"nplurals=2; plural=(n != 1);");
+"nplurals=2; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/workflowengine/l10n/es_SV.json b/apps/workflowengine/l10n/es_SV.json
index f2f42dcefef..8f5f607dfe6 100644
--- a/apps/workflowengine/l10n/es_SV.json
+++ b/apps/workflowengine/l10n/es_SV.json
@@ -57,5 +57,5 @@
     "User group membership" : "Membresia al grupo de usuarios",
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
+},"pluralForm" :"nplurals=2; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/apps/workflowengine/l10n/es_UY.js b/apps/workflowengine/l10n/es_UY.js
index 1fb9cc0968e..69840e65583 100644
--- a/apps/workflowengine/l10n/es_UY.js
+++ b/apps/workflowengine/l10n/es_UY.js
@@ -60,4 +60,4 @@ OC.L10N.register(
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
 },
-"nplurals=2; plural=(n != 1);");
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/workflowengine/l10n/es_UY.json b/apps/workflowengine/l10n/es_UY.json
index f2f42dcefef..f86304753b3 100644
--- a/apps/workflowengine/l10n/es_UY.json
+++ b/apps/workflowengine/l10n/es_UY.json
@@ -57,5 +57,5 @@
     "User group membership" : "Membresia al grupo de usuarios",
     "is member of" : "es miembro de",
     "is not member of" : "no es miembro de"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/apps/workflowengine/l10n/fr.js b/apps/workflowengine/l10n/fr.js
index 0b1c7bab1c1..aa6eddbe531 100644
--- a/apps/workflowengine/l10n/fr.js
+++ b/apps/workflowengine/l10n/fr.js
@@ -116,4 +116,4 @@ OC.L10N.register(
     "is member of" : "est membre de",
     "is not member of" : "n'est pas membre de"
 },
-"nplurals=2; plural=(n > 1);");
+"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/workflowengine/l10n/fr.json b/apps/workflowengine/l10n/fr.json
index 667b142f869..45cafd242e2 100644
--- a/apps/workflowengine/l10n/fr.json
+++ b/apps/workflowengine/l10n/fr.json
@@ -113,5 +113,5 @@
     "User group membership" : "Membre du groupe d'utilisateur",
     "is member of" : "est membre de",
     "is not member of" : "n'est pas membre de"
-},"pluralForm" :"nplurals=2; plural=(n > 1);"
+},"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/apps/workflowengine/l10n/it.js b/apps/workflowengine/l10n/it.js
index 402258b889e..69d4453b3e3 100644
--- a/apps/workflowengine/l10n/it.js
+++ b/apps/workflowengine/l10n/it.js
@@ -116,4 +116,4 @@ OC.L10N.register(
     "is member of" : "è membro di",
     "is not member of" : "non è membro di"
 },
-"nplurals=2; plural=(n != 1);");
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/workflowengine/l10n/it.json b/apps/workflowengine/l10n/it.json
index 267c5fa12ed..e67b301d69e 100644
--- a/apps/workflowengine/l10n/it.json
+++ b/apps/workflowengine/l10n/it.json
@@ -113,5 +113,5 @@
     "User group membership" : "Appartenenza ai gruppi degli utenti",
     "is member of" : "è membro di",
     "is not member of" : "non è membro di"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/apps/workflowengine/l10n/pl.js b/apps/workflowengine/l10n/pl.js
index 26b4de571fe..6f085b974ce 100644
--- a/apps/workflowengine/l10n/pl.js
+++ b/apps/workflowengine/l10n/pl.js
@@ -83,7 +83,7 @@ OC.L10N.register(
     "Available flows" : "Dostępne przepływy",
     "For details on how to write your own flow, check out the development documentation." : "Aby uzyskać szczegółowe informacje na temat pisania własnego przepływu, zapoznaj się z dokumentacją programistyczną.",
     "More flows" : "Więcej przepływów",
-    "Browse the App Store" : "Przeglądaj sklep z aplikacjami",
+    "Browse the App Store" : "Przeglądaj Nextcloud App Store",
     "Show less" : "Pokaż mniej",
     "Show more" : "Pokaż więcej",
     "Configured flows" : "Skonfigurowane przepływy",
diff --git a/apps/workflowengine/l10n/pl.json b/apps/workflowengine/l10n/pl.json
index 6ace0f93395..0921cbad163 100644
--- a/apps/workflowengine/l10n/pl.json
+++ b/apps/workflowengine/l10n/pl.json
@@ -81,7 +81,7 @@
     "Available flows" : "Dostępne przepływy",
     "For details on how to write your own flow, check out the development documentation." : "Aby uzyskać szczegółowe informacje na temat pisania własnego przepływu, zapoznaj się z dokumentacją programistyczną.",
     "More flows" : "Więcej przepływów",
-    "Browse the App Store" : "Przeglądaj sklep z aplikacjami",
+    "Browse the App Store" : "Przeglądaj Nextcloud App Store",
     "Show less" : "Pokaż mniej",
     "Show more" : "Pokaż więcej",
     "Configured flows" : "Skonfigurowane przepływy",
diff --git a/apps/workflowengine/l10n/pt_BR.js b/apps/workflowengine/l10n/pt_BR.js
index 85c1cf88f34..58614061b6b 100644
--- a/apps/workflowengine/l10n/pt_BR.js
+++ b/apps/workflowengine/l10n/pt_BR.js
@@ -116,4 +116,4 @@ OC.L10N.register(
     "is member of" : "é membro de",
     "is not member of" : "não é membro de"
 },
-"nplurals=2; plural=(n > 1);");
+"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/workflowengine/l10n/pt_BR.json b/apps/workflowengine/l10n/pt_BR.json
index a715b6628c6..7f71f9580fb 100644
--- a/apps/workflowengine/l10n/pt_BR.json
+++ b/apps/workflowengine/l10n/pt_BR.json
@@ -113,5 +113,5 @@
     "User group membership" : "Usuário em grupo",
     "is member of" : "é membro de",
     "is not member of" : "não é membro de"
-},"pluralForm" :"nplurals=2; plural=(n > 1);"
+},"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/apps/workflowengine/l10n/pt_PT.js b/apps/workflowengine/l10n/pt_PT.js
index 40385aa33a6..7fbb68293e1 100644
--- a/apps/workflowengine/l10n/pt_PT.js
+++ b/apps/workflowengine/l10n/pt_PT.js
@@ -67,4 +67,4 @@ OC.L10N.register(
     "between" : "entre",
     "Request user agent" : "Solicitar agente de utilizador"
 },
-"nplurals=2; plural=(n != 1);");
+"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/workflowengine/l10n/pt_PT.json b/apps/workflowengine/l10n/pt_PT.json
index 05fab60a515..e7a08f10a22 100644
--- a/apps/workflowengine/l10n/pt_PT.json
+++ b/apps/workflowengine/l10n/pt_PT.json
@@ -64,5 +64,5 @@
     "Request URL" : "Solicitar URL",
     "between" : "entre",
     "Request user agent" : "Solicitar agente de utilizador"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
+},"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/apps/workflowengine/lib/Settings/ASettings.php b/apps/workflowengine/lib/Settings/ASettings.php
index d35524727a8..f3cb8d76bba 100644
--- a/apps/workflowengine/lib/Settings/ASettings.php
+++ b/apps/workflowengine/lib/Settings/ASettings.php
@@ -37,6 +37,7 @@ use OCP\AppFramework\Services\IInitialState;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IConfig;
 use OCP\IL10N;
+use OCP\IURLGenerator;
 use OCP\Settings\ISettings;
 use OCP\WorkflowEngine\Events\LoadSettingsScriptsEvent;
 use OCP\WorkflowEngine\ICheck;
@@ -47,23 +48,13 @@ use OCP\WorkflowEngine\IOperation;
 use OCP\WorkflowEngine\ISpecificOperation;
 
 abstract class ASettings implements ISettings {
-	/** @var IL10N */
-	private $l10n;
-
-	/** @var string */
-	private $appName;
-
-	/** @var IEventDispatcher */
-	private $eventDispatcher;
-
-	/** @var Manager */
-	protected $manager;
-
-	/** @var IInitialState */
-	private $initialStateService;
-
-	/** @var IConfig */
-	private $config;
+	private IL10N $l10n;
+	private string $appName;
+	private IEventDispatcher $eventDispatcher;
+	protected Manager $manager;
+	private IInitialState $initialStateService;
+	private IConfig $config;
+	private IURLGenerator $urlGenerator;
 
 	public function __construct(
 		string $appName,
@@ -71,7 +62,8 @@ abstract class ASettings implements ISettings {
 		IEventDispatcher $eventDispatcher,
 		Manager $manager,
 		IInitialState $initialStateService,
-		IConfig $config
+		IConfig $config,
+		IURLGenerator $urlGenerator
 	) {
 		$this->appName = $appName;
 		$this->l10n = $l;
@@ -79,6 +71,7 @@ abstract class ASettings implements ISettings {
 		$this->manager = $manager;
 		$this->initialStateService = $initialStateService;
 		$this->config = $config;
+		$this->urlGenerator = $urlGenerator;
 	}
 
 	abstract public function getScope(): int;
@@ -122,6 +115,11 @@ abstract class ASettings implements ISettings {
 			$this->config->getSystemValueBool('appstoreenabled', true)
 		);
 
+		$this->initialStateService->provideInitialState(
+			'doc-url',
+			$this->urlGenerator->linkToDocs('admin-workflowengine')
+		);
+
 		return new TemplateResponse(Application::APP_ID, 'settings', [], 'blank');
 	}
 
diff --git a/apps/workflowengine/src/components/Event.vue b/apps/workflowengine/src/components/Event.vue
index 97f24af22f3..5f4b8dd87b0 100644
--- a/apps/workflowengine/src/components/Event.vue
+++ b/apps/workflowengine/src/components/Event.vue
@@ -111,7 +111,7 @@ export default {
 	}
 
 	.multiselect:not(.multiselect--disabled)::v-deep .multiselect__tags .multiselect__single {
-		background-image: var(--icon-triangle-s-000);
+		background-image: var(--icon-triangle-s-dark);
 		background-repeat: no-repeat;
 		background-position: right center;
 	}
diff --git a/apps/workflowengine/src/components/Workflow.vue b/apps/workflowengine/src/components/Workflow.vue
index 9cdbf34018d..f81a53563b5 100644
--- a/apps/workflowengine/src/components/Workflow.vue
+++ b/apps/workflowengine/src/components/Workflow.vue
@@ -1,7 +1,7 @@
 <template>
 	<div id="workflowengine">
-		<div class="section">
-			<h2>{{ t('workflowengine', 'Available flows') }}</h2>
+		<SettingsSection :title="t('workflowengine', 'Available flows')"
+			:doc-url="workflowDocUrl">
 
 			<p v-if="scope === 0" class="settings-hint">
 				<a href="https://nextcloud.com/developer/">{{ t('workflowengine', 'For details on how to write your own flow, check out the development documentation.') }}</a>
@@ -26,11 +26,13 @@
 			</transition-group>
 
 			<div v-if="hasMoreOperations" class="actions__more">
-				<button class="icon"
-					:class="showMoreOperations ? 'icon-triangle-n' : 'icon-triangle-s'"
-					@click="showMoreOperations=!showMoreOperations">
+				<Button @click="showMoreOperations = !showMoreOperations">
+					<template #icon>
+						<MenuUp v-if="showMoreOperations" :size="20" />
+						<MenuDown v-else :size="20" />
+					</template>
 					{{ showMoreOperations ? t('workflowengine', 'Show less') : t('workflowengine', 'Show more') }}
-				</button>
+				</Button>
 			</div>
 
 			<h2 v-if="scope === 0" class="configured-flows">
@@ -39,7 +41,7 @@
 			<h2 v-else class="configured-flows">
 				{{ t('workflowengine', 'Your flows') }}
 			</h2>
-		</div>
+		</SettingsSection>
 
 		<transition-group v-if="rules.length > 0" name="slide">
 			<Rule v-for="rule in rules" :key="rule.id" :rule="rule" />
@@ -50,21 +52,31 @@
 <script>
 import Rule from './Rule'
 import Operation from './Operation'
+import SettingsSection from '@nextcloud/vue/dist/Components/SettingsSection'
+import Button from '@nextcloud/vue/dist/Components/Button'
 import { mapGetters, mapState } from 'vuex'
 import { generateUrl } from '@nextcloud/router'
+import { loadState } from '@nextcloud/initial-state'
+import MenuUp from 'vue-material-design-icons/MenuUp'
+import MenuDown from 'vue-material-design-icons/MenuDown'
 
 const ACTION_LIMIT = 3
 
 export default {
 	name: 'Workflow',
 	components: {
+		Button,
+		MenuDown,
+		MenuUp,
 		Operation,
 		Rule,
+		SettingsSection,
 	},
 	data() {
 		return {
 			showMoreOperations: false,
 			appstoreUrl: generateUrl('settings/apps/workflow'),
+			workflowDocUrl: loadState('workflowengine', 'doc-url'),
 		}
 	},
 	computed: {
@@ -121,10 +133,8 @@ export default {
 			flex-basis: 250px;
 		}
 	}
-
-	button.icon {
-		padding-left: 32px;
-		background-position: 10px center;
+	.actions__more {
+		margin-bottom: 10px;
 	}
 
 	.slide-enter-active {