121 files changed, 143 insertions, 865 deletions
diff --git a/apps/files_versions/appinfo/routes.php b/apps/files_versions/appinfo/routes.php
index 11b5e0c783f..22ded5e8723 100644
--- a/apps/files_versions/appinfo/routes.php
+++ b/apps/files_versions/appinfo/routes.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
diff --git a/apps/files_versions/l10n/af.js b/apps/files_versions/l10n/af.js
deleted file mode 100644
index 7986f018877..00000000000
--- a/apps/files_versions/l10n/af.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Weergawes",
-    "Failed to revert {file} to revision {timestamp}." : "Kon nie {file} na {timestamp} se hersiening terugstel nie.",
-    "_%n byte_::_%n bytes_" : ["%n greep","%n grepe"],
-    "Restore" : "Herstel"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/af.json b/apps/files_versions/l10n/af.json
deleted file mode 100644
index 23f30920b9e..00000000000
--- a/apps/files_versions/l10n/af.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Versions" : "Weergawes",
-    "Failed to revert {file} to revision {timestamp}." : "Kon nie {file} na {timestamp} se hersiening terugstel nie.",
-    "_%n byte_::_%n bytes_" : ["%n greep","%n grepe"],
-    "Restore" : "Herstel"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/az.js b/apps/files_versions/l10n/az.js
deleted file mode 100644
index 34c9ddf1c9b..00000000000
--- a/apps/files_versions/l10n/az.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Versiyaları",
-    "Failed to revert {file} to revision {timestamp}." : "{timestamp} yenidən baxılması üçün {file} geri qaytarmaq mümkün olmadı.",
-    "Restore" : "Geri qaytar",
-    "No other versions available" : "Başqa versiyalar mövcud deyil"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/az.json b/apps/files_versions/l10n/az.json
deleted file mode 100644
index dd67d6ca403..00000000000
--- a/apps/files_versions/l10n/az.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Versions" : "Versiyaları",
-    "Failed to revert {file} to revision {timestamp}." : "{timestamp} yenidən baxılması üçün {file} geri qaytarmaq mümkün olmadı.",
-    "Restore" : "Geri qaytar",
-    "No other versions available" : "Başqa versiyalar mövcud deyil"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/bn_BD.js b/apps/files_versions/l10n/bn_BD.js
deleted file mode 100644
index 4466198c4f3..00000000000
--- a/apps/files_versions/l10n/bn_BD.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "সংষ্করন",
-    "Failed to revert {file} to revision {timestamp}." : " {file} সংশোধিত  {timestamp} এ ফিরে যেতে ব্যার্থ হলো।",
-    "Restore" : "ফিরিয়ে দাও",
-    "No other versions available" : "আর কোন সংষ্করণ প্রাপ্তব্য নয়"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/bn_BD.json b/apps/files_versions/l10n/bn_BD.json
deleted file mode 100644
index 09ac6eae066..00000000000
--- a/apps/files_versions/l10n/bn_BD.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Versions" : "সংষ্করন",
-    "Failed to revert {file} to revision {timestamp}." : " {file} সংশোধিত  {timestamp} এ ফিরে যেতে ব্যার্থ হলো।",
-    "Restore" : "ফিরিয়ে দাও",
-    "No other versions available" : "আর কোন সংষ্করণ প্রাপ্তব্য নয়"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/br.js b/apps/files_versions/l10n/br.js
deleted file mode 100644
index 2b6cc838a27..00000000000
--- a/apps/files_versions/l10n/br.js
+++ /dev/null
@@ -1,13 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Stumm",
-    "This application automatically maintains older versions of files that are changed." : "Ar meziant-man a laosk en un doare otomatek stumm ar resrtoù kozh a vez cheñchet",
-    "Version" : "Stumm",
-    "This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user’s directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the user doesn’t run out of Quota because of versions.\n\t\tIn addition to the expiry of versions, the versions app makes certain never to use more than 50% of the user’s currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation." : "Ar meziant a dalc'h en un doare otomatek stummoù kozh ar restroù cheñchet. P'az eo aotreet, un teuliad koachet a vez roet e pep teuliad an implijour evit gwarn stummoù kozh ar restr. An implijer a c'hel adkemer ur stumm kozh n'eus forz peseurt amzer dre an etrefas web. Ar meziant a ra war dro teuliad ar stummoù evit bezhañ sur ez eus traouac'h a cQuota gant an implijer.\n\t\tOuzhpenn ar stumm diskarzed, stumm ar meziant a ra ma ne vefe ket implijet muioc'h eget 50% eus a plass vak an implijer. M'a vez dibaset e vo lemmet gant ar meziant ar stumm kozhañ da gentañ. Muioc'h  titouriù en dielvadur Versions. ",
-    "Failed to revert {file} to revision {timestamp}." : "C'hwitet m ar mon en dro {file} evit adober {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n okted","%n okted","%n okted","%n okted","%n octed"],
-    "Restore" : "Adkrouiñ",
-    "No other versions available" : "Stumm all ebet kavet"
-},
-"nplurals=5; plural=((n%10 == 1) && (n%100 != 11) && (n%100 !=71) && (n%100 !=91) ? 0 :(n%10 == 2) && (n%100 != 12) && (n%100 !=72) && (n%100 !=92) ? 1 :(n%10 ==3 || n%10==4 || n%10==9) && (n%100 < 10 || n% 100 > 19) && (n%100 < 70 || n%100 > 79) && (n%100 < 90 || n%100 > 99) ? 2 :(n != 0 && n % 1000000 == 0) ? 3 : 4);");
diff --git a/apps/files_versions/l10n/br.json b/apps/files_versions/l10n/br.json
deleted file mode 100644
index 5ebdc584bee..00000000000
--- a/apps/files_versions/l10n/br.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{ "translations": {
-    "Versions" : "Stumm",
-    "This application automatically maintains older versions of files that are changed." : "Ar meziant-man a laosk en un doare otomatek stumm ar resrtoù kozh a vez cheñchet",
-    "Version" : "Stumm",
-    "This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user’s directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the user doesn’t run out of Quota because of versions.\n\t\tIn addition to the expiry of versions, the versions app makes certain never to use more than 50% of the user’s currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation." : "Ar meziant a dalc'h en un doare otomatek stummoù kozh ar restroù cheñchet. P'az eo aotreet, un teuliad koachet a vez roet e pep teuliad an implijour evit gwarn stummoù kozh ar restr. An implijer a c'hel adkemer ur stumm kozh n'eus forz peseurt amzer dre an etrefas web. Ar meziant a ra war dro teuliad ar stummoù evit bezhañ sur ez eus traouac'h a cQuota gant an implijer.\n\t\tOuzhpenn ar stumm diskarzed, stumm ar meziant a ra ma ne vefe ket implijet muioc'h eget 50% eus a plass vak an implijer. M'a vez dibaset e vo lemmet gant ar meziant ar stumm kozhañ da gentañ. Muioc'h  titouriù en dielvadur Versions. ",
-    "Failed to revert {file} to revision {timestamp}." : "C'hwitet m ar mon en dro {file} evit adober {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n okted","%n okted","%n okted","%n okted","%n octed"],
-    "Restore" : "Adkrouiñ",
-    "No other versions available" : "Stumm all ebet kavet"
-},"pluralForm" :"nplurals=5; plural=((n%10 == 1) && (n%100 != 11) && (n%100 !=71) && (n%100 !=91) ? 0 :(n%10 == 2) && (n%100 != 12) && (n%100 !=72) && (n%100 !=92) ? 1 :(n%10 ==3 || n%10==4 || n%10==9) && (n%100 < 10 || n% 100 > 19) && (n%100 < 70 || n%100 > 79) && (n%100 < 90 || n%100 > 99) ? 2 :(n != 0 && n % 1000000 == 0) ? 3 : 4);"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/bs.js b/apps/files_versions/l10n/bs.js
deleted file mode 100644
index 2a971f48b21..00000000000
--- a/apps/files_versions/l10n/bs.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Verzije",
-    "Failed to revert {file} to revision {timestamp}." : "Nije uspelo vraćanje {file} na reviziju {timestamp}.",
-    "Restore" : "Obnovi",
-    "No other versions available" : "Druge verzije su nedostupne"
-},
-"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/files_versions/l10n/bs.json b/apps/files_versions/l10n/bs.json
deleted file mode 100644
index c4c20540e14..00000000000
--- a/apps/files_versions/l10n/bs.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Versions" : "Verzije",
-    "Failed to revert {file} to revision {timestamp}." : "Nije uspelo vraćanje {file} na reviziju {timestamp}.",
-    "Restore" : "Obnovi",
-    "No other versions available" : "Druge verzije su nedostupne"
-},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/cs.js b/apps/files_versions/l10n/cs.js
index 1cdc5564ede..b9192c54cf5 100644
--- a/apps/files_versions/l10n/cs.js
+++ b/apps/files_versions/l10n/cs.js
@@ -12,7 +12,7 @@ OC.L10N.register(
     "Edit version name" : "Upravit název verze",
     "Compare to current version" : "Porovnat se stávající verzí",
     "Restore version" : "Obnovit verzi",
-    "Download version" : "Stáhnout si verzi",
+    "Download version" : "Stáhnout verzi",
     "Delete version" : "Smazat verzi",
     "Cancel" : "Storno",
     "Remove version name" : "Odebrat název verze",
diff --git a/apps/files_versions/l10n/cs.json b/apps/files_versions/l10n/cs.json
index 1ef843d2b90..1d47a9c69dc 100644
--- a/apps/files_versions/l10n/cs.json
+++ b/apps/files_versions/l10n/cs.json
@@ -10,7 +10,7 @@
     "Edit version name" : "Upravit název verze",
     "Compare to current version" : "Porovnat se stávající verzí",
     "Restore version" : "Obnovit verzi",
-    "Download version" : "Stáhnout si verzi",
+    "Download version" : "Stáhnout verzi",
     "Delete version" : "Smazat verzi",
     "Cancel" : "Storno",
     "Remove version name" : "Odebrat název verze",
diff --git a/apps/files_versions/l10n/cy_GB.js b/apps/files_versions/l10n/cy_GB.js
deleted file mode 100644
index e5285e2e157..00000000000
--- a/apps/files_versions/l10n/cy_GB.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Restore" : "Adfer"
-},
-"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;");
diff --git a/apps/files_versions/l10n/cy_GB.json b/apps/files_versions/l10n/cy_GB.json
deleted file mode 100644
index 5ad23a5ac6f..00000000000
--- a/apps/files_versions/l10n/cy_GB.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Restore" : "Adfer"
-},"pluralForm" :"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/eo.js b/apps/files_versions/l10n/eo.js
deleted file mode 100644
index 90c2546c3c2..00000000000
--- a/apps/files_versions/l10n/eo.js
+++ /dev/null
@@ -1,13 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Versioj",
-    "This application automatically maintains older versions of files that are changed." : "Tiu ĉi aplikaĵo aŭtomate konservas antaŭajn versiojn de dosieroj, kiuj ŝanĝiĝis.",
-    "Version" : "Versio",
-    "This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user’s directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the user doesn’t run out of Quota because of versions.\n\t\tIn addition to the expiry of versions, the versions app makes certain never to use more than 50% of the user’s currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation." : "Tiu ĉi aplikaĵo aŭtomate konservas antaŭajn versiojn de dosieroj, kiuj ŝanĝiĝis. Kiam ĝi estas ebligita, kaŝita dosierujo por enteni versiojn kreiĝas en ĉiu uzantodosierujo kaj uziĝas por konservi la antaŭajn versiojn de dosieroj. Uzanto povas reveni al antaŭa versio pere de la TTT-a fasado iam ajn, kaj la anstataŭigita dosiero iĝas versio. La aplikaĵo aŭtomate observas la versian dosierujon por garantii, ke la uzanto ne transpasu sian kvoton pro troaj versioj.\n\t\tKrom la eksvalidiĝo de versioj, la aplikaĵo neniam uzas pli ol 50 % de la aktuala libera spaco de la uzanto. Se la konservitaj versioj transpasos tiun limon, la aplikaĵo forigos la plej antaŭajn versiojn ĝis atingo de la limo. Pliaj informoj disponeblas en la dokumentaro pri Versioj.",
-    "Failed to revert {file} to revision {timestamp}." : "Malsukcesis remeti {file} al la revizio {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n bajto","%n bajtoj"],
-    "Restore" : "Restaŭri",
-    "No other versions available" : "Neniu alia versio disponeblas"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/eo.json b/apps/files_versions/l10n/eo.json
deleted file mode 100644
index 8a76db600d7..00000000000
--- a/apps/files_versions/l10n/eo.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{ "translations": {
-    "Versions" : "Versioj",
-    "This application automatically maintains older versions of files that are changed." : "Tiu ĉi aplikaĵo aŭtomate konservas antaŭajn versiojn de dosieroj, kiuj ŝanĝiĝis.",
-    "Version" : "Versio",
-    "This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user’s directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the user doesn’t run out of Quota because of versions.\n\t\tIn addition to the expiry of versions, the versions app makes certain never to use more than 50% of the user’s currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation." : "Tiu ĉi aplikaĵo aŭtomate konservas antaŭajn versiojn de dosieroj, kiuj ŝanĝiĝis. Kiam ĝi estas ebligita, kaŝita dosierujo por enteni versiojn kreiĝas en ĉiu uzantodosierujo kaj uziĝas por konservi la antaŭajn versiojn de dosieroj. Uzanto povas reveni al antaŭa versio pere de la TTT-a fasado iam ajn, kaj la anstataŭigita dosiero iĝas versio. La aplikaĵo aŭtomate observas la versian dosierujon por garantii, ke la uzanto ne transpasu sian kvoton pro troaj versioj.\n\t\tKrom la eksvalidiĝo de versioj, la aplikaĵo neniam uzas pli ol 50 % de la aktuala libera spaco de la uzanto. Se la konservitaj versioj transpasos tiun limon, la aplikaĵo forigos la plej antaŭajn versiojn ĝis atingo de la limo. Pliaj informoj disponeblas en la dokumentaro pri Versioj.",
-    "Failed to revert {file} to revision {timestamp}." : "Malsukcesis remeti {file} al la revizio {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n bajto","%n bajtoj"],
-    "Restore" : "Restaŭri",
-    "No other versions available" : "Neniu alia versio disponeblas"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/es_419.js b/apps/files_versions/l10n/es_419.js
deleted file mode 100644
index 5d974ef3480..00000000000
--- a/apps/files_versions/l10n/es_419.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Versiones",
-    "Failed to revert {file} to revision {timestamp}." : "Falla al revertir {file} a revisión {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
-    "Restore" : "Restaurar"
-},
-"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/files_versions/l10n/es_419.json b/apps/files_versions/l10n/es_419.json
deleted file mode 100644
index 4348982b777..00000000000
--- a/apps/files_versions/l10n/es_419.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Versions" : "Versiones",
-    "Failed to revert {file} to revision {timestamp}." : "Falla al revertir {file} a revisión {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
-    "Restore" : "Restaurar"
-},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/es_AR.js b/apps/files_versions/l10n/es_AR.js
deleted file mode 100644
index 4f6573a0e18..00000000000
--- a/apps/files_versions/l10n/es_AR.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Versiones",
-    "Failed to revert {file} to revision {timestamp}." : "Falla al revertir {archivo} a revisión {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
-    "Restore" : "Restaurar",
-    "No other versions available" : "No hay más versiones disponibles"
-},
-"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/files_versions/l10n/es_AR.json b/apps/files_versions/l10n/es_AR.json
deleted file mode 100644
index b00cf1b0550..00000000000
--- a/apps/files_versions/l10n/es_AR.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
-    "Versions" : "Versiones",
-    "Failed to revert {file} to revision {timestamp}." : "Falla al revertir {archivo} a revisión {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
-    "Restore" : "Restaurar",
-    "No other versions available" : "No hay más versiones disponibles"
-},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/es_CL.js b/apps/files_versions/l10n/es_CL.js
deleted file mode 100644
index 5d974ef3480..00000000000
--- a/apps/files_versions/l10n/es_CL.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Versiones",
-    "Failed to revert {file} to revision {timestamp}." : "Falla al revertir {file} a revisión {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
-    "Restore" : "Restaurar"
-},
-"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/files_versions/l10n/es_CL.json b/apps/files_versions/l10n/es_CL.json
deleted file mode 100644
index 4348982b777..00000000000
--- a/apps/files_versions/l10n/es_CL.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Versions" : "Versiones",
-    "Failed to revert {file} to revision {timestamp}." : "Falla al revertir {file} a revisión {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
-    "Restore" : "Restaurar"
-},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/es_CO.js b/apps/files_versions/l10n/es_CO.js
deleted file mode 100644
index 5d974ef3480..00000000000
--- a/apps/files_versions/l10n/es_CO.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Versiones",
-    "Failed to revert {file} to revision {timestamp}." : "Falla al revertir {file} a revisión {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
-    "Restore" : "Restaurar"
-},
-"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/files_versions/l10n/es_CO.json b/apps/files_versions/l10n/es_CO.json
deleted file mode 100644
index 4348982b777..00000000000
--- a/apps/files_versions/l10n/es_CO.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Versions" : "Versiones",
-    "Failed to revert {file} to revision {timestamp}." : "Falla al revertir {file} a revisión {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
-    "Restore" : "Restaurar"
-},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/es_CR.js b/apps/files_versions/l10n/es_CR.js
deleted file mode 100644
index 5d974ef3480..00000000000
--- a/apps/files_versions/l10n/es_CR.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Versiones",
-    "Failed to revert {file} to revision {timestamp}." : "Falla al revertir {file} a revisión {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
-    "Restore" : "Restaurar"
-},
-"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/files_versions/l10n/es_CR.json b/apps/files_versions/l10n/es_CR.json
deleted file mode 100644
index 4348982b777..00000000000
--- a/apps/files_versions/l10n/es_CR.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Versions" : "Versiones",
-    "Failed to revert {file} to revision {timestamp}." : "Falla al revertir {file} a revisión {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
-    "Restore" : "Restaurar"
-},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/es_DO.js b/apps/files_versions/l10n/es_DO.js
deleted file mode 100644
index 5d974ef3480..00000000000
--- a/apps/files_versions/l10n/es_DO.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Versiones",
-    "Failed to revert {file} to revision {timestamp}." : "Falla al revertir {file} a revisión {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
-    "Restore" : "Restaurar"
-},
-"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/files_versions/l10n/es_DO.json b/apps/files_versions/l10n/es_DO.json
deleted file mode 100644
index 4348982b777..00000000000
--- a/apps/files_versions/l10n/es_DO.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Versions" : "Versiones",
-    "Failed to revert {file} to revision {timestamp}." : "Falla al revertir {file} a revisión {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
-    "Restore" : "Restaurar"
-},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/es_GT.js b/apps/files_versions/l10n/es_GT.js
deleted file mode 100644
index 5d974ef3480..00000000000
--- a/apps/files_versions/l10n/es_GT.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Versiones",
-    "Failed to revert {file} to revision {timestamp}." : "Falla al revertir {file} a revisión {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
-    "Restore" : "Restaurar"
-},
-"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/files_versions/l10n/es_GT.json b/apps/files_versions/l10n/es_GT.json
deleted file mode 100644
index 4348982b777..00000000000
--- a/apps/files_versions/l10n/es_GT.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Versions" : "Versiones",
-    "Failed to revert {file} to revision {timestamp}." : "Falla al revertir {file} a revisión {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
-    "Restore" : "Restaurar"
-},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/es_HN.js b/apps/files_versions/l10n/es_HN.js
deleted file mode 100644
index 5d974ef3480..00000000000
--- a/apps/files_versions/l10n/es_HN.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Versiones",
-    "Failed to revert {file} to revision {timestamp}." : "Falla al revertir {file} a revisión {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
-    "Restore" : "Restaurar"
-},
-"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/files_versions/l10n/es_HN.json b/apps/files_versions/l10n/es_HN.json
deleted file mode 100644
index 4348982b777..00000000000
--- a/apps/files_versions/l10n/es_HN.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Versions" : "Versiones",
-    "Failed to revert {file} to revision {timestamp}." : "Falla al revertir {file} a revisión {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
-    "Restore" : "Restaurar"
-},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/es_NI.js b/apps/files_versions/l10n/es_NI.js
deleted file mode 100644
index 5d974ef3480..00000000000
--- a/apps/files_versions/l10n/es_NI.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Versiones",
-    "Failed to revert {file} to revision {timestamp}." : "Falla al revertir {file} a revisión {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
-    "Restore" : "Restaurar"
-},
-"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/files_versions/l10n/es_NI.json b/apps/files_versions/l10n/es_NI.json
deleted file mode 100644
index 4348982b777..00000000000
--- a/apps/files_versions/l10n/es_NI.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Versions" : "Versiones",
-    "Failed to revert {file} to revision {timestamp}." : "Falla al revertir {file} a revisión {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
-    "Restore" : "Restaurar"
-},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/es_PA.js b/apps/files_versions/l10n/es_PA.js
deleted file mode 100644
index 5d974ef3480..00000000000
--- a/apps/files_versions/l10n/es_PA.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Versiones",
-    "Failed to revert {file} to revision {timestamp}." : "Falla al revertir {file} a revisión {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
-    "Restore" : "Restaurar"
-},
-"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/files_versions/l10n/es_PA.json b/apps/files_versions/l10n/es_PA.json
deleted file mode 100644
index 4348982b777..00000000000
--- a/apps/files_versions/l10n/es_PA.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Versions" : "Versiones",
-    "Failed to revert {file} to revision {timestamp}." : "Falla al revertir {file} a revisión {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
-    "Restore" : "Restaurar"
-},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/es_PE.js b/apps/files_versions/l10n/es_PE.js
deleted file mode 100644
index 5d974ef3480..00000000000
--- a/apps/files_versions/l10n/es_PE.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Versiones",
-    "Failed to revert {file} to revision {timestamp}." : "Falla al revertir {file} a revisión {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
-    "Restore" : "Restaurar"
-},
-"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/files_versions/l10n/es_PE.json b/apps/files_versions/l10n/es_PE.json
deleted file mode 100644
index 4348982b777..00000000000
--- a/apps/files_versions/l10n/es_PE.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Versions" : "Versiones",
-    "Failed to revert {file} to revision {timestamp}." : "Falla al revertir {file} a revisión {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
-    "Restore" : "Restaurar"
-},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/es_PR.js b/apps/files_versions/l10n/es_PR.js
deleted file mode 100644
index 5d974ef3480..00000000000
--- a/apps/files_versions/l10n/es_PR.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Versiones",
-    "Failed to revert {file} to revision {timestamp}." : "Falla al revertir {file} a revisión {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
-    "Restore" : "Restaurar"
-},
-"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/files_versions/l10n/es_PR.json b/apps/files_versions/l10n/es_PR.json
deleted file mode 100644
index 4348982b777..00000000000
--- a/apps/files_versions/l10n/es_PR.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Versions" : "Versiones",
-    "Failed to revert {file} to revision {timestamp}." : "Falla al revertir {file} a revisión {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
-    "Restore" : "Restaurar"
-},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/es_PY.js b/apps/files_versions/l10n/es_PY.js
deleted file mode 100644
index 5d974ef3480..00000000000
--- a/apps/files_versions/l10n/es_PY.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Versiones",
-    "Failed to revert {file} to revision {timestamp}." : "Falla al revertir {file} a revisión {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
-    "Restore" : "Restaurar"
-},
-"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/files_versions/l10n/es_PY.json b/apps/files_versions/l10n/es_PY.json
deleted file mode 100644
index 4348982b777..00000000000
--- a/apps/files_versions/l10n/es_PY.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Versions" : "Versiones",
-    "Failed to revert {file} to revision {timestamp}." : "Falla al revertir {file} a revisión {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
-    "Restore" : "Restaurar"
-},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/es_SV.js b/apps/files_versions/l10n/es_SV.js
deleted file mode 100644
index 5d974ef3480..00000000000
--- a/apps/files_versions/l10n/es_SV.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Versiones",
-    "Failed to revert {file} to revision {timestamp}." : "Falla al revertir {file} a revisión {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
-    "Restore" : "Restaurar"
-},
-"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/files_versions/l10n/es_SV.json b/apps/files_versions/l10n/es_SV.json
deleted file mode 100644
index 4348982b777..00000000000
--- a/apps/files_versions/l10n/es_SV.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Versions" : "Versiones",
-    "Failed to revert {file} to revision {timestamp}." : "Falla al revertir {file} a revisión {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
-    "Restore" : "Restaurar"
-},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/es_UY.js b/apps/files_versions/l10n/es_UY.js
deleted file mode 100644
index 5d974ef3480..00000000000
--- a/apps/files_versions/l10n/es_UY.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Versiones",
-    "Failed to revert {file} to revision {timestamp}." : "Falla al revertir {file} a revisión {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
-    "Restore" : "Restaurar"
-},
-"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/files_versions/l10n/es_UY.json b/apps/files_versions/l10n/es_UY.json
deleted file mode 100644
index 4348982b777..00000000000
--- a/apps/files_versions/l10n/es_UY.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Versions" : "Versiones",
-    "Failed to revert {file} to revision {timestamp}." : "Falla al revertir {file} a revisión {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
-    "Restore" : "Restaurar"
-},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/fa.js b/apps/files_versions/l10n/fa.js
index c2bbbcd6487..6f50077efdc 100644
--- a/apps/files_versions/l10n/fa.js
+++ b/apps/files_versions/l10n/fa.js
@@ -4,6 +4,7 @@ OC.L10N.register(
     "Versions" : "نسخه ها",
     "This application automatically maintains older versions of files that are changed." : "این برنامه به طور خودکار نسخه های قدیمی تر پرونده های تغییر یافته را حفظ می کند.",
     "Current version" : "نسخه فعلی",
+    "You" : "You",
     "Name this version" : "Name this version",
     "Edit version name" : "Edit version name",
     "Compare to current version" : "Compare to current version",
diff --git a/apps/files_versions/l10n/fa.json b/apps/files_versions/l10n/fa.json
index a5afce9ed79..a96d8d4cd31 100644
--- a/apps/files_versions/l10n/fa.json
+++ b/apps/files_versions/l10n/fa.json
@@ -2,6 +2,7 @@
     "Versions" : "نسخه ها",
     "This application automatically maintains older versions of files that are changed." : "این برنامه به طور خودکار نسخه های قدیمی تر پرونده های تغییر یافته را حفظ می کند.",
     "Current version" : "نسخه فعلی",
+    "You" : "You",
     "Name this version" : "Name this version",
     "Edit version name" : "Edit version name",
     "Compare to current version" : "Compare to current version",
diff --git a/apps/files_versions/l10n/fr.js b/apps/files_versions/l10n/fr.js
index 34d2e110a98..88e5299734e 100644
--- a/apps/files_versions/l10n/fr.js
+++ b/apps/files_versions/l10n/fr.js
@@ -23,6 +23,7 @@ OC.L10N.register(
     "Version restored" : "Version restaurée",
     "Could not restore version" : "Impossible de restaurer la version",
     "Could not set version label" : "Impossible de définir l'étiquette de version",
-    "Could not delete version" : "Impossible de supprimer la version"
+    "Could not delete version" : "Impossible de supprimer la version",
+    "File versions" : "Versions des fichiers"
 },
 "nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/files_versions/l10n/fr.json b/apps/files_versions/l10n/fr.json
index 3e5343e93dc..e59d1f3e59c 100644
--- a/apps/files_versions/l10n/fr.json
+++ b/apps/files_versions/l10n/fr.json
@@ -21,6 +21,7 @@
     "Version restored" : "Version restaurée",
     "Could not restore version" : "Impossible de restaurer la version",
     "Could not set version label" : "Impossible de définir l'étiquette de version",
-    "Could not delete version" : "Impossible de supprimer la version"
+    "Could not delete version" : "Impossible de supprimer la version",
+    "File versions" : "Versions des fichiers"
 },"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/files_versions/l10n/he.js b/apps/files_versions/l10n/he.js
deleted file mode 100644
index edeac4bb278..00000000000
--- a/apps/files_versions/l10n/he.js
+++ /dev/null
@@ -1,13 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "גרסאות",
-    "This application automatically maintains older versions of files that are changed." : "יישומון זה שומר אוטומטית על גרסאות קודמות של קבצים שהשתנו.",
-    "Version" : "גרסה",
-    "This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user’s directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the user doesn’t run out of Quota because of versions.\n\t\tIn addition to the expiry of versions, the versions app makes certain never to use more than 50% of the user’s currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation." : "יישום זה מתחזק באופן אוטומטי גרסאות ישנות יותר של קבצים שמשתנים. כאשר היא מופעלת, תיקייה של גרסאות נסתרות מסופקת בספריה של כל משתמש, ומשמשת לאחסן גרסאות קבצים ישנות. משתמש יכול לחזור לגרסה ישנה יותר באמצעות ממשק האינטרנט בכל עת, כאשר הקובץ שהוחלף יהפוך לגרסה. האפליקציה מנהלת באופן אוטומטי את תיקיית הגרסאות כדי להבטיח שלמשתמש לא נגמר המכסה בגלל גרסאות.\nבנוסף לתום תפוגת הגרסאות, אפליקציית הגרסאות מקפידה שלא להשתמש ביותר מ -50% מהשטח הפנוי של המשתמש הזמין כרגע. אם גרסאות מאוחסנות חורגות ממגבלה זו, האפליקציה תמחק תחילה את הגרסאות העתיקות ביותר, עד שתעמוד במגבלה זו. מידע נוסף זמין בתיעוד ה-Versions.",
-    "Failed to revert {file} to revision {timestamp}." : "נכשל אחזור {file} לגרסה {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n בייט","%n בייטים","%n בייטים","%n בייטים"],
-    "Restore" : "שחזור",
-    "No other versions available" : "אין גרסאות אחרות זמינות"
-},
-"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;");
diff --git a/apps/files_versions/l10n/he.json b/apps/files_versions/l10n/he.json
deleted file mode 100644
index 91c9f75130d..00000000000
--- a/apps/files_versions/l10n/he.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{ "translations": {
-    "Versions" : "גרסאות",
-    "This application automatically maintains older versions of files that are changed." : "יישומון זה שומר אוטומטית על גרסאות קודמות של קבצים שהשתנו.",
-    "Version" : "גרסה",
-    "This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user’s directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the user doesn’t run out of Quota because of versions.\n\t\tIn addition to the expiry of versions, the versions app makes certain never to use more than 50% of the user’s currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation." : "יישום זה מתחזק באופן אוטומטי גרסאות ישנות יותר של קבצים שמשתנים. כאשר היא מופעלת, תיקייה של גרסאות נסתרות מסופקת בספריה של כל משתמש, ומשמשת לאחסן גרסאות קבצים ישנות. משתמש יכול לחזור לגרסה ישנה יותר באמצעות ממשק האינטרנט בכל עת, כאשר הקובץ שהוחלף יהפוך לגרסה. האפליקציה מנהלת באופן אוטומטי את תיקיית הגרסאות כדי להבטיח שלמשתמש לא נגמר המכסה בגלל גרסאות.\nבנוסף לתום תפוגת הגרסאות, אפליקציית הגרסאות מקפידה שלא להשתמש ביותר מ -50% מהשטח הפנוי של המשתמש הזמין כרגע. אם גרסאות מאוחסנות חורגות ממגבלה זו, האפליקציה תמחק תחילה את הגרסאות העתיקות ביותר, עד שתעמוד במגבלה זו. מידע נוסף זמין בתיעוד ה-Versions.",
-    "Failed to revert {file} to revision {timestamp}." : "נכשל אחזור {file} לגרסה {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n בייט","%n בייטים","%n בייטים","%n בייטים"],
-    "Restore" : "שחזור",
-    "No other versions available" : "אין גרסאות אחרות זמינות"
-},"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/hr.js b/apps/files_versions/l10n/hr.js
deleted file mode 100644
index a5a02529866..00000000000
--- a/apps/files_versions/l10n/hr.js
+++ /dev/null
@@ -1,13 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Inačice",
-    "This application automatically maintains older versions of files that are changed." : "Ova aplikacija automatski održava starije inačice datoteka koje su promijenjene.",
-    "Version" : "Inačica",
-    "This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user’s directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the user doesn’t run out of Quota because of versions.\n\t\tIn addition to the expiry of versions, the versions app makes certain never to use more than 50% of the user’s currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation." : "Ova aplikacija automatski održava starije inačice datoteka koje su promijenjene. Kad se omogući, u direktoriju svakog korisnika stvori se skrivena mapa s inačicama i koristi za pohranu starih inačica datoteka. Korisnik se u bilo kojem trenutku može vratiti na stariju inačicu putem web sučelja, a zamijenjena datoteka postaje inačica. Aplikacija automatski upravlja mapom s inačicama kako bi se osiguralo da korisnik ne ostane bez prostora zbog brojnih inačica.\n\t\tOsim isteka inačica, aplikacija za inačice pazi da nikada ne iskoristite više od 50 % trenutno dostupnog slobodnog prostora. Ako pohranjene inačice premaše ovo ograničenje, aplikacija će najprije izbrisati najstarije inačice tako da dosegne navedeno ograničenje. Više informacija dostupno je u dokumentaciji Inačice.",
-    "Failed to revert {file} to revision {timestamp}." : "Neuspješno vraćanje {file} na reviziju {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n bajt","%n bajtova","%n bajtova"],
-    "Restore" : "Vrati",
-    "No other versions available" : "Nema drugih inačica"
-},
-"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;");
diff --git a/apps/files_versions/l10n/hr.json b/apps/files_versions/l10n/hr.json
deleted file mode 100644
index 76607baf3e9..00000000000
--- a/apps/files_versions/l10n/hr.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{ "translations": {
-    "Versions" : "Inačice",
-    "This application automatically maintains older versions of files that are changed." : "Ova aplikacija automatski održava starije inačice datoteka koje su promijenjene.",
-    "Version" : "Inačica",
-    "This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user’s directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the user doesn’t run out of Quota because of versions.\n\t\tIn addition to the expiry of versions, the versions app makes certain never to use more than 50% of the user’s currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation." : "Ova aplikacija automatski održava starije inačice datoteka koje su promijenjene. Kad se omogući, u direktoriju svakog korisnika stvori se skrivena mapa s inačicama i koristi za pohranu starih inačica datoteka. Korisnik se u bilo kojem trenutku može vratiti na stariju inačicu putem web sučelja, a zamijenjena datoteka postaje inačica. Aplikacija automatski upravlja mapom s inačicama kako bi se osiguralo da korisnik ne ostane bez prostora zbog brojnih inačica.\n\t\tOsim isteka inačica, aplikacija za inačice pazi da nikada ne iskoristite više od 50 % trenutno dostupnog slobodnog prostora. Ako pohranjene inačice premaše ovo ograničenje, aplikacija će najprije izbrisati najstarije inačice tako da dosegne navedeno ograničenje. Više informacija dostupno je u dokumentaciji Inačice.",
-    "Failed to revert {file} to revision {timestamp}." : "Neuspješno vraćanje {file} na reviziju {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n bajt","%n bajtova","%n bajtova"],
-    "Restore" : "Vrati",
-    "No other versions available" : "Nema drugih inačica"
-},"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/hy.js b/apps/files_versions/l10n/hy.js
deleted file mode 100644
index d48487a9a84..00000000000
--- a/apps/files_versions/l10n/hy.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Տարբերակներ",
-    "Restore" : "Վերականգնել",
-    "No other versions available" : "Այլ տարբերակներ չկան"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/hy.json b/apps/files_versions/l10n/hy.json
deleted file mode 100644
index 579b9240310..00000000000
--- a/apps/files_versions/l10n/hy.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "Versions" : "Տարբերակներ",
-    "Restore" : "Վերականգնել",
-    "No other versions available" : "Այլ տարբերակներ չկան"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/ia.js b/apps/files_versions/l10n/ia.js
deleted file mode 100644
index 46aa143e4a7..00000000000
--- a/apps/files_versions/l10n/ia.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Versiones",
-    "Failed to revert {file} to revision {timestamp}." : "Il falleva a reverter {file} a revision {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
-    "Restore" : "Restaurar",
-    "No other versions available" : "Nulle altere versiones disponibile"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/ia.json b/apps/files_versions/l10n/ia.json
deleted file mode 100644
index 10c18bab080..00000000000
--- a/apps/files_versions/l10n/ia.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
-    "Versions" : "Versiones",
-    "Failed to revert {file} to revision {timestamp}." : "Il falleva a reverter {file} a revision {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
-    "Restore" : "Restaurar",
-    "No other versions available" : "Nulle altere versiones disponibile"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/id.js b/apps/files_versions/l10n/id.js
deleted file mode 100644
index 35ad4ded36e..00000000000
--- a/apps/files_versions/l10n/id.js
+++ /dev/null
@@ -1,13 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Versi",
-    "This application automatically maintains older versions of files that are changed." : "Aplikasi ini secara otomatis memelihara versi-versi sebelumnya dari berkas yang telah diubah.",
-    "Version" : "Versi",
-    "This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user’s directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the user doesn’t run out of Quota because of versions.\n\t\tIn addition to the expiry of versions, the versions app makes certain never to use more than 50% of the user’s currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation." : "Aplikasi ini secara otomatis memelihara versi-versi sebelumnya dari berkas yang telah diubah. Saat diaktifkan, suatu folder tersembunyi akan dibuat pada semua direktori pengguna, dan digunakan sebagai wadah penyimpanan versi-versi berkas. Secara otomatis akan mengelola folder versi-versi untuk memastikan pengguna tidak kehabisan kuota dikarenakan versi yang ada.\n\t\tSebagai tambahan dari kedaluwarsa suatu versi, aplikasi ini memastikan tidak akan menggunakan kuota 50% lebih dari sisa kapasitas yang dimiliki oleh pengguna. Jika versi yang tersimpan melampaui batasan, maka versi tertua akan dihapus lebih dahulu sampai batasan kembali sesuai ketentuan. Informasi lebih lanjut mengenai Versi dapat dilihat pada dokumentasi",
-    "Failed to revert {file} to revision {timestamp}." : "Gagal mengembalikan {file} ke revisi {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n bytes"],
-    "Restore" : "Pulihkan",
-    "No other versions available" : "Tidak ada versi lain yang tersedia"
-},
-"nplurals=1; plural=0;");
diff --git a/apps/files_versions/l10n/id.json b/apps/files_versions/l10n/id.json
deleted file mode 100644
index 4b38ca58c70..00000000000
--- a/apps/files_versions/l10n/id.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{ "translations": {
-    "Versions" : "Versi",
-    "This application automatically maintains older versions of files that are changed." : "Aplikasi ini secara otomatis memelihara versi-versi sebelumnya dari berkas yang telah diubah.",
-    "Version" : "Versi",
-    "This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user’s directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the user doesn’t run out of Quota because of versions.\n\t\tIn addition to the expiry of versions, the versions app makes certain never to use more than 50% of the user’s currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation." : "Aplikasi ini secara otomatis memelihara versi-versi sebelumnya dari berkas yang telah diubah. Saat diaktifkan, suatu folder tersembunyi akan dibuat pada semua direktori pengguna, dan digunakan sebagai wadah penyimpanan versi-versi berkas. Secara otomatis akan mengelola folder versi-versi untuk memastikan pengguna tidak kehabisan kuota dikarenakan versi yang ada.\n\t\tSebagai tambahan dari kedaluwarsa suatu versi, aplikasi ini memastikan tidak akan menggunakan kuota 50% lebih dari sisa kapasitas yang dimiliki oleh pengguna. Jika versi yang tersimpan melampaui batasan, maka versi tertua akan dihapus lebih dahulu sampai batasan kembali sesuai ketentuan. Informasi lebih lanjut mengenai Versi dapat dilihat pada dokumentasi",
-    "Failed to revert {file} to revision {timestamp}." : "Gagal mengembalikan {file} ke revisi {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n bytes"],
-    "Restore" : "Pulihkan",
-    "No other versions available" : "Tidak ada versi lain yang tersedia"
-},"pluralForm" :"nplurals=1; plural=0;"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/ka_GE.js b/apps/files_versions/l10n/ka_GE.js
deleted file mode 100644
index 598dd4e40e3..00000000000
--- a/apps/files_versions/l10n/ka_GE.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "ვერსიები",
-    "Failed to revert {file} to revision {timestamp}." : "ფაილის {file} დაბრუნება რევიზიაზე {timestamp} ვერ ხერხდება.",
-    "_%n byte_::_%n bytes_" : ["%n ბაიტი","%n ბაიტი"],
-    "Restore" : "აღდგენა"
-},
-"nplurals=2; plural=(n!=1);");
diff --git a/apps/files_versions/l10n/ka_GE.json b/apps/files_versions/l10n/ka_GE.json
deleted file mode 100644
index 1b2607a309b..00000000000
--- a/apps/files_versions/l10n/ka_GE.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Versions" : "ვერსიები",
-    "Failed to revert {file} to revision {timestamp}." : "ფაილის {file} დაბრუნება რევიზიაზე {timestamp} ვერ ხერხდება.",
-    "_%n byte_::_%n bytes_" : ["%n ბაიტი","%n ბაიტი"],
-    "Restore" : "აღდგენა"
-},"pluralForm" :"nplurals=2; plural=(n!=1);"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/km.js b/apps/files_versions/l10n/km.js
deleted file mode 100644
index a459413b284..00000000000
--- a/apps/files_versions/l10n/km.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "កំណែ",
-    "Failed to revert {file} to revision {timestamp}." : "មិនអាចត្រឡប់ {file} ទៅកំណែសម្រួល {timestamp} បានទេ។",
-    "Restore" : "ស្ដារមកវិញ",
-    "No other versions available" : "មិនមានកំណែផ្សេងទៀតទេ"
-},
-"nplurals=1; plural=0;");
diff --git a/apps/files_versions/l10n/km.json b/apps/files_versions/l10n/km.json
deleted file mode 100644
index b2e34f4fb35..00000000000
--- a/apps/files_versions/l10n/km.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Versions" : "កំណែ",
-    "Failed to revert {file} to revision {timestamp}." : "មិនអាចត្រឡប់ {file} ទៅកំណែសម្រួល {timestamp} បានទេ។",
-    "Restore" : "ស្ដារមកវិញ",
-    "No other versions available" : "មិនមានកំណែផ្សេងទៀតទេ"
-},"pluralForm" :"nplurals=1; plural=0;"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/kn.js b/apps/files_versions/l10n/kn.js
deleted file mode 100644
index db64a419828..00000000000
--- a/apps/files_versions/l10n/kn.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "ಆವೃತ್ತಿಗಳು",
-    "Failed to revert {file} to revision {timestamp}." : "{timestamp} ದ ಪರಿಷ್ಕರಣೆ ಇಂದ  {file}  ಕಡತವನ್ನು ಹಿಂದಿರುಗಿಸಲು ವಿಫಲವಾಗಿದೆ.",
-    "Restore" : "ಮರುಸ್ಥಾಪಿಸು",
-    "No other versions available" : "ಇನ್ನಿತರೆ ಯಾವುದೇ ಆವೃತ್ತಿಗಳು ಲಭ್ಯವಿಲ್ಲ"
-},
-"nplurals=2; plural=(n > 1);");
diff --git a/apps/files_versions/l10n/kn.json b/apps/files_versions/l10n/kn.json
deleted file mode 100644
index d7226c306eb..00000000000
--- a/apps/files_versions/l10n/kn.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Versions" : "ಆವೃತ್ತಿಗಳು",
-    "Failed to revert {file} to revision {timestamp}." : "{timestamp} ದ ಪರಿಷ್ಕರಣೆ ಇಂದ  {file}  ಕಡತವನ್ನು ಹಿಂದಿರುಗಿಸಲು ವಿಫಲವಾಗಿದೆ.",
-    "Restore" : "ಮರುಸ್ಥಾಪಿಸು",
-    "No other versions available" : "ಇನ್ನಿತರೆ ಯಾವುದೇ ಆವೃತ್ತಿಗಳು ಲಭ್ಯವಿಲ್ಲ"
-},"pluralForm" :"nplurals=2; plural=(n > 1);"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/lb.js b/apps/files_versions/l10n/lb.js
deleted file mode 100644
index d0339a4fd2a..00000000000
--- a/apps/files_versions/l10n/lb.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Versiounen",
-    "Failed to revert {file} to revision {timestamp}." : "Konnt {file} net op d'Versioun {timestamp} zrécksetzen.",
-    "_%n byte_::_%n bytes_" : ["%n Byte","%n Bytes"],
-    "Restore" : "Zrécksetzen",
-    "No other versions available" : "Keng aner Versiounen disponibel"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/lb.json b/apps/files_versions/l10n/lb.json
deleted file mode 100644
index 68b63f27485..00000000000
--- a/apps/files_versions/l10n/lb.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
-    "Versions" : "Versiounen",
-    "Failed to revert {file} to revision {timestamp}." : "Konnt {file} net op d'Versioun {timestamp} zrécksetzen.",
-    "_%n byte_::_%n bytes_" : ["%n Byte","%n Bytes"],
-    "Restore" : "Zrécksetzen",
-    "No other versions available" : "Keng aner Versiounen disponibel"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/lv.js b/apps/files_versions/l10n/lv.js
deleted file mode 100644
index 109c867101d..00000000000
--- a/apps/files_versions/l10n/lv.js
+++ /dev/null
@@ -1,12 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Versijas",
-    "This application automatically maintains older versions of files that are changed." : "Šī lietotne automātiski uztur vecākas versijas datnēm, kas tiek izmainītas.",
-    "Version" : "Versija",
-    "Failed to revert {file} to revision {timestamp}." : "Neizdevās atjaunot {file} no rediģējuma {timestamp} ",
-    "_%n byte_::_%n bytes_" : ["%n baiti","%n baiti","%n baiti"],
-    "Restore" : "Atjaunot",
-    "No other versions available" : "Citas versijas nav pieejamas"
-},
-"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
diff --git a/apps/files_versions/l10n/lv.json b/apps/files_versions/l10n/lv.json
deleted file mode 100644
index 46d90c62b7a..00000000000
--- a/apps/files_versions/l10n/lv.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{ "translations": {
-    "Versions" : "Versijas",
-    "This application automatically maintains older versions of files that are changed." : "Šī lietotne automātiski uztur vecākas versijas datnēm, kas tiek izmainītas.",
-    "Version" : "Versija",
-    "Failed to revert {file} to revision {timestamp}." : "Neizdevās atjaunot {file} no rediģējuma {timestamp} ",
-    "_%n byte_::_%n bytes_" : ["%n baiti","%n baiti","%n baiti"],
-    "Restore" : "Atjaunot",
-    "No other versions available" : "Citas versijas nav pieejamas"
-},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/ms_MY.js b/apps/files_versions/l10n/ms_MY.js
deleted file mode 100644
index 4ec22f9b141..00000000000
--- a/apps/files_versions/l10n/ms_MY.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Versi",
-    "Failed to revert {file} to revision {timestamp}." : "Gagal kembalikan {file} ke semakan {timestamp}.",
-    "Restore" : "Pulihkan",
-    "No other versions available" : "Tiada lagi versi lain"
-},
-"nplurals=1; plural=0;");
diff --git a/apps/files_versions/l10n/ms_MY.json b/apps/files_versions/l10n/ms_MY.json
deleted file mode 100644
index 7510c52ceb8..00000000000
--- a/apps/files_versions/l10n/ms_MY.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Versions" : "Versi",
-    "Failed to revert {file} to revision {timestamp}." : "Gagal kembalikan {file} ke semakan {timestamp}.",
-    "Restore" : "Pulihkan",
-    "No other versions available" : "Tiada lagi versi lain"
-},"pluralForm" :"nplurals=1; plural=0;"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/nl.js b/apps/files_versions/l10n/nl.js
index dba7e5bc48e..7500ff8b9f4 100644
--- a/apps/files_versions/l10n/nl.js
+++ b/apps/files_versions/l10n/nl.js
@@ -7,6 +7,7 @@ OC.L10N.register(
     "Current version" : "Huidige versie",
     "Initial version" : "Initiële versie",
     "You" : "Jij",
+    "Actions for version from {versionHumanExplicitDate}" : "Acties voor versie van {versionHumanExplicitDate}",
     "Name this version" : "Geef deze versie een naam",
     "Edit version name" : "Bewerk versie naam",
     "Compare to current version" : "Vergelijk met huidige versie",
@@ -22,6 +23,7 @@ OC.L10N.register(
     "Version restored" : "Versie hersteld",
     "Could not restore version" : "Kon versie niet herstellen",
     "Could not set version label" : "Kon versie label niet instellen",
-    "Could not delete version" : "Kon versie niet verwijderen"
+    "Could not delete version" : "Kon versie niet verwijderen",
+    "File versions" : "Bestandsversies"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/nl.json b/apps/files_versions/l10n/nl.json
index 425b5db0399..da0eb03c679 100644
--- a/apps/files_versions/l10n/nl.json
+++ b/apps/files_versions/l10n/nl.json
@@ -5,6 +5,7 @@
     "Current version" : "Huidige versie",
     "Initial version" : "Initiële versie",
     "You" : "Jij",
+    "Actions for version from {versionHumanExplicitDate}" : "Acties voor versie van {versionHumanExplicitDate}",
     "Name this version" : "Geef deze versie een naam",
     "Edit version name" : "Bewerk versie naam",
     "Compare to current version" : "Vergelijk met huidige versie",
@@ -20,6 +21,7 @@
     "Version restored" : "Versie hersteld",
     "Could not restore version" : "Kon versie niet herstellen",
     "Could not set version label" : "Kon versie label niet instellen",
-    "Could not delete version" : "Kon versie niet verwijderen"
+    "Could not delete version" : "Kon versie niet verwijderen",
+    "File versions" : "Bestandsversies"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
 \ No newline at end of file
diff --git a/apps/files_versions/l10n/nn_NO.js b/apps/files_versions/l10n/nn_NO.js
deleted file mode 100644
index 16ed15afe20..00000000000
--- a/apps/files_versions/l10n/nn_NO.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Utgåver",
-    "Failed to revert {file} to revision {timestamp}." : "Klarte ikkje å tilbakestilla {file} til utgåva {timestamp}.",
-    "Restore" : "Gjenopprett",
-    "No other versions available" : "Ingen andre utgåver tilgjengeleg"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/nn_NO.json b/apps/files_versions/l10n/nn_NO.json
deleted file mode 100644
index ea92d533333..00000000000
--- a/apps/files_versions/l10n/nn_NO.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Versions" : "Utgåver",
-    "Failed to revert {file} to revision {timestamp}." : "Klarte ikkje å tilbakestilla {file} til utgåva {timestamp}.",
-    "Restore" : "Gjenopprett",
-    "No other versions available" : "Ingen andre utgåver tilgjengeleg"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/oc.js b/apps/files_versions/l10n/oc.js
deleted file mode 100644
index c5f8550abe0..00000000000
--- a/apps/files_versions/l10n/oc.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Versions",
-    "_%n byte_::_%n bytes_" : ["%n octet","%n octets"],
-    "Restore" : "Restaurar",
-    "No other versions available" : "Cap d’autra version pas disponibla"
-},
-"nplurals=2; plural=(n > 1);");
diff --git a/apps/files_versions/l10n/oc.json b/apps/files_versions/l10n/oc.json
deleted file mode 100644
index af314939d07..00000000000
--- a/apps/files_versions/l10n/oc.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Versions" : "Versions",
-    "_%n byte_::_%n bytes_" : ["%n octet","%n octets"],
-    "Restore" : "Restaurar",
-    "No other versions available" : "Cap d’autra version pas disponibla"
-},"pluralForm" :"nplurals=2; plural=(n > 1);"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/pt_PT.js b/apps/files_versions/l10n/pt_PT.js
deleted file mode 100644
index 2af884961af..00000000000
--- a/apps/files_versions/l10n/pt_PT.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Versões",
-    "Failed to revert {file} to revision {timestamp}." : "Falhou a recuperação do ficheiro {file} para a revisão {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
-    "Restore" : "Restaurar",
-    "No other versions available" : "Nenhuma outra versão disponível"
-},
-"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/apps/files_versions/l10n/pt_PT.json b/apps/files_versions/l10n/pt_PT.json
deleted file mode 100644
index 94cafae4a6e..00000000000
--- a/apps/files_versions/l10n/pt_PT.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
-    "Versions" : "Versões",
-    "Failed to revert {file} to revision {timestamp}." : "Falhou a recuperação do ficheiro {file} para a revisão {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes","%n bytes"],
-    "Restore" : "Restaurar",
-    "No other versions available" : "Nenhuma outra versão disponível"
-},"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/files_versions/l10n/ro.js b/apps/files_versions/l10n/ro.js
deleted file mode 100644
index 55279ebf913..00000000000
--- a/apps/files_versions/l10n/ro.js
+++ /dev/null
@@ -1,13 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Versiuni",
-    "This application automatically maintains older versions of files that are changed." : "Această aplicație păștrează versiunile mai vechi a fișierelor care sunt schimbate.",
-    "Version" : "Versiune",
-    "This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user’s directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the user doesn’t run out of Quota because of versions.\n\t\tIn addition to the expiry of versions, the versions app makes certain never to use more than 50% of the user’s currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation." : "Această aplicație păștrează versiunile mai vechi a fișierelor care sunt schimbate.Când este activată un dosar ascuns este creeat în dosarul personal al fiecărui utilizator pentru a memora versiunile mai vechi. Un utilizator poate să revină la o versiune mai veche folosind interfața web  în orice moment, cu fișierul înlocuit devenind o versiune păstrată. Aplicația are grijă să nu rămână fără spațiu.\n\t\tDe asemenea aplicația are grijă să nu folosească mai mult de 50% din spațiul disponibil. Dacă veriunile vechi depășec această valoare atunci versiunile mai vechi vor fi șterse. Mai multe informații sunt disponibile în documentația aplicației Versiuni.",
-    "Failed to revert {file} to revision {timestamp}." : "S-a eșuat restaurarea fișierului  {file} la revizia {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n byți","%n byți"],
-    "Restore" : "Restaurare",
-    "No other versions available" : "Nu există alte versiuni disponibile"
-},
-"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));");
diff --git a/apps/files_versions/l10n/ro.json b/apps/files_versions/l10n/ro.json
deleted file mode 100644
index 87c70af4531..00000000000
--- a/apps/files_versions/l10n/ro.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{ "translations": {
-    "Versions" : "Versiuni",
-    "This application automatically maintains older versions of files that are changed." : "Această aplicație păștrează versiunile mai vechi a fișierelor care sunt schimbate.",
-    "Version" : "Versiune",
-    "This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user’s directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the user doesn’t run out of Quota because of versions.\n\t\tIn addition to the expiry of versions, the versions app makes certain never to use more than 50% of the user’s currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation." : "Această aplicație păștrează versiunile mai vechi a fișierelor care sunt schimbate.Când este activată un dosar ascuns este creeat în dosarul personal al fiecărui utilizator pentru a memora versiunile mai vechi. Un utilizator poate să revină la o versiune mai veche folosind interfața web  în orice moment, cu fișierul înlocuit devenind o versiune păstrată. Aplicația are grijă să nu rămână fără spațiu.\n\t\tDe asemenea aplicația are grijă să nu folosească mai mult de 50% din spațiul disponibil. Dacă veriunile vechi depășec această valoare atunci versiunile mai vechi vor fi șterse. Mai multe informații sunt disponibile în documentația aplicației Versiuni.",
-    "Failed to revert {file} to revision {timestamp}." : "S-a eșuat restaurarea fișierului  {file} la revizia {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n byte","%n byți","%n byți"],
-    "Restore" : "Restaurare",
-    "No other versions available" : "Nu există alte versiuni disponibile"
-},"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/ru.js b/apps/files_versions/l10n/ru.js
index a06b03e6126..9472af2f1a3 100644
--- a/apps/files_versions/l10n/ru.js
+++ b/apps/files_versions/l10n/ru.js
@@ -23,6 +23,7 @@ OC.L10N.register(
     "Version restored" : "Версия восстановлена",
     "Could not restore version" : "Не удалось восстановить версию",
     "Could not set version label" : "Не удалось установить метку версии",
-    "Could not delete version" : "Не удалось удалить версию"
+    "Could not delete version" : "Не удалось удалить версию",
+    "File versions" : "Версии файлов"
 },
 "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);");
diff --git a/apps/files_versions/l10n/ru.json b/apps/files_versions/l10n/ru.json
index 4df12d77afa..f0870081d62 100644
--- a/apps/files_versions/l10n/ru.json
+++ b/apps/files_versions/l10n/ru.json
@@ -21,6 +21,7 @@
     "Version restored" : "Версия восстановлена",
     "Could not restore version" : "Не удалось восстановить версию",
     "Could not set version label" : "Не удалось установить метку версии",
-    "Could not delete version" : "Не удалось удалить версию"
+    "Could not delete version" : "Не удалось удалить версию",
+    "File versions" : "Версии файлов"
 },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
 }
 \ No newline at end of file
diff --git a/apps/files_versions/l10n/sc.js b/apps/files_versions/l10n/sc.js
deleted file mode 100644
index 05799b22a12..00000000000
--- a/apps/files_versions/l10n/sc.js
+++ /dev/null
@@ -1,13 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Versiones",
-    "This application automatically maintains older versions of files that are changed." : "Custa aplicatzione allogat de manera automàtica is versiones prus bècias de documentos modificados.",
-    "Version" : "Versione",
-    "This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user’s directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the user doesn’t run out of Quota because of versions.\n\t\tIn addition to the expiry of versions, the versions app makes certain never to use more than 50% of the user’s currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation." : "Custa aplicatzione allogat in manera automàtica is versiones prus bècias de documentos modificados. Cando est ativa, frunit una cartella cuada de versiones in cada directory de s'utente e dda impreat pro allogare is versiones bècias de su documentu. S'utente podet semper torrare a una versione prus bècias cun s'interface de internet, e su documentu cambiadu benet a èssere una versione. S'aplicatzione gestit de manera automàtica is cartellas de versiones pro assegurare chi s'utente doesn’t run out of Quota because of versions.\n\t\t In prus de s'iscadèntzia de is versiones, s'aplicatzione assegurat de no impreare mai prus de su 50% de su logu lìberu a disponimentu de s'utente. Chi is versiones allogadas bàrigant custu lìmite, s'aplicatzione at a cantzellare innantis is versione prus bècias finas a lòmpere a su lìmite. Sunt disponìbiles prus informatziones in sa documentatzione de Versions.",
-    "Failed to revert {file} to revision {timestamp}." : "Non s'at pòdidu torrare a {documentu} pro sa revisione {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%nbyte","%n bytes"],
-    "Restore" : "Recùpera",
-    "No other versions available" : "Peruna àtera versione disponìbile"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/sc.json b/apps/files_versions/l10n/sc.json
deleted file mode 100644
index add70007130..00000000000
--- a/apps/files_versions/l10n/sc.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{ "translations": {
-    "Versions" : "Versiones",
-    "This application automatically maintains older versions of files that are changed." : "Custa aplicatzione allogat de manera automàtica is versiones prus bècias de documentos modificados.",
-    "Version" : "Versione",
-    "This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user’s directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the user doesn’t run out of Quota because of versions.\n\t\tIn addition to the expiry of versions, the versions app makes certain never to use more than 50% of the user’s currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation." : "Custa aplicatzione allogat in manera automàtica is versiones prus bècias de documentos modificados. Cando est ativa, frunit una cartella cuada de versiones in cada directory de s'utente e dda impreat pro allogare is versiones bècias de su documentu. S'utente podet semper torrare a una versione prus bècias cun s'interface de internet, e su documentu cambiadu benet a èssere una versione. S'aplicatzione gestit de manera automàtica is cartellas de versiones pro assegurare chi s'utente doesn’t run out of Quota because of versions.\n\t\t In prus de s'iscadèntzia de is versiones, s'aplicatzione assegurat de no impreare mai prus de su 50% de su logu lìberu a disponimentu de s'utente. Chi is versiones allogadas bàrigant custu lìmite, s'aplicatzione at a cantzellare innantis is versione prus bècias finas a lòmpere a su lìmite. Sunt disponìbiles prus informatziones in sa documentatzione de Versions.",
-    "Failed to revert {file} to revision {timestamp}." : "Non s'at pòdidu torrare a {documentu} pro sa revisione {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%nbyte","%n bytes"],
-    "Restore" : "Recùpera",
-    "No other versions available" : "Peruna àtera versione disponìbile"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/sq.js b/apps/files_versions/l10n/sq.js
deleted file mode 100644
index 59d42371c2f..00000000000
--- a/apps/files_versions/l10n/sq.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "Versione",
-    "Failed to revert {file} to revision {timestamp}." : "Dështoi në rikthimin e {file} te rishikimi {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n bajte","%n bajte"],
-    "Restore" : "Riktheje",
-    "No other versions available" : "Nuk ka versione të tjera të gatshme"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/sq.json b/apps/files_versions/l10n/sq.json
deleted file mode 100644
index 73fe6d0ab58..00000000000
--- a/apps/files_versions/l10n/sq.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
-    "Versions" : "Versione",
-    "Failed to revert {file} to revision {timestamp}." : "Dështoi në rikthimin e {file} te rishikimi {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n bajte","%n bajte"],
-    "Restore" : "Riktheje",
-    "No other versions available" : "Nuk ka versione të tjera të gatshme"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/sr@latin.js b/apps/files_versions/l10n/sr@latin.js
deleted file mode 100644
index 627d70eb51b..00000000000
--- a/apps/files_versions/l10n/sr@latin.js
+++ /dev/null
@@ -1,11 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Could not revert: %s" : "Ne mogu da vratim: %s",
-    "Versions" : "Verzije",
-    "Failed to revert {file} to revision {timestamp}." : "Ne mogu da vratim {file} na reviziju {timestamp}.",
-    "Restore" : "Vrati",
-    "No other versions available" : "Nema drugih verzija",
-    "More versions..." : "Još verzija..."
-},
-"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/files_versions/l10n/sr@latin.json b/apps/files_versions/l10n/sr@latin.json
deleted file mode 100644
index 63fe55cf50e..00000000000
--- a/apps/files_versions/l10n/sr@latin.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{ "translations": {
-    "Could not revert: %s" : "Ne mogu da vratim: %s",
-    "Versions" : "Verzije",
-    "Failed to revert {file} to revision {timestamp}." : "Ne mogu da vratim {file} na reviziju {timestamp}.",
-    "Restore" : "Vrati",
-    "No other versions available" : "Nema drugih verzija",
-    "More versions..." : "Još verzija..."
-},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/th.js b/apps/files_versions/l10n/th.js
deleted file mode 100644
index e86c92c3e8b..00000000000
--- a/apps/files_versions/l10n/th.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Versions" : "รุ่น",
-    "Failed to revert {file} to revision {timestamp}." : "{file} ล้มเหลวที่จะย้อนกลับไปยังการแก้ไขเมื่อ {timestamp}",
-    "_%n byte_::_%n bytes_" : ["%n ไบต์"],
-    "Restore" : "คืนค่า",
-    "No other versions available" : "ไม่มีรุ่นอื่น ๆ"
-},
-"nplurals=1; plural=0;");
diff --git a/apps/files_versions/l10n/th.json b/apps/files_versions/l10n/th.json
deleted file mode 100644
index c46285ab31f..00000000000
--- a/apps/files_versions/l10n/th.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
-    "Versions" : "รุ่น",
-    "Failed to revert {file} to revision {timestamp}." : "{file} ล้มเหลวที่จะย้อนกลับไปยังการแก้ไขเมื่อ {timestamp}",
-    "_%n byte_::_%n bytes_" : ["%n ไบต์"],
-    "Restore" : "คืนค่า",
-    "No other versions available" : "ไม่มีรุ่นอื่น ๆ"
-},"pluralForm" :"nplurals=1; plural=0;"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/l10n/tr.js b/apps/files_versions/l10n/tr.js
index f73c10ecf45..dc216107c52 100644
--- a/apps/files_versions/l10n/tr.js
+++ b/apps/files_versions/l10n/tr.js
@@ -3,7 +3,7 @@ OC.L10N.register(
     {
     "Versions" : "Sürümler",
     "This application automatically maintains older versions of files that are changed." : "Bu uygulama değiştirilen dosyaların önceki sürümlerini otomatik olarak izler ve saklar.",
-    "This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user's directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the account does not run out of Quota because of versions.\n\t\tIn addition to the expiry of versions, the versions app makes certain never to use more than 50% of the account's currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation." : "Bu uygulama değiştirilen dosyaların önceki sürümlerini otomatik olarak izler ve saklar. Kullanıma alındığında, dosya sürümlerini saklamak için her kullanıcının klasörlerinde gizli bir versions klasörü oluşturulur. Kullanıcılar site arayüzünü kullanarak istedikleri zaman dosyalarının daha önceki sürümlerine geri dönebilirler. Uygulama versions klasörünü otomatik olarak düzenler ve önceki dosya sürümleri nedeniyle hesabın kotasının dolmasını engeller.\n\t\tSürümler uygulaması dosya sürümlerini belirli bir süreyle saklarken, hesabın depolama alanının en çok %50 oranındaki bölümünü kullanır. Depolanan sürüm dosyalarının boyutu bu sınırın üzerine çıkarsa, sınır değerine geri dönülene kadar en eski sürüm dosyaları silinir. Ayrıntılı bilgi almak için Sürümler uygulamasının belgelerine bakabilirsiniz.",
+    "This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user's directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the account does not run out of Quota because of versions.\n\t\tIn addition to the expiry of versions, the versions app makes certain never to use more than 50% of the account's currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation." : "Bu uygulama değiştirilen dosyaların önceki sürümlerini otomatik olarak izler ve saklar. Kullanıma alındığında, dosya sürümlerini saklamak için her kullanıcının klasörlerinde gizli bir versions klasörü oluşturulur. Kullanıcılar site arayüzünü kullanarak istedikleri zaman dosyalarının önceki sürümlerine geri dönebilirler. Uygulama versions klasörünü otomatik olarak düzenler ve önceki dosya sürümleri nedeniyle hesabın kotasının dolmasını engeller.\n\t\tSürümler uygulaması dosya sürümlerini belirli bir süreyle saklarken, hesabın depolama alanının en çok %50 oranındaki bölümünü kullanır. Depolanan sürüm dosyalarının boyutu bu sınırın üzerine çıkarsa, sınır değerine geri dönülene kadar en eski sürüm dosyaları silinir. Ayrıntılı bilgi almak için Sürümler uygulamasının belgelerine bakabilirsiniz.",
     "Current version" : "Geçerli sürüm",
     "Initial version" : "İlk sürüm",
     "You" : "Siz",
diff --git a/apps/files_versions/l10n/tr.json b/apps/files_versions/l10n/tr.json
index 814e9ea7a97..e914457e8bd 100644
--- a/apps/files_versions/l10n/tr.json
+++ b/apps/files_versions/l10n/tr.json
@@ -1,7 +1,7 @@
 { "translations": {
     "Versions" : "Sürümler",
     "This application automatically maintains older versions of files that are changed." : "Bu uygulama değiştirilen dosyaların önceki sürümlerini otomatik olarak izler ve saklar.",
-    "This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user's directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the account does not run out of Quota because of versions.\n\t\tIn addition to the expiry of versions, the versions app makes certain never to use more than 50% of the account's currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation." : "Bu uygulama değiştirilen dosyaların önceki sürümlerini otomatik olarak izler ve saklar. Kullanıma alındığında, dosya sürümlerini saklamak için her kullanıcının klasörlerinde gizli bir versions klasörü oluşturulur. Kullanıcılar site arayüzünü kullanarak istedikleri zaman dosyalarının daha önceki sürümlerine geri dönebilirler. Uygulama versions klasörünü otomatik olarak düzenler ve önceki dosya sürümleri nedeniyle hesabın kotasının dolmasını engeller.\n\t\tSürümler uygulaması dosya sürümlerini belirli bir süreyle saklarken, hesabın depolama alanının en çok %50 oranındaki bölümünü kullanır. Depolanan sürüm dosyalarının boyutu bu sınırın üzerine çıkarsa, sınır değerine geri dönülene kadar en eski sürüm dosyaları silinir. Ayrıntılı bilgi almak için Sürümler uygulamasının belgelerine bakabilirsiniz.",
+    "This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user's directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the account does not run out of Quota because of versions.\n\t\tIn addition to the expiry of versions, the versions app makes certain never to use more than 50% of the account's currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation." : "Bu uygulama değiştirilen dosyaların önceki sürümlerini otomatik olarak izler ve saklar. Kullanıma alındığında, dosya sürümlerini saklamak için her kullanıcının klasörlerinde gizli bir versions klasörü oluşturulur. Kullanıcılar site arayüzünü kullanarak istedikleri zaman dosyalarının önceki sürümlerine geri dönebilirler. Uygulama versions klasörünü otomatik olarak düzenler ve önceki dosya sürümleri nedeniyle hesabın kotasının dolmasını engeller.\n\t\tSürümler uygulaması dosya sürümlerini belirli bir süreyle saklarken, hesabın depolama alanının en çok %50 oranındaki bölümünü kullanır. Depolanan sürüm dosyalarının boyutu bu sınırın üzerine çıkarsa, sınır değerine geri dönülene kadar en eski sürüm dosyaları silinir. Ayrıntılı bilgi almak için Sürümler uygulamasının belgelerine bakabilirsiniz.",
     "Current version" : "Geçerli sürüm",
     "Initial version" : "İlk sürüm",
     "You" : "Siz",
diff --git a/apps/files_versions/l10n/ur_PK.js b/apps/files_versions/l10n/ur_PK.js
deleted file mode 100644
index ae55363a2dd..00000000000
--- a/apps/files_versions/l10n/ur_PK.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Restore" : "بحال"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/ur_PK.json b/apps/files_versions/l10n/ur_PK.json
deleted file mode 100644
index bfbcb42de28..00000000000
--- a/apps/files_versions/l10n/ur_PK.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Restore" : "بحال"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
-\ No newline at end of file
diff --git a/apps/files_versions/lib/AppInfo/Application.php b/apps/files_versions/lib/AppInfo/Application.php
index 1f35034d820..29158276415 100644
--- a/apps/files_versions/lib/AppInfo/Application.php
+++ b/apps/files_versions/lib/AppInfo/Application.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
diff --git a/apps/files_versions/lib/BackgroundJob/ExpireVersions.php b/apps/files_versions/lib/BackgroundJob/ExpireVersions.php
index 6de29364835..794cbc5b882 100644
--- a/apps/files_versions/lib/BackgroundJob/ExpireVersions.php
+++ b/apps/files_versions/lib/BackgroundJob/ExpireVersions.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
diff --git a/apps/files_versions/lib/Capabilities.php b/apps/files_versions/lib/Capabilities.php
index 4919006bce3..cb6394f0a36 100644
--- a/apps/files_versions/lib/Capabilities.php
+++ b/apps/files_versions/lib/Capabilities.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
diff --git a/apps/files_versions/lib/Command/CleanUp.php b/apps/files_versions/lib/Command/CleanUp.php
index 1cd3dccc4dd..e8c46afef16 100644
--- a/apps/files_versions/lib/Command/CleanUp.php
+++ b/apps/files_versions/lib/Command/CleanUp.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
diff --git a/apps/files_versions/lib/Command/Expire.php b/apps/files_versions/lib/Command/Expire.php
index d1181087150..a30e623c347 100644
--- a/apps/files_versions/lib/Command/Expire.php
+++ b/apps/files_versions/lib/Command/Expire.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
diff --git a/apps/files_versions/lib/Command/ExpireVersions.php b/apps/files_versions/lib/Command/ExpireVersions.php
index fd0118549c6..d3f341a21d2 100644
--- a/apps/files_versions/lib/Command/ExpireVersions.php
+++ b/apps/files_versions/lib/Command/ExpireVersions.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud GmbH.
diff --git a/apps/files_versions/lib/Controller/PreviewController.php b/apps/files_versions/lib/Controller/PreviewController.php
index be62c5eb957..2c3ff8da70d 100644
--- a/apps/files_versions/lib/Controller/PreviewController.php
+++ b/apps/files_versions/lib/Controller/PreviewController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/apps/files_versions/lib/Events/CreateVersionEvent.php b/apps/files_versions/lib/Events/CreateVersionEvent.php
index 1399cdbb988..92ed26b2dd6 100644
--- a/apps/files_versions/lib/Events/CreateVersionEvent.php
+++ b/apps/files_versions/lib/Events/CreateVersionEvent.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/apps/files_versions/lib/Expiration.php b/apps/files_versions/lib/Expiration.php
index 5ef749ad115..1e04d93379f 100644
--- a/apps/files_versions/lib/Expiration.php
+++ b/apps/files_versions/lib/Expiration.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
diff --git a/apps/files_versions/lib/Sabre/RootCollection.php b/apps/files_versions/lib/Sabre/RootCollection.php
index ded4f3dda7b..1e7129f23da 100644
--- a/apps/files_versions/lib/Sabre/RootCollection.php
+++ b/apps/files_versions/lib/Sabre/RootCollection.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/apps/files_versions/lib/Sabre/VersionHome.php b/apps/files_versions/lib/Sabre/VersionHome.php
index 7f182958d94..07ac491f2a1 100644
--- a/apps/files_versions/lib/Sabre/VersionHome.php
+++ b/apps/files_versions/lib/Sabre/VersionHome.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/apps/files_versions/lib/Storage.php b/apps/files_versions/lib/Storage.php
index 19e7dd598ae..6d53a19a518 100644
--- a/apps/files_versions/lib/Storage.php
+++ b/apps/files_versions/lib/Storage.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -8,6 +9,7 @@
 namespace OCA\Files_Versions;
 
 use OC\Files\Filesystem;
+use OC\Files\ObjectStore\ObjectStoreStorage;
 use OC\Files\Search\SearchBinaryOperator;
 use OC\Files\Search\SearchComparison;
 use OC\Files\Search\SearchQuery;
@@ -23,6 +25,7 @@ use OCA\Files_Versions\Versions\IVersionManager;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\Command\IBus;
 use OCP\EventDispatcher\IEventDispatcher;
+use OCP\Files;
 use OCP\Files\FileInfo;
 use OCP\Files\Folder;
 use OCP\Files\IMimeTypeDetector;
@@ -32,6 +35,7 @@ use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
 use OCP\Files\Search\ISearchBinaryOperator;
 use OCP\Files\Search\ISearchComparison;
+use OCP\Files\Storage\IWriteStreamStorage;
 use OCP\Files\StorageInvalidException;
 use OCP\Files\StorageNotAvailableException;
 use OCP\IURLGenerator;
@@ -416,12 +420,31 @@ class Storage {
 
 		try {
 			// TODO add a proper way of overwriting a file while maintaining file ids
-			if ($storage1->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage') || $storage2->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage')) {
+			if ($storage1->instanceOfStorage(ObjectStoreStorage::class)
+				|| $storage2->instanceOfStorage(ObjectStoreStorage::class)
+			) {
 				$source = $storage1->fopen($internalPath1, 'r');
-				$target = $storage2->fopen($internalPath2, 'w');
-				[, $result] = \OC_Helper::streamCopy($source, $target);
-				fclose($source);
-				fclose($target);
+				$result = $source !== false;
+				if ($result) {
+					if ($storage2->instanceOfStorage(IWriteStreamStorage::class)) {
+						/** @var IWriteStreamStorage $storage2 */
+						$storage2->writeStream($internalPath2, $source);
+					} else {
+						$target = $storage2->fopen($internalPath2, 'w');
+						$result = $target !== false;
+						if ($result) {
+							[, $result] = Files::streamCopy($source, $target, true);
+						}
+						// explicit check as S3 library closes streams already
+						if (is_resource($target)) {
+							fclose($target);
+						}
+					}
+				}
+				// explicit check as S3 library closes streams already
+				if (is_resource($source)) {
+					fclose($source);
+				}
 
 				if ($result !== false) {
 					$storage1->unlink($internalPath1);
diff --git a/apps/files_versions/lib/Versions/BackendNotFoundException.php b/apps/files_versions/lib/Versions/BackendNotFoundException.php
index af903e9abeb..f1fbecb852a 100644
--- a/apps/files_versions/lib/Versions/BackendNotFoundException.php
+++ b/apps/files_versions/lib/Versions/BackendNotFoundException.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/apps/files_versions/lib/Versions/VersionManager.php b/apps/files_versions/lib/Versions/VersionManager.php
index eb53f04d388..5f547939213 100644
--- a/apps/files_versions/lib/Versions/VersionManager.php
+++ b/apps/files_versions/lib/Versions/VersionManager.php
@@ -60,8 +60,8 @@ class VersionManager implements IVersionManager, IDeletableVersionBackend, INeed
 
 		foreach ($backends as $type => $backendsForType) {
 			if (
-				$storage->instanceOfStorage($type) &&
-				($foundType === '' || is_subclass_of($type, $foundType))
+				$storage->instanceOfStorage($type)
+				&& ($foundType === '' || is_subclass_of($type, $foundType))
 			) {
 				foreach ($backendsForType as $backend) {
 					/** @var IVersionBackend $backend */
diff --git a/apps/files_versions/src/components/Version.vue b/apps/files_versions/src/components/Version.vue
index 8ea16e215c6..275f1d0ddbf 100644
--- a/apps/files_versions/src/components/Version.vue
+++ b/apps/files_versions/src/components/Version.vue
@@ -45,7 +45,10 @@
 						disable-menu
 						disable-tooltip
 						:show-user-status="false" />
-					<div>{{ versionAuthor }}</div>
+					<div class="version__info__author_name"
+						:title="versionAuthor">
+						{{ versionAuthor }}
+					</div>
 				</div>
 			</div>
 		</template>
@@ -349,12 +352,19 @@ export default defineComponent({
 		gap: 0.5rem;
 		color: var(--color-main-text);
 		font-weight: 500;
+		overflow: hidden;
 
 		&__label {
 			font-weight: 700;
 			// Fix overflow on narrow screens
 			overflow: hidden;
 			text-overflow: ellipsis;
+			min-width: 110px;
+		}
+
+		&__author_name {
+			overflow: hidden;
+			text-overflow: ellipsis;
 		}
 
 		&__date {
diff --git a/apps/files_versions/src/views/VersionTab.vue b/apps/files_versions/src/views/VersionTab.vue
index 48e07b7c786..a643aef439d 100644
--- a/apps/files_versions/src/views/VersionTab.vue
+++ b/apps/files_versions/src/views/VersionTab.vue
@@ -203,7 +203,7 @@ export default {
 
 			try {
 				await restoreVersion(version)
-				if (version.label !== '') {
+				if (version.label) {
 					showSuccess(t('files_versions', `${version.label} restored`))
 				} else if (version.mtime === this.initialVersionMtime) {
 					showSuccess(t('files_versions', 'Initial version restored'))
diff --git a/apps/files_versions/tests/BackgroundJob/ExpireVersionsTest.php b/apps/files_versions/tests/BackgroundJob/ExpireVersionsTest.php
index 7a35e9f5f39..21e88e86f90 100644
--- a/apps/files_versions/tests/BackgroundJob/ExpireVersionsTest.php
+++ b/apps/files_versions/tests/BackgroundJob/ExpireVersionsTest.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -16,17 +18,10 @@ use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;
 
 class ExpireVersionsTest extends TestCase {
-	/** @var IConfig|MockObject */
-	private $config;
-
-	/** @var IUserManager|MockObject */
-	private $userManager;
-
-	/** @var Expiration|MockObject */
-	private $expiration;
-
-	/** @var IJobList|MockObject */
-	private $jobList;
+	private IConfig&MockObject $config;
+	private IUserManager&MockObject $userManager;
+	private Expiration&MockObject $expiration;
+	private IJobList&MockObject $jobList;
 
 	protected function setUp(): void {
 		parent::setUp();
diff --git a/apps/files_versions/tests/Command/CleanupTest.php b/apps/files_versions/tests/Command/CleanupTest.php
index 62d9576e9c5..dd6665f5aef 100644
--- a/apps/files_versions/tests/Command/CleanupTest.php
+++ b/apps/files_versions/tests/Command/CleanupTest.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -8,11 +10,13 @@ namespace OCA\Files_Versions\Tests\Command;
 
 use OC\User\Manager;
 use OCA\Files_Versions\Command\CleanUp;
+use OCA\Files_Versions\Db\VersionsMapper;
 use OCP\Files\Cache\ICache;
 use OCP\Files\Folder;
 use OCP\Files\IRootFolder;
 use OCP\Files\Storage\IStorage;
 use OCP\UserInterface;
+use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;
 
 /**
@@ -23,37 +27,26 @@ use Test\TestCase;
  * @package OCA\Files_Versions\Tests\Command
  */
 class CleanupTest extends TestCase {
-
-	/** @var CleanUp */
-	protected $cleanup;
-
-	/** @var \PHPUnit\Framework\MockObject\MockObject | Manager */
-	protected $userManager;
-
-	/** @var \PHPUnit\Framework\MockObject\MockObject | IRootFolder */
-	protected $rootFolder;
-
-	/** @var \PHPUnit\Framework\MockObject\MockObject | VersionsMapper */
-	protected $versionMapper;
+	protected Manager&MockObject $userManager;
+	protected IRootFolder&MockObject $rootFolder;
+	protected VersionsMapper&MockObject $versionMapper;
+	protected CleanUp $cleanup;
 
 	protected function setUp(): void {
 		parent::setUp();
 
-		$this->rootFolder = $this->getMockBuilder('OCP\Files\IRootFolder')
-			->disableOriginalConstructor()->getMock();
-		$this->userManager = $this->getMockBuilder('OC\User\Manager')
-			->disableOriginalConstructor()->getMock();
-		$this->versionMapper = $this->getMockBuilder('OCA\Files_Versions\Db\VersionsMapper')
-			->disableOriginalConstructor()->getMock();
+		$this->rootFolder = $this->createMock(IRootFolder::class);
+		$this->userManager = $this->createMock(Manager::class);
+		$this->versionMapper = $this->createMock(VersionsMapper::class);
 
 		$this->cleanup = new CleanUp($this->rootFolder, $this->userManager, $this->versionMapper);
 	}
 
 	/**
-	 * @dataProvider dataTestDeleteVersions
 	 * @param boolean $nodeExists
 	 */
-	public function testDeleteVersions($nodeExists): void {
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestDeleteVersions')]
+	public function testDeleteVersions(bool $nodeExists): void {
 		$this->rootFolder->expects($this->once())
 			->method('nodeExists')
 			->with('/testUser/files_versions')
@@ -92,7 +85,7 @@ class CleanupTest extends TestCase {
 		$this->invokePrivate($this->cleanup, 'deleteVersions', ['testUser']);
 	}
 
-	public function dataTestDeleteVersions() {
+	public static function dataTestDeleteVersions(): array {
 		return [
 			[true],
 			[false]
@@ -106,8 +99,8 @@ class CleanupTest extends TestCase {
 	public function testExecuteDeleteListOfUsers(): void {
 		$userIds = ['user1', 'user2', 'user3'];
 
-		$instance = $this->getMockBuilder('OCA\Files_Versions\Command\CleanUp')
-			->setMethods(['deleteVersions'])
+		$instance = $this->getMockBuilder(CleanUp::class)
+			->onlyMethods(['deleteVersions'])
 			->setConstructorArgs([$this->rootFolder, $this->userManager, $this->versionMapper])
 			->getMock();
 		$instance->expects($this->exactly(count($userIds)))
@@ -119,14 +112,12 @@ class CleanupTest extends TestCase {
 		$this->userManager->expects($this->exactly(count($userIds)))
 			->method('userExists')->willReturn(true);
 
-		$inputInterface = $this->getMockBuilder('\Symfony\Component\Console\Input\InputInterface')
-			->disableOriginalConstructor()->getMock();
+		$inputInterface = $this->createMock(\Symfony\Component\Console\Input\InputInterface::class);
 		$inputInterface->expects($this->once())->method('getArgument')
 			->with('user_id')
 			->willReturn($userIds);
 
-		$outputInterface = $this->getMockBuilder('\Symfony\Component\Console\Output\OutputInterface')
-			->disableOriginalConstructor()->getMock();
+		$outputInterface = $this->createMock(\Symfony\Component\Console\Output\OutputInterface::class);
 
 		$this->invokePrivate($instance, 'execute', [$inputInterface, $outputInterface]);
 	}
@@ -138,8 +129,8 @@ class CleanupTest extends TestCase {
 		$userIds = [];
 		$backendUsers = ['user1', 'user2'];
 
-		$instance = $this->getMockBuilder('OCA\Files_Versions\Command\CleanUp')
-			->setMethods(['deleteVersions'])
+		$instance = $this->getMockBuilder(CleanUp::class)
+			->onlyMethods(['deleteVersions'])
 			->setConstructorArgs([$this->rootFolder, $this->userManager, $this->versionMapper])
 			->getMock();
 
@@ -155,14 +146,12 @@ class CleanupTest extends TestCase {
 				$this->assertTrue(in_array($user, $backendUsers));
 			});
 
-		$inputInterface = $this->getMockBuilder('\Symfony\Component\Console\Input\InputInterface')
-			->disableOriginalConstructor()->getMock();
+		$inputInterface = $this->createMock(\Symfony\Component\Console\Input\InputInterface::class);
 		$inputInterface->expects($this->once())->method('getArgument')
 			->with('user_id')
 			->willReturn($userIds);
 
-		$outputInterface = $this->getMockBuilder('\Symfony\Component\Console\Output\OutputInterface')
-			->disableOriginalConstructor()->getMock();
+		$outputInterface = $this->createMock(\Symfony\Component\Console\Output\OutputInterface::class);
 
 		$this->userManager->expects($this->once())
 			->method('getBackends')
diff --git a/apps/files_versions/tests/Command/ExpireTest.php b/apps/files_versions/tests/Command/ExpireTest.php
index 11f4eb2e2be..b74457a7fd6 100644
--- a/apps/files_versions/tests/Command/ExpireTest.php
+++ b/apps/files_versions/tests/Command/ExpireTest.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
diff --git a/apps/files_versions/tests/Controller/PreviewControllerTest.php b/apps/files_versions/tests/Controller/PreviewControllerTest.php
index 0e36703d5aa..542ea2b6b34 100644
--- a/apps/files_versions/tests/Controller/PreviewControllerTest.php
+++ b/apps/files_versions/tests/Controller/PreviewControllerTest.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -12,7 +14,6 @@ use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\Files\File;
 use OCP\Files\Folder;
-use OCP\Files\IMimeTypeDetector;
 use OCP\Files\IRootFolder;
 use OCP\Files\NotFoundException;
 use OCP\Files\SimpleFS\ISimpleFile;
@@ -25,29 +26,14 @@ use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;
 
 class PreviewControllerTest extends TestCase {
-
-	/** @var IRootFolder|\PHPUnit\Framework\MockObject\MockObject */
-	private $rootFolder;
-
-	/** @var string */
-	private $userId;
-
-	/** @var IMimeTypeDetector|\PHPUnit\Framework\MockObject\MockObject */
-	private $mimeTypeDetector;
-
-	/** @var IPreview|\PHPUnit\Framework\MockObject\MockObject */
-	private $previewManager;
-
-	/** @var PreviewController|\PHPUnit\Framework\MockObject\MockObject */
-	private $controller;
-
-	/** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */
-	private $userSession;
-
-	/** @var IVersionManager|\PHPUnit\Framework\MockObject\MockObject */
-	private $versionManager;
+	private IRootFolder&MockObject $rootFolder;
+	private string $userId;
+	private IPreview&MockObject $previewManager;
+	private IUserSession&MockObject $userSession;
+	private IVersionManager&MockObject $versionManager;
 
 	private IMimeIconProvider&MockObject $mimeIconProvider;
+	private PreviewController $controller;
 
 	protected function setUp(): void {
 		parent::setUp();
diff --git a/apps/files_versions/tests/ExpirationTest.php b/apps/files_versions/tests/ExpirationTest.php
index ac8af7c093a..8cf412c3fe0 100644
--- a/apps/files_versions/tests/ExpirationTest.php
+++ b/apps/files_versions/tests/ExpirationTest.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -15,7 +17,7 @@ use Psr\Log\LoggerInterface;
 class ExpirationTest extends \Test\TestCase {
 	public const SECONDS_PER_DAY = 86400; //60*60*24
 
-	public function expirationData() {
+	public static function expirationData(): array {
 		$today = 100 * self::SECONDS_PER_DAY;
 		$back10Days = (100 - 10) * self::SECONDS_PER_DAY;
 		$back20Days = (100 - 20) * self::SECONDS_PER_DAY;
@@ -79,16 +81,8 @@ class ExpirationTest extends \Test\TestCase {
 		];
 	}
 
-	/**
-	 * @dataProvider expirationData
-	 *
-	 * @param string $retentionObligation
-	 * @param int $timeNow
-	 * @param int $timestamp
-	 * @param bool $quotaExceeded
-	 * @param string $expectedResult
-	 */
-	public function testExpiration($retentionObligation, $timeNow, $timestamp, $quotaExceeded, $expectedResult): void {
+	#[\PHPUnit\Framework\Attributes\DataProvider('expirationData')]
+	public function testExpiration(string $retentionObligation, int $timeNow, int $timestamp, bool $quotaExceeded, bool $expectedResult): void {
 		$mockedConfig = $this->getMockedConfig($retentionObligation);
 		$mockedTimeFactory = $this->getMockedTimeFactory($timeNow);
 		$mockedLogger = $this->createMock(LoggerInterface::class);
@@ -100,11 +94,7 @@ class ExpirationTest extends \Test\TestCase {
 	}
 
 
-	/**
-	 * @param int $time
-	 * @return ITimeFactory|MockObject
-	 */
-	private function getMockedTimeFactory($time) {
+	private function getMockedTimeFactory(int $time): ITimeFactory&MockObject {
 		$mockedTimeFactory = $this->createMock(ITimeFactory::class);
 		$mockedTimeFactory->expects($this->any())
 			->method('getTime')
@@ -113,11 +103,7 @@ class ExpirationTest extends \Test\TestCase {
 		return $mockedTimeFactory;
 	}
 
-	/**
-	 * @param string $returnValue
-	 * @return IConfig|MockObject
-	 */
-	private function getMockedConfig($returnValue) {
+	private function getMockedConfig(string $returnValue): IConfig&MockObject {
 		$mockedConfig = $this->createMock(IConfig::class);
 		$mockedConfig->expects($this->any())
 			->method('getSystemValue')
diff --git a/apps/files_versions/tests/StorageTest.php b/apps/files_versions/tests/StorageTest.php
index dd5b94c7a22..443cff3ee06 100644
--- a/apps/files_versions/tests/StorageTest.php
+++ b/apps/files_versions/tests/StorageTest.php
@@ -24,7 +24,7 @@ class StorageTest extends TestCase {
 
 	private $versionsRoot;
 	private $userFolder;
-	private $expireTimestamp = 10;
+	private int $expireTimestamp = 10;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -46,13 +46,13 @@ class StorageTest extends TestCase {
 	}
 
 
-	protected function createPastFile(string $path, int $mtime) {
+	protected function createPastFile(string $path, int $mtime): void {
 		try {
 			$file = $this->userFolder->get($path);
+			$file->putContent((string)$mtime);
 		} catch (NotFoundException $e) {
-			$file = $this->userFolder->newFile($path);
+			$file = $this->userFolder->newFile($path, (string)$mtime);
 		}
-		$file->putContent((string)$mtime);
 		$file->touch($mtime);
 	}
 
diff --git a/apps/files_versions/tests/VersioningTest.php b/apps/files_versions/tests/VersioningTest.php
index eaa0a02e261..c9f7d27d7ab 100644
--- a/apps/files_versions/tests/VersioningTest.php
+++ b/apps/files_versions/tests/VersioningTest.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -138,8 +140,8 @@ class VersioningTest extends \Test\TestCase {
 	/**
 	 * @medium
 	 * test expire logic
-	 * @dataProvider versionsProvider
 	 */
+	#[\PHPUnit\Framework\Attributes\DataProvider('versionsProvider')]
 	public function testGetExpireList($versions, $sizeOfAllDeletedFiles): void {
 
 		// last interval end at 2592000
@@ -163,7 +165,7 @@ class VersioningTest extends \Test\TestCase {
 		}
 	}
 
-	public function versionsProvider() {
+	public static function versionsProvider(): array {
 		return [
 			// first set of versions uniformly distributed versions
 			[
@@ -683,7 +685,7 @@ class VersioningTest extends \Test\TestCase {
 
 		$firstVersion = current($versions);
 
-		$this->assertFalse(Storage::rollback('folder/test.txt', $firstVersion['version'], $this->user2), 'Revert did not happen');
+		$this->assertFalse(Storage::rollback('folder/test.txt', (int)$firstVersion['version'], $this->user2), 'Revert did not happen');
 
 		$this->loginAsUser(self::TEST_VERSIONS_USER);
 
@@ -743,8 +745,8 @@ class VersioningTest extends \Test\TestCase {
 			return;
 		}
 
-		$eventHandler = $this->getMockBuilder(\stdclass::class)
-			->setMethods(['callback'])
+		$eventHandler = $this->getMockBuilder(DummyHookListener::class)
+			->onlyMethods(['callback'])
 			->getMock();
 
 		$eventHandler->expects($this->any())
@@ -763,7 +765,7 @@ class VersioningTest extends \Test\TestCase {
 		);
 	}
 
-	private function doTestRestore() {
+	private function doTestRestore(): void {
 		$filePath = self::TEST_VERSIONS_USER . '/files/sub/test.txt';
 		$this->rootView->file_put_contents($filePath, 'test file');
 
@@ -941,11 +943,7 @@ class VersioningTest extends \Test\TestCase {
 		);
 	}
 
-	/**
-	 * @param View $view
-	 * @param string $path
-	 */
-	private function createAndCheckVersions(View $view, $path) {
+	private function createAndCheckVersions(View $view, string $path): array {
 		$view->file_put_contents($path, 'test file');
 		$view->file_put_contents($path, 'version 1');
 		$view->file_put_contents($path, 'version 2');
@@ -967,11 +965,7 @@ class VersioningTest extends \Test\TestCase {
 		return $versions;
 	}
 
-	/**
-	 * @param string $user
-	 * @param bool $create
-	 */
-	public static function loginHelper($user, $create = false) {
+	public static function loginHelper(string $user, bool $create = false) {
 		if ($create) {
 			$backend = new \Test\Util\User\Dummy();
 			$backend->createUser($user, $user);
@@ -987,6 +981,11 @@ class VersioningTest extends \Test\TestCase {
 	}
 }
 
+class DummyHookListener {
+	public function callback() {
+	}
+}
+
 // extend the original class to make it possible to test protected methods
 class VersionStorageToTest extends Storage {
 
diff --git a/apps/files_versions/tests/Versions/VersionManagerTest.php b/apps/files_versions/tests/Versions/VersionManagerTest.php
index 8001d9fbf0e..79caa65d5f1 100644
--- a/apps/files_versions/tests/Versions/VersionManagerTest.php
+++ b/apps/files_versions/tests/Versions/VersionManagerTest.php
@@ -6,7 +6,7 @@ declare(strict_types=1);
  * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-namespace OCA\files_versions\tests\Versions;
+namespace OCA\Files_Versions\Tests\Versions;
 
 use OC\Files\Storage\Local;
 use OCA\Files_Versions\Events\VersionRestoredEvent;
@@ -15,6 +15,7 @@ use OCA\Files_Versions\Versions\IVersionBackend;
 use OCA\Files_Versions\Versions\VersionManager;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\Storage\IStorage;
+use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;
 
 class VersionManagerTest extends TestCase {
@@ -25,10 +26,10 @@ class VersionManagerTest extends TestCase {
 		return $backend;
 	}
 
-	private function getStorage(string $class): IStorage {
+	private function getStorage(string $class): IStorage&MockObject {
 		return $this->getMockBuilder($class)
 			->disableOriginalConstructor()
-			->setMethodsExcept(['instanceOfStorage'])
+			->onlyMethods(array_diff(get_class_methods($class), ['instanceOfStorage']))
 			->getMock();
 	}