From 519a0ae4abad95ffbaa58847c2068c8f861ea416 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Thu, 18 Oct 2012 02:09:32 +0200
Subject: [PATCH] [tx-robot] updated from transifex

---
 apps/files/l10n/bg_BG.php           |   3 -
 apps/files/l10n/ca.php              |  11 ---
 apps/files/l10n/cs_CZ.php           |  11 ---
 apps/files/l10n/da.php              |  11 ---
 apps/files/l10n/de.php              |  11 ---
 apps/files/l10n/de_DE.php           |  11 ---
 apps/files/l10n/el.php              |  11 ---
 apps/files/l10n/eo.php              |  11 ---
 apps/files/l10n/es.php              |  11 ---
 apps/files/l10n/es_AR.php           |  11 ---
 apps/files/l10n/et_EE.php           |   9 --
 apps/files/l10n/eu.php              |  11 ---
 apps/files/l10n/fa.php              |   8 --
 apps/files/l10n/fi_FI.php           |   8 --
 apps/files/l10n/fr.php              |  11 ---
 apps/files/l10n/gl.php              |  10 ---
 apps/files/l10n/he.php              |   5 --
 apps/files/l10n/hr.php              |  11 ---
 apps/files/l10n/hu_HU.php           |   8 --
 apps/files/l10n/id.php              |   8 --
 apps/files/l10n/it.php              |  11 ---
 apps/files/l10n/ja_JP.php           |  11 ---
 apps/files/l10n/ko.php              |   8 --
 apps/files/l10n/lb.php              |   8 --
 apps/files/l10n/lt_LT.php           |   4 -
 apps/files/l10n/lv.php              |   8 --
 apps/files/l10n/mk.php              |   4 -
 apps/files/l10n/ms_MY.php           |   8 --
 apps/files/l10n/nb_NO.php           |  11 ---
 apps/files/l10n/nl.php              |  11 ---
 apps/files/l10n/oc.php              |  11 ---
 apps/files/l10n/pl.php              |  11 ---
 apps/files/l10n/pt_BR.php           |  11 ---
 apps/files/l10n/pt_PT.php           |  11 ---
 apps/files/l10n/ro.php              |  11 ---
 apps/files/l10n/ru.php              |  10 ---
 apps/files/l10n/ru_RU.php           |  11 ---
 apps/files/l10n/si_LK.php           |   4 -
 apps/files/l10n/sk_SK.php           |  11 ---
 apps/files/l10n/sl.php              |  10 ---
 apps/files/l10n/sv.php              |  11 ---
 apps/files/l10n/th_TH.php           |  11 ---
 apps/files/l10n/tr.php              |   8 --
 apps/files/l10n/uk.php              |   5 --
 apps/files/l10n/vi.php              |  11 ---
 apps/files/l10n/zh_CN.GB2312.php    |  11 ---
 apps/files/l10n/zh_CN.php           |  11 ---
 apps/files/l10n/zh_TW.php           |   1 -
 apps/files_external/l10n/zh_CN.php  |  18 ++++
 core/l10n/ca.php                    |   5 --
 core/l10n/cs_CZ.php                 |   5 --
 core/l10n/da.php                    |  14 ++--
 core/l10n/de.php                    |   5 --
 core/l10n/de_DE.php                 |   5 --
 core/l10n/el.php                    |   5 --
 core/l10n/eo.php                    |   5 --
 core/l10n/es.php                    |   5 --
 core/l10n/es_AR.php                 |  17 ++--
 core/l10n/eu.php                    |   4 -
 core/l10n/fi_FI.php                 |   2 -
 core/l10n/fr.php                    |   5 --
 core/l10n/hr.php                    |   5 --
 core/l10n/it.php                    |   5 --
 core/l10n/ja_JP.php                 |   5 --
 core/l10n/nl.php                    |   6 +-
 core/l10n/oc.php                    |   5 --
 core/l10n/pl.php                    |  17 ++--
 core/l10n/pt_BR.php                 |   9 +-
 core/l10n/pt_PT.php                 |   5 --
 core/l10n/ru_RU.php                 |   4 +-
 core/l10n/sk_SK.php                 |   4 -
 core/l10n/sv.php                    |   9 +-
 core/l10n/ta_LK.php                 |  27 ++++++
 core/l10n/th_TH.php                 |   5 --
 core/l10n/vi.php                    |   4 -
 core/l10n/zh_CN.GB2312.php          |   5 --
 l10n/af/core.po                     |  18 ++--
 l10n/af/files.po                    |  98 +++++++++++-----------
 l10n/ar/core.po                     |  18 ++--
 l10n/ar/files.po                    |  98 +++++++++++-----------
 l10n/ar_SA/core.po                  |  18 ++--
 l10n/ar_SA/files.po                 |  98 +++++++++++-----------
 l10n/bg_BG/core.po                  |  18 ++--
 l10n/bg_BG/files.po                 | 104 ++++++++++++------------
 l10n/ca/core.po                     |  26 ++----
 l10n/ca/files.po                    | 122 ++++++++++++++--------------
 l10n/cs_CZ/core.po                  |  26 ++----
 l10n/cs_CZ/files.po                 | 122 ++++++++++++++--------------
 l10n/da/core.po                     |  38 ++++-----
 l10n/da/files.po                    |  52 ++++++------
 l10n/de/core.po                     |  26 ++----
 l10n/de/files.po                    |  52 ++++++------
 l10n/de_DE/core.po                  |  24 ++----
 l10n/de_DE/files.po                 |  52 ++++++------
 l10n/el/core.po                     |  24 ++----
 l10n/el/files.po                    | 122 ++++++++++++++--------------
 l10n/eo/core.po                     |  24 ++----
 l10n/eo/files.po                    |  52 ++++++------
 l10n/es/core.po                     |  26 ++----
 l10n/es/files.po                    | 122 ++++++++++++++--------------
 l10n/es_AR/core.po                  |  38 ++++-----
 l10n/es_AR/files.po                 | 122 ++++++++++++++--------------
 l10n/es_AR/settings.po              |  23 +++---
 l10n/et_EE/core.po                  |  18 ++--
 l10n/et_EE/files.po                 | 116 +++++++++++++-------------
 l10n/eu/core.po                     |  22 ++---
 l10n/eu/files.po                    | 122 ++++++++++++++--------------
 l10n/eu_ES/core.po                  |  18 ++--
 l10n/eu_ES/files.po                 |  98 +++++++++++-----------
 l10n/fa/core.po                     |  18 ++--
 l10n/fa/files.po                    | 114 +++++++++++++-------------
 l10n/fi/core.po                     |  18 ++--
 l10n/fi/files.po                    |  98 +++++++++++-----------
 l10n/fi_FI/core.po                  |  18 ++--
 l10n/fi_FI/files.po                 | 116 +++++++++++++-------------
 l10n/fr/core.po                     |  26 ++----
 l10n/fr/files.po                    | 122 ++++++++++++++--------------
 l10n/gl/core.po                     |  18 ++--
 l10n/gl/files.po                    | 118 +++++++++++++--------------
 l10n/he/core.po                     |  18 ++--
 l10n/he/files.po                    | 108 ++++++++++++------------
 l10n/hi/core.po                     |  18 ++--
 l10n/hi/files.po                    |  98 +++++++++++-----------
 l10n/hr/core.po                     |  24 ++----
 l10n/hr/files.po                    | 122 ++++++++++++++--------------
 l10n/hu_HU/core.po                  |  18 ++--
 l10n/hu_HU/files.po                 | 114 +++++++++++++-------------
 l10n/hy/core.po                     |  18 ++--
 l10n/hy/files.po                    |  98 +++++++++++-----------
 l10n/ia/core.po                     |  18 ++--
 l10n/ia/files.po                    |  98 +++++++++++-----------
 l10n/id/core.po                     |  18 ++--
 l10n/id/files.po                    | 114 +++++++++++++-------------
 l10n/id_ID/core.po                  |  18 ++--
 l10n/id_ID/files.po                 |  98 +++++++++++-----------
 l10n/it/core.po                     |  26 ++----
 l10n/it/files.po                    | 122 ++++++++++++++--------------
 l10n/ja_JP/core.po                  |  26 ++----
 l10n/ja_JP/files.po                 | 122 ++++++++++++++--------------
 l10n/ko/core.po                     |  18 ++--
 l10n/ko/files.po                    | 114 +++++++++++++-------------
 l10n/ku_IQ/core.po                  |  18 ++--
 l10n/ku_IQ/files.po                 | 100 +++++++++++------------
 l10n/lb/core.po                     |  18 ++--
 l10n/lb/files.po                    | 114 +++++++++++++-------------
 l10n/lt_LT/core.po                  |  18 ++--
 l10n/lt_LT/files.po                 | 106 ++++++++++++------------
 l10n/lv/core.po                     |  18 ++--
 l10n/lv/files.po                    | 114 +++++++++++++-------------
 l10n/mk/core.po                     |  18 ++--
 l10n/mk/files.po                    | 106 ++++++++++++------------
 l10n/ms_MY/core.po                  |  18 ++--
 l10n/ms_MY/files.po                 | 114 +++++++++++++-------------
 l10n/nb_NO/core.po                  |  18 ++--
 l10n/nb_NO/files.po                 |  52 ++++++------
 l10n/nl/core.po                     |  27 +++---
 l10n/nl/files.po                    |  52 ++++++------
 l10n/nn_NO/core.po                  |  18 ++--
 l10n/nn_NO/files.po                 |  98 +++++++++++-----------
 l10n/oc/core.po                     |  24 ++----
 l10n/oc/files.po                    | 122 ++++++++++++++--------------
 l10n/pl/core.po                     |  44 ++++------
 l10n/pl/files.po                    | 120 +++++++++++++--------------
 l10n/pl_PL/core.po                  |  18 ++--
 l10n/pl_PL/files.po                 |  98 +++++++++++-----------
 l10n/pt_BR/core.po                  |  28 +++----
 l10n/pt_BR/files.po                 | 122 ++++++++++++++--------------
 l10n/pt_PT/core.po                  |  24 ++----
 l10n/pt_PT/files.po                 |  52 ++++++------
 l10n/ro/core.po                     |  18 ++--
 l10n/ro/files.po                    | 122 ++++++++++++++--------------
 l10n/ru/core.po                     |  18 ++--
 l10n/ru/files.po                    |  50 ++++++------
 l10n/ru_RU/core.po                  |  26 ++----
 l10n/ru_RU/files.po                 |  52 ++++++------
 l10n/ru_RU/settings.po              |  21 +++--
 l10n/si_LK/core.po                  |  18 ++--
 l10n/si_LK/files.po                 |  38 ++++-----
 l10n/sk_SK/core.po                  |  24 ++----
 l10n/sk_SK/files.po                 |  52 ++++++------
 l10n/sl/core.po                     |  18 ++--
 l10n/sl/files.po                    | 118 +++++++++++++--------------
 l10n/so/core.po                     |  18 ++--
 l10n/so/files.po                    |  98 +++++++++++-----------
 l10n/sr/core.po                     |  18 ++--
 l10n/sr/files.po                    |  98 +++++++++++-----------
 l10n/sr@latin/core.po               |  18 ++--
 l10n/sr@latin/files.po              |  98 +++++++++++-----------
 l10n/sv/core.po                     |  28 +++----
 l10n/sv/files.po                    | 122 ++++++++++++++--------------
 l10n/ta_LK/core.po                  |  69 +++++++---------
 l10n/ta_LK/files.po                 |  30 +++----
 l10n/templates/core.pot             |  16 +---
 l10n/templates/files.pot            |  26 +++---
 l10n/templates/files_encryption.pot |   2 +-
 l10n/templates/files_external.pot   |   2 +-
 l10n/templates/files_sharing.pot    |   2 +-
 l10n/templates/files_versions.pot   |   2 +-
 l10n/templates/lib.pot              |   2 +-
 l10n/templates/settings.pot         |   2 +-
 l10n/templates/user_ldap.pot        |   2 +-
 l10n/th_TH/core.po                  |  24 ++----
 l10n/th_TH/files.po                 | 122 ++++++++++++++--------------
 l10n/tr/core.po                     |  18 ++--
 l10n/tr/files.po                    | 114 +++++++++++++-------------
 l10n/uk/core.po                     |  18 ++--
 l10n/uk/files.po                    | 108 ++++++++++++------------
 l10n/vi/core.po                     |  24 ++----
 l10n/vi/files.po                    |  52 ++++++------
 l10n/zh_CN.GB2312/core.po           |  26 ++----
 l10n/zh_CN.GB2312/files.po          |  52 ++++++------
 l10n/zh_CN/core.po                  |  18 ++--
 l10n/zh_CN/files.po                 | 122 ++++++++++++++--------------
 l10n/zh_CN/files_external.po        |  39 ++++-----
 l10n/zh_CN/settings.po              |  25 +++---
 l10n/zh_TW/core.po                  |  18 ++--
 l10n/zh_TW/files.po                 | 100 +++++++++++------------
 settings/l10n/es_AR.php             |   6 +-
 settings/l10n/ru_RU.php             |   3 +-
 settings/l10n/zh_CN.php             |   3 +-
 220 files changed, 3746 insertions(+), 4759 deletions(-)
 create mode 100644 apps/files_external/l10n/zh_CN.php
 create mode 100644 core/l10n/ta_LK.php

diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php
index 86f26a1798c..8c8054303bb 100644
--- a/apps/files/l10n/bg_BG.php
+++ b/apps/files/l10n/bg_BG.php
@@ -14,9 +14,6 @@
 "Name" => "Име",
 "Size" => "Размер",
 "Modified" => "Променено",
-"folder" => "папка",
-"folders" => "папки",
-"file" => "файл",
 "Maximum upload size" => "Макс. размер за качване",
 "0 is unlimited" => "0 означава без ограничение",
 "New" => "Нов",
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index 17432f72a1e..03ed3300a5b 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -10,33 +10,22 @@
 "Unshare" => "Deixa de compartir",
 "Delete" => "Suprimeix",
 "Rename" => "Reanomena",
-"already exists" => "ja existeix",
 "replace" => "substitueix",
 "suggest name" => "sugereix un nom",
 "cancel" => "cancel·la",
-"replaced" => "substituït",
 "undo" => "desfés",
-"with" => "per",
-"unshared" => "No compartits",
-"deleted" => "esborrat",
 "generating ZIP-file, it may take some time." => "s'estan generant fitxers ZIP, pot trigar una estona.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "No es pot pujar el fitxer perquè és una carpeta o té 0 bytes",
 "Upload Error" => "Error en la pujada",
 "Pending" => "Pendents",
 "1 file uploading" => "1 fitxer pujant",
-"files uploading" => "fitxers pujant",
 "Upload cancelled." => "La pujada s'ha cancel·lat.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà.",
 "Invalid name, '/' is not allowed." => "El nom no és vàlid, no es permet '/'.",
-"files scanned" => "arxius escanejats",
 "error while scanning" => "error durant l'escaneig",
 "Name" => "Nom",
 "Size" => "Mida",
 "Modified" => "Modificat",
-"folder" => "carpeta",
-"folders" => "carpetes",
-"file" => "fitxer",
-"files" => "fitxers",
 "seconds ago" => "segons enrere",
 "minute ago" => "minut enrere",
 "minutes ago" => "minuts enrere",
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index 04db7316f90..709f937098e 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -10,33 +10,22 @@
 "Unshare" => "Zrušit sdílení",
 "Delete" => "Smazat",
 "Rename" => "Přejmenovat",
-"already exists" => "již existuje",
 "replace" => "nahradit",
 "suggest name" => "navrhnout název",
 "cancel" => "zrušit",
-"replaced" => "nahrazeno",
 "undo" => "zpět",
-"with" => "s",
-"unshared" => "sdílení zrušeno",
-"deleted" => "smazáno",
 "generating ZIP-file, it may take some time." => "generuji ZIP soubor, může to nějakou dobu trvat.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář nebo má velikost 0 bajtů",
 "Upload Error" => "Chyba odesílání",
 "Pending" => "Čekající",
 "1 file uploading" => "odesílá se 1 soubor",
-"files uploading" => "souborů se odesílá",
 "Upload cancelled." => "Odesílání zrušeno.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Probíhá odesílání souboru. Opuštění stránky vyústí ve zrušení nahrávání.",
 "Invalid name, '/' is not allowed." => "Neplatný název, znak '/' není povolen",
-"files scanned" => "soubory prohledány",
 "error while scanning" => "chyba při prohledávání",
 "Name" => "Název",
 "Size" => "Velikost",
 "Modified" => "Změněno",
-"folder" => "složka",
-"folders" => "složky",
-"file" => "soubor",
-"files" => "soubory",
 "seconds ago" => "před pár sekundami",
 "minute ago" => "před minutou",
 "minutes ago" => "před pár minutami",
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index 5e428c9b2d9..5c5d4249472 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -10,33 +10,22 @@
 "Unshare" => "Fjern deling",
 "Delete" => "Slet",
 "Rename" => "Omdøb",
-"already exists" => "findes allerede",
 "replace" => "erstat",
 "suggest name" => "foreslå navn",
 "cancel" => "fortryd",
-"replaced" => "erstattet",
 "undo" => "fortryd",
-"with" => "med",
-"unshared" => "udelt",
-"deleted" => "Slettet",
 "generating ZIP-file, it may take some time." => "genererer ZIP-fil, det kan tage lidt tid.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Kunne ikke uploade din fil, da det enten er en mappe eller er tom",
 "Upload Error" => "Fejl ved upload",
 "Pending" => "Afventer",
 "1 file uploading" => "1 fil uploades",
-"files uploading" => "filer uploades",
 "Upload cancelled." => "Upload afbrudt.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.",
 "Invalid name, '/' is not allowed." => "Ugyldigt navn, '/' er ikke tilladt.",
-"files scanned" => "filer scannet",
 "error while scanning" => "fejl under scanning",
 "Name" => "Navn",
 "Size" => "Størrelse",
 "Modified" => "Ændret",
-"folder" => "mappe",
-"folders" => "mapper",
-"file" => "fil",
-"files" => "filer",
 "seconds ago" => "sekunder siden",
 "minute ago" => "minut siden",
 "minutes ago" => "minutter",
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index d8b3cf4227c..6d2bb1b1bcf 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -10,33 +10,22 @@
 "Unshare" => "Nicht mehr freigeben",
 "Delete" => "Löschen",
 "Rename" => "Umbenennen",
-"already exists" => "ist bereits vorhanden",
 "replace" => "ersetzen",
 "suggest name" => "Name vorschlagen",
 "cancel" => "abbrechen",
-"replaced" => "ersetzt",
 "undo" => "rückgängig machen",
-"with" => "mit",
-"unshared" => "Nicht mehr freigegeben",
-"deleted" => "gelöscht",
 "generating ZIP-file, it may take some time." => "Erstelle ZIP-Datei. Dies kann eine Weile dauern.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Deine Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist.",
 "Upload Error" => "Fehler beim Upload",
 "Pending" => "Ausstehend",
 "1 file uploading" => "Eine Datei wird hoch geladen",
-"files uploading" => "Dateien werden hoch geladen",
 "Upload cancelled." => "Upload abgebrochen.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.",
 "Invalid name, '/' is not allowed." => "Ungültiger Name: \"/\" ist nicht erlaubt.",
-"files scanned" => "Dateien gescannt",
 "error while scanning" => "Fehler beim Scannen",
 "Name" => "Name",
 "Size" => "Größe",
 "Modified" => "Bearbeitet",
-"folder" => "Ordner",
-"folders" => "Ordner",
-"file" => "Datei",
-"files" => "Dateien",
 "seconds ago" => "Sekunden her",
 "minute ago" => "Minute her",
 "minutes ago" => "Minuten her",
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
index 2ed409d2a50..fc0f9ec3429 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -10,33 +10,22 @@
 "Unshare" => "Nicht mehr freigeben",
 "Delete" => "Löschen",
 "Rename" => "Umbenennen",
-"already exists" => "ist bereits vorhanden",
 "replace" => "ersetzen",
 "suggest name" => "Name vorschlagen",
 "cancel" => "abbrechen",
-"replaced" => "ersetzt",
 "undo" => "rückgängig machen",
-"with" => "mit",
-"unshared" => "Nicht mehr freigegeben",
-"deleted" => "gelöscht",
 "generating ZIP-file, it may take some time." => "Erstelle ZIP-Datei. Dies kann eine Weile dauern.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist.",
 "Upload Error" => "Fehler beim Upload",
 "Pending" => "Ausstehend",
 "1 file uploading" => "Eine Datei wird hoch geladen",
-"files uploading" => "Dateien werden hoch geladen",
 "Upload cancelled." => "Upload abgebrochen.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
 "Invalid name, '/' is not allowed." => "Ungültiger Name: \"/\" ist nicht erlaubt.",
-"files scanned" => "Dateien gescannt",
 "error while scanning" => "Fehler beim Scannen",
 "Name" => "Name",
 "Size" => "Größe",
 "Modified" => "Bearbeitet",
-"folder" => "Ordner",
-"folders" => "Ordner",
-"file" => "Datei",
-"files" => "Dateien",
 "seconds ago" => "Sekunden her",
 "minute ago" => "Minute her",
 "minutes ago" => "Minuten her",
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index ef2e0bd2839..5c83ea627b0 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -10,33 +10,22 @@
 "Unshare" => "Διακοπή κοινής χρήσης",
 "Delete" => "Διαγραφή",
 "Rename" => "Μετονομασία",
-"already exists" => "υπάρχει ήδη",
 "replace" => "αντικατέστησε",
 "suggest name" => "συνιστώμενο όνομα",
 "cancel" => "ακύρωση",
-"replaced" => "αντικαταστάθηκε",
 "undo" => "αναίρεση",
-"with" => "με",
-"unshared" => "Διακόπηκε ο διαμοιρασμός",
-"deleted" => "διαγράφηκε",
 "generating ZIP-file, it may take some time." => "παραγωγή αρχείου ZIP, ίσως διαρκέσει αρκετά.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Αδυναμία στην μεταφόρτωση του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes",
 "Upload Error" => "Σφάλμα Μεταφόρτωσης",
 "Pending" => "Εκκρεμεί",
 "1 file uploading" => "1 αρχείο ανεβαίνει",
-"files uploading" => "αρχεία ανεβαίνουν",
 "Upload cancelled." => "Η μεταφόρτωση ακυρώθηκε.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Η μεταφόρτωση του αρχείου βρίσκεται σε εξέλιξη.  Έξοδος από την σελίδα τώρα θα ακυρώσει την μεταφόρτωση.",
 "Invalid name, '/' is not allowed." => "Μη έγκυρο όνομα, το '/' δεν επιτρέπεται.",
-"files scanned" => "αρχεία σαρώθηκαν",
 "error while scanning" => "σφάλμα κατά την ανίχνευση",
 "Name" => "Όνομα",
 "Size" => "Μέγεθος",
 "Modified" => "Τροποποιήθηκε",
-"folder" => "φάκελος",
-"folders" => "φάκελοι",
-"file" => "αρχείο",
-"files" => "αρχεία",
 "seconds ago" => "δευτερόλεπτα πριν",
 "minute ago" => "λεπτό πριν",
 "minutes ago" => "λεπτά πριν",
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index e9d8eb9e9af..75c76f4c852 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -10,33 +10,22 @@
 "Unshare" => "Malkunhavigi",
 "Delete" => "Forigi",
 "Rename" => "Alinomigi",
-"already exists" => "jam ekzistas",
 "replace" => "anstataÅ­igi",
 "suggest name" => "sugesti nomon",
 "cancel" => "nuligi",
-"replaced" => "anstataÅ­igita",
 "undo" => "malfari",
-"with" => "kun",
-"unshared" => "malkunhavigita",
-"deleted" => "forigita",
 "generating ZIP-file, it may take some time." => "generanta ZIP-dosiero, ĝi povas daŭri iom da tempo",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Ne eblis alŝuti vian dosieron ĉar ĝi estas dosierujo aŭ havas 0 duumokojn",
 "Upload Error" => "Alŝuta eraro",
 "Pending" => "Traktotaj",
 "1 file uploading" => "1 dosiero estas alŝutata",
-"files uploading" => "dosieroj estas alŝutataj",
 "Upload cancelled." => "La alŝuto nuliĝis.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton.",
 "Invalid name, '/' is not allowed." => "Nevalida nomo, “/” ne estas permesata.",
-"files scanned" => "dosieroj skanitaj",
 "error while scanning" => "eraro dum skano",
 "Name" => "Nomo",
 "Size" => "Grando",
 "Modified" => "Modifita",
-"folder" => "dosierujo",
-"folders" => "dosierujoj",
-"file" => "dosiero",
-"files" => "dosieroj",
 "seconds ago" => "sekundoj antaÅ­e",
 "minute ago" => "minuto antaÅ­e",
 "minutes ago" => "minutoj antaÅ­e",
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index 3837cf49f99..09ba1ae1a57 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -10,33 +10,22 @@
 "Unshare" => "Dejar de compartir",
 "Delete" => "Eliminar",
 "Rename" => "Renombrar",
-"already exists" => "ya existe",
 "replace" => "reemplazar",
 "suggest name" => "sugerir nombre",
 "cancel" => "cancelar",
-"replaced" => "reemplazado",
 "undo" => "deshacer",
-"with" => "con",
-"unshared" => "no compartido",
-"deleted" => "borrado",
 "generating ZIP-file, it may take some time." => "generando un fichero ZIP, puede llevar un tiempo.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "No ha sido posible subir tu archivo porque es un directorio o tiene 0 bytes",
 "Upload Error" => "Error al subir el archivo",
 "Pending" => "Pendiente",
 "1 file uploading" => "subiendo 1 archivo",
-"files uploading" => "archivos subiendo",
 "Upload cancelled." => "Subida cancelada.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Salir de la página ahora cancelará la subida.",
 "Invalid name, '/' is not allowed." => "Nombre no válido, '/' no está permitido.",
-"files scanned" => "archivos escaneados",
 "error while scanning" => "error escaneando",
 "Name" => "Nombre",
 "Size" => "Tamaño",
 "Modified" => "Modificado",
-"folder" => "carpeta",
-"folders" => "carpetas",
-"file" => "archivo",
-"files" => "archivos",
 "seconds ago" => "hace segundos",
 "minute ago" => "minuto",
 "minutes ago" => "hace minutos",
diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php
index e94a904327c..33b1f5d235d 100644
--- a/apps/files/l10n/es_AR.php
+++ b/apps/files/l10n/es_AR.php
@@ -10,33 +10,22 @@
 "Unshare" => "Dejar de compartir",
 "Delete" => "Borrar",
 "Rename" => "cambiar nombre",
-"already exists" => "ya existe",
 "replace" => "reemplazar",
 "suggest name" => "sugerir nombre",
 "cancel" => "cancelar",
-"replaced" => "reemplazado",
 "undo" => "deshacer",
-"with" => "con",
-"unshared" => "no compartido",
-"deleted" => "borrado",
 "generating ZIP-file, it may take some time." => "generando un archivo ZIP, puede llevar un tiempo.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "No fue posible subir tu archivo porque es un directorio o su tamaño es 0 bytes",
 "Upload Error" => "Error al subir el archivo",
 "Pending" => "Pendiente",
 "1 file uploading" => "Subiendo 1 archivo",
-"files uploading" => "Subiendo archivos",
 "Upload cancelled." => "La subida fue cancelada",
 "File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará.",
 "Invalid name, '/' is not allowed." => "Nombre no válido, '/' no está permitido.",
-"files scanned" => "archivos escaneados",
 "error while scanning" => "error mientras se escaneaba",
 "Name" => "Nombre",
 "Size" => "Tamaño",
 "Modified" => "Modificado",
-"folder" => "carpeta",
-"folders" => "carpetas",
-"file" => "archivo",
-"files" => "archivos",
 "seconds ago" => "segundos atrás",
 "minute ago" => "hace un minuto",
 "minutes ago" => "minutos atrás",
diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index f2721b194e2..1d76a68caab 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -9,15 +9,10 @@
 "Files" => "Failid",
 "Unshare" => "Lõpeta jagamine",
 "Delete" => "Kustuta",
-"already exists" => "on juba olemas",
 "replace" => "asenda",
 "suggest name" => "soovita nime",
 "cancel" => "loobu",
-"replaced" => "asendatud",
 "undo" => "tagasi",
-"with" => "millega",
-"unshared" => "jagamata",
-"deleted" => "kustutatud",
 "generating ZIP-file, it may take some time." => "ZIP-faili loomine, see võib veidi aega võtta.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Sinu faili üleslaadimine ebaõnnestus, kuna see on kaust või selle suurus on 0 baiti",
 "Upload Error" => "Ãœleslaadimise viga",
@@ -28,10 +23,6 @@
 "Name" => "Nimi",
 "Size" => "Suurus",
 "Modified" => "Muudetud",
-"folder" => "kaust",
-"folders" => "kausta",
-"file" => "fail",
-"files" => "faili",
 "File handling" => "Failide käsitlemine",
 "Maximum upload size" => "Maksimaalne üleslaadimise suurus",
 "max. possible: " => "maks. võimalik: ",
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index 94212afe8c2..cb00b84c513 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -10,33 +10,22 @@
 "Unshare" => "Ez partekatu",
 "Delete" => "Ezabatu",
 "Rename" => "Berrizendatu",
-"already exists" => "dagoeneko existitzen da",
 "replace" => "ordeztu",
 "suggest name" => "aholkatu izena",
 "cancel" => "ezeztatu",
-"replaced" => "ordeztua",
 "undo" => "desegin",
-"with" => "honekin",
-"unshared" => "Ez partekatuta",
-"deleted" => "ezabatuta",
 "generating ZIP-file, it may take some time." => "ZIP-fitxategia sortzen ari da, denbora har dezake",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Ezin da zure fitxategia igo, karpeta bat da edo 0 byt ditu",
 "Upload Error" => "Igotzean errore bat suertatu da",
 "Pending" => "Zain",
 "1 file uploading" => "fitxategi 1 igotzen",
-"files uploading" => "fitxategiak igotzen",
 "Upload cancelled." => "Igoera ezeztatuta",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.",
 "Invalid name, '/' is not allowed." => "Baliogabeko izena, '/' ezin da erabili. ",
-"files scanned" => "fitxategiak eskaneatuta",
 "error while scanning" => "errore bat egon da eskaneatzen zen bitartean",
 "Name" => "Izena",
 "Size" => "Tamaina",
 "Modified" => "Aldatuta",
-"folder" => "karpeta",
-"folders" => "Karpetak",
-"file" => "fitxategia",
-"files" => "fitxategiak",
 "seconds ago" => "segundu",
 "minute ago" => "minutu",
 "minutes ago" => "minutu",
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
index 979e58c5578..01a1b1e56f7 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -8,13 +8,9 @@
 "Failed to write to disk" => "نوشتن بر روی دیسک سخت ناموفق بود",
 "Files" => "فایل ها",
 "Delete" => "پاک کردن",
-"already exists" => "وجود دارد",
 "replace" => "جایگزین",
 "cancel" => "لغو",
-"replaced" => "جایگزین‌شده",
 "undo" => "بازگشت",
-"with" => "همراه",
-"deleted" => "حذف شده",
 "generating ZIP-file, it may take some time." => "در حال ساخت فایل فشرده ممکن است زمان زیادی به طول بیانجامد",
 "Unable to upload your file as it is a directory or has 0 bytes" => "ناتوان در بارگذاری یا فایل یک پوشه است یا 0بایت دارد",
 "Upload Error" => "خطا در بار گذاری",
@@ -24,10 +20,6 @@
 "Name" => "نام",
 "Size" => "اندازه",
 "Modified" => "تغییر یافته",
-"folder" => "پوشه",
-"folders" => "پوشه ها",
-"file" => "پرونده",
-"files" => "پرونده ها",
 "File handling" => "اداره پرونده ها",
 "Maximum upload size" => "حداکثر اندازه بارگزاری",
 "max. possible: " => "حداکثرمقدارممکن:",
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index 8e874ad4d95..154ad7f4dd6 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -9,14 +9,10 @@
 "Files" => "Tiedostot",
 "Delete" => "Poista",
 "Rename" => "Nimeä uudelleen",
-"already exists" => "on jo olemassa",
 "replace" => "korvaa",
 "suggest name" => "ehdota nimeä",
 "cancel" => "peru",
-"replaced" => "korvattu",
 "undo" => "kumoa",
-"with" => "käyttäen",
-"deleted" => "poistettu",
 "generating ZIP-file, it may take some time." => "luodaan ZIP-tiedostoa, tämä saattaa kestää hetken.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio",
 "Upload Error" => "Lähetysvirhe.",
@@ -27,10 +23,6 @@
 "Name" => "Nimi",
 "Size" => "Koko",
 "Modified" => "Muutettu",
-"folder" => "kansio",
-"folders" => "kansiota",
-"file" => "tiedosto",
-"files" => "tiedostoa",
 "seconds ago" => "sekuntia sitten",
 "minute ago" => "minuutti sitten",
 "minutes ago" => "minuuttia sitten",
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index f58bfa5cc5e..08f2b79cfff 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -10,33 +10,22 @@
 "Unshare" => "Ne plus partager",
 "Delete" => "Supprimer",
 "Rename" => "Renommer",
-"already exists" => "existe déjà",
 "replace" => "remplacer",
 "suggest name" => "Suggérer un nom",
 "cancel" => "annuler",
-"replaced" => "remplacé",
 "undo" => "annuler",
-"with" => "avec",
-"unshared" => "non partagée",
-"deleted" => "supprimé",
 "generating ZIP-file, it may take some time." => "Fichier ZIP en cours d'assemblage ;  cela peut prendre du temps.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Impossible de charger vos fichiers car il s'agit d'un dossier ou le fichier fait 0 octet.",
 "Upload Error" => "Erreur de chargement",
 "Pending" => "En cours",
 "1 file uploading" => "1 fichier en cours de téléchargement",
-"files uploading" => "fichiers en cours de téléchargement",
 "Upload cancelled." => "Chargement annulé.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.",
 "Invalid name, '/' is not allowed." => "Nom invalide, '/' n'est pas autorisé.",
-"files scanned" => "fichiers indexés",
 "error while scanning" => "erreur lors de l'indexation",
 "Name" => "Nom",
 "Size" => "Taille",
 "Modified" => "Modifié",
-"folder" => "dossier",
-"folders" => "dossiers",
-"file" => "fichier",
-"files" => "fichiers",
 "seconds ago" => "secondes passées",
 "minute ago" => "minute passée",
 "minutes ago" => "minutes passées",
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index 77e87ee282c..bfb455d37f8 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -9,15 +9,10 @@
 "Files" => "Ficheiros",
 "Unshare" => "Deixar de compartir",
 "Delete" => "Eliminar",
-"already exists" => "xa existe",
 "replace" => "substituír",
 "suggest name" => "suxira nome",
 "cancel" => "cancelar",
-"replaced" => "substituído",
 "undo" => "desfacer",
-"with" => "con",
-"unshared" => "non compartido",
-"deleted" => "eliminado",
 "generating ZIP-file, it may take some time." => "xerando ficheiro ZIP, pode levar un anaco.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Non se puido subir o ficheiro pois ou é un directorio ou ten 0 bytes",
 "Upload Error" => "Erro na subida",
@@ -25,15 +20,10 @@
 "Upload cancelled." => "Subida cancelada.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "A subida do ficheiro está en curso. Saír agora da páxina cancelará a subida.",
 "Invalid name, '/' is not allowed." => "Nome non válido, '/' non está permitido.",
-"files scanned" => "ficheiros analizados",
 "error while scanning" => "erro mentras analizaba",
 "Name" => "Nome",
 "Size" => "Tamaño",
 "Modified" => "Modificado",
-"folder" => "cartafol",
-"folders" => "cartafoles",
-"file" => "ficheiro",
-"files" => "ficheiros",
 "File handling" => "Manexo de ficheiro",
 "Maximum upload size" => "Tamaño máximo de envío",
 "max. possible: " => "máx. posible: ",
diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php
index 84c669cba31..997617673e4 100644
--- a/apps/files/l10n/he.php
+++ b/apps/files/l10n/he.php
@@ -8,7 +8,6 @@
 "Failed to write to disk" => "הכתיבה לכונן נכשלה",
 "Files" => "קבצים",
 "Delete" => "מחיקה",
-"already exists" => "כבר קיים",
 "generating ZIP-file, it may take some time." => "יוצר קובץ ZIP, אנא המתן.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "לא יכול להעלות את הקובץ מכיוון שזו תקיה או שמשקל הקובץ 0 בתים",
 "Upload Error" => "שגיאת העלאה",
@@ -18,10 +17,6 @@
 "Name" => "שם",
 "Size" => "גודל",
 "Modified" => "זמן שינוי",
-"folder" => "תקיה",
-"folders" => "תקיות",
-"file" => "קובץ",
-"files" => "קבצים",
 "File handling" => "טיפול בקבצים",
 "Maximum upload size" => "גודל העלאה מקסימלי",
 "max. possible: " => "המרבי האפשרי: ",
diff --git a/apps/files/l10n/hr.php b/apps/files/l10n/hr.php
index 412c97630d4..767ad6e8166 100644
--- a/apps/files/l10n/hr.php
+++ b/apps/files/l10n/hr.php
@@ -10,33 +10,22 @@
 "Unshare" => "Prekini djeljenje",
 "Delete" => "Briši",
 "Rename" => "Promjeni ime",
-"already exists" => "već postoji",
 "replace" => "zamjeni",
 "suggest name" => "predloži ime",
 "cancel" => "odustani",
-"replaced" => "zamjenjeno",
 "undo" => "vrati",
-"with" => "sa",
-"unshared" => "maknuto djeljenje",
-"deleted" => "izbrisano",
 "generating ZIP-file, it may take some time." => "generiranje ZIP datoteke, ovo može potrajati.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nemoguće poslati datoteku jer je prazna ili je direktorij",
 "Upload Error" => "Pogreška pri slanju",
 "Pending" => "U tijeku",
 "1 file uploading" => "1 datoteka se učitava",
-"files uploading" => "datoteke se učitavaju",
 "Upload cancelled." => "Slanje poništeno.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Učitavanje datoteke. Napuštanjem stranice će prekinuti učitavanje.",
 "Invalid name, '/' is not allowed." => "Neispravan naziv, znak '/' nije dozvoljen.",
-"files scanned" => "datoteka skenirana",
 "error while scanning" => "grečka prilikom skeniranja",
 "Name" => "Naziv",
 "Size" => "Veličina",
 "Modified" => "Zadnja promjena",
-"folder" => "mapa",
-"folders" => "mape",
-"file" => "datoteka",
-"files" => "datoteke",
 "seconds ago" => "sekundi prije",
 "minute ago" => "minutu",
 "minutes ago" => "minuta",
diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
index 0d44e6e157a..1eeca809d64 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -8,13 +8,9 @@
 "Failed to write to disk" => "Nem írható lemezre",
 "Files" => "Fájlok",
 "Delete" => "Törlés",
-"already exists" => "már létezik",
 "replace" => "cserél",
 "cancel" => "mégse",
-"replaced" => "kicserélve",
 "undo" => "visszavon",
-"with" => "-val/-vel",
-"deleted" => "törölve",
 "generating ZIP-file, it may take some time." => "ZIP-fájl generálása, ez eltarthat egy ideig.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nem tölthető fel, mert mappa volt, vagy 0 byte méretű",
 "Upload Error" => "Feltöltési hiba",
@@ -24,10 +20,6 @@
 "Name" => "Név",
 "Size" => "Méret",
 "Modified" => "Módosítva",
-"folder" => "mappa",
-"folders" => "mappák",
-"file" => "fájl",
-"files" => "fájlok",
 "File handling" => "Fájlkezelés",
 "Maximum upload size" => "Maximális feltölthető fájlméret",
 "max. possible: " => "max. lehetséges",
diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
index 07bccdc597d..a11894d1a76 100644
--- a/apps/files/l10n/id.php
+++ b/apps/files/l10n/id.php
@@ -8,13 +8,9 @@
 "Failed to write to disk" => "Gagal menulis ke disk",
 "Files" => "Berkas",
 "Delete" => "Hapus",
-"already exists" => "sudah ada",
 "replace" => "mengganti",
 "cancel" => "batalkan",
-"replaced" => "diganti",
 "undo" => "batal dikerjakan",
-"with" => "dengan",
-"deleted" => "dihapus",
 "generating ZIP-file, it may take some time." => "membuat berkas ZIP, ini mungkin memakan waktu.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Gagal mengunggah berkas anda karena berupa direktori atau mempunyai ukuran 0 byte",
 "Upload Error" => "Terjadi Galat Pengunggahan",
@@ -24,10 +20,6 @@
 "Name" => "Nama",
 "Size" => "Ukuran",
 "Modified" => "Dimodifikasi",
-"folder" => "folder",
-"folders" => "folder-folder",
-"file" => "berkas",
-"files" => "berkas-berkas",
 "File handling" => "Penanganan berkas",
 "Maximum upload size" => "Ukuran unggah maksimum",
 "max. possible: " => "Kemungkinan maks:",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index 86f2ff84fcf..5905fb272ee 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -10,33 +10,22 @@
 "Unshare" => "Rimuovi condivisione",
 "Delete" => "Elimina",
 "Rename" => "Rinomina",
-"already exists" => "esiste già",
 "replace" => "sostituisci",
 "suggest name" => "suggerisci nome",
 "cancel" => "annulla",
-"replaced" => "sostituito",
 "undo" => "annulla",
-"with" => "con",
-"unshared" => "condivisione rimossa",
-"deleted" => "eliminati",
 "generating ZIP-file, it may take some time." => "creazione file ZIP, potrebbe richiedere del tempo.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Impossibile inviare il file poiché è una cartella o ha dimensione 0 byte",
 "Upload Error" => "Errore di invio",
 "Pending" => "In corso",
 "1 file uploading" => "1 file in fase di caricamento",
-"files uploading" => "file in fase di caricamento",
 "Upload cancelled." => "Invio annullato",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento.",
 "Invalid name, '/' is not allowed." => "Nome non valido",
-"files scanned" => "file analizzati",
 "error while scanning" => "errore durante la scansione",
 "Name" => "Nome",
 "Size" => "Dimensione",
 "Modified" => "Modificato",
-"folder" => "cartella",
-"folders" => "cartelle",
-"file" => "file",
-"files" => "file",
 "seconds ago" => "secondi fa",
 "minute ago" => "minuto fa",
 "minutes ago" => "minuti fa",
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index 7aa246f9644..bb764381458 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -10,33 +10,22 @@
 "Unshare" => "共有しない",
 "Delete" => "削除",
 "Rename" => "名前の変更",
-"already exists" => "既に存在します",
 "replace" => "置き換え",
 "suggest name" => "推奨名称",
 "cancel" => "キャンセル",
-"replaced" => "置換：",
 "undo" => "元に戻す",
-"with" => "←",
-"unshared" => "未共有",
-"deleted" => "削除",
 "generating ZIP-file, it may take some time." => "ZIPファイルを生成中です、しばらくお待ちください。",
 "Unable to upload your file as it is a directory or has 0 bytes" => "アップロード使用としているファイルがディレクトリ、もしくはサイズが0バイトのため、アップロードできません。",
 "Upload Error" => "アップロードエラー",
 "Pending" => "保留",
 "1 file uploading" => "ファイルを1つアップロード中",
-"files uploading" => "ファイルをアップロード中",
 "Upload cancelled." => "アップロードはキャンセルされました。",
 "File upload is in progress. Leaving the page now will cancel the upload." => "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。",
 "Invalid name, '/' is not allowed." => "無効な名前、'/' は使用できません。",
-"files scanned" => "ファイルをスキャンしました",
 "error while scanning" => "スキャン中のエラー",
 "Name" => "名前",
 "Size" => "サイズ",
 "Modified" => "更新日時",
-"folder" => "フォルダ",
-"folders" => "フォルダ",
-"file" => "ファイル",
-"files" => "ファイル",
 "seconds ago" => "秒前",
 "minute ago" => "分前",
 "minutes ago" => "分前",
diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php
index e54d696c34e..05db100e189 100644
--- a/apps/files/l10n/ko.php
+++ b/apps/files/l10n/ko.php
@@ -8,13 +8,9 @@
 "Failed to write to disk" => "디스크에 쓰지 못했습니다",
 "Files" => "파일",
 "Delete" => "삭제",
-"already exists" => "이미 존재 합니다",
 "replace" => "대체",
 "cancel" => "취소",
-"replaced" => "대체됨",
 "undo" => "복구",
-"with" => "와",
-"deleted" => "삭제",
 "generating ZIP-file, it may take some time." => "ZIP파일 생성에 시간이 걸릴 수 있습니다.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "이 파일은 디렉토리이거나 0 바이트이기 때문에 업로드 할 수 없습니다.",
 "Upload Error" => "업로드 에러",
@@ -24,10 +20,6 @@
 "Name" => "이름",
 "Size" => "크기",
 "Modified" => "수정됨",
-"folder" => "폴더",
-"folders" => "폴더",
-"file" => "파일",
-"files" => "파일",
 "File handling" => "파일 처리",
 "Maximum upload size" => "최대 업로드 크기",
 "max. possible: " => "최대. 가능한:",
diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php
index a51980348c7..aed0938ff04 100644
--- a/apps/files/l10n/lb.php
+++ b/apps/files/l10n/lb.php
@@ -8,13 +8,9 @@
 "Failed to write to disk" => "Konnt net op den Disk schreiwen",
 "Files" => "Dateien",
 "Delete" => "Läschen",
-"already exists" => "existéiert schonn",
 "replace" => "ersetzen",
 "cancel" => "ofbriechen",
-"replaced" => "ersat",
 "undo" => "réckgängeg man",
-"with" => "mat",
-"deleted" => "geläscht",
 "generating ZIP-file, it may take some time." => "Et  gëtt eng ZIP-File generéiert, dëst ka bëssen daueren.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Kann deng Datei net eroplueden well et en Dossier ass oder 0 byte grouss ass.",
 "Upload Error" => "Fehler beim eroplueden",
@@ -24,10 +20,6 @@
 "Name" => "Numm",
 "Size" => "Gréisst",
 "Modified" => "Geännert",
-"folder" => "Dossier",
-"folders" => "Dossieren",
-"file" => "Datei",
-"files" => "Dateien",
 "File handling" => "Fichier handling",
 "Maximum upload size" => "Maximum Upload Gréisst ",
 "max. possible: " => "max. méiglech:",
diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php
index 47a79c4a5a0..a6d8f6905bc 100644
--- a/apps/files/l10n/lt_LT.php
+++ b/apps/files/l10n/lt_LT.php
@@ -18,10 +18,6 @@
 "Name" => "Pavadinimas",
 "Size" => "Dydis",
 "Modified" => "Pakeista",
-"folder" => "katalogas",
-"folders" => "katalogai",
-"file" => "failas",
-"files" => "failai",
 "File handling" => "Failų tvarkymas",
 "Maximum upload size" => "Maksimalus įkeliamo failo dydis",
 "Enable ZIP-download" => "Įjungti atsisiuntimą ZIP archyvu",
diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php
index 813d693f94a..835416c301b 100644
--- a/apps/files/l10n/lv.php
+++ b/apps/files/l10n/lv.php
@@ -3,13 +3,9 @@
 "Failed to write to disk" => "Nav iespējams saglabāt",
 "Files" => "Faili",
 "Delete" => "Izdzēst",
-"already exists" => "tāds fails jau eksistē",
 "replace" => "aizvietot",
 "cancel" => "atcelt",
-"replaced" => "aizvietots",
 "undo" => "vienu soli atpakaļ",
-"with" => "ar",
-"deleted" => "izdzests",
 "generating ZIP-file, it may take some time." => "lai uzģenerētu ZIP failu, kāds brīdis ir jāpagaida",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nav iespējams augšuplādēt jūsu failu, jo tāds jau eksistē vai arī failam nav izmēra (0 baiti)",
 "Upload Error" => "Augšuplādēšanas laikā radās kļūda",
@@ -19,10 +15,6 @@
 "Name" => "Nosaukums",
 "Size" => "Izmērs",
 "Modified" => "Izmainīts",
-"folder" => "mape",
-"folders" => "mapes",
-"file" => "fails",
-"files" => "faili",
 "Maximum upload size" => "Maksimālais failu augšuplādes apjoms",
 "max. possible: " => "maksīmālais iespējamais:",
 "Enable ZIP-download" => "Iespējot ZIP lejuplādi",
diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php
index f4aee5ba178..f8953fbaef6 100644
--- a/apps/files/l10n/mk.php
+++ b/apps/files/l10n/mk.php
@@ -17,10 +17,6 @@
 "Name" => "Име",
 "Size" => "Големина",
 "Modified" => "Променето",
-"folder" => "фолдер",
-"folders" => "фолдери",
-"file" => "датотека",
-"files" => "датотеки",
 "File handling" => "Ракување со датотеки",
 "Maximum upload size" => "Максимална големина за подигање",
 "max. possible: " => "макс. можно:",
diff --git a/apps/files/l10n/ms_MY.php b/apps/files/l10n/ms_MY.php
index bfa47969b3c..95f1b418c7e 100644
--- a/apps/files/l10n/ms_MY.php
+++ b/apps/files/l10n/ms_MY.php
@@ -8,12 +8,8 @@
 "Failed to write to disk" => "Gagal untuk disimpan",
 "Files" => "fail",
 "Delete" => "Padam",
-"already exists" => "Sudah wujud",
 "replace" => "ganti",
 "cancel" => "Batal",
-"replaced" => "diganti",
-"with" => "dengan",
-"deleted" => "dihapus",
 "generating ZIP-file, it may take some time." => "sedang menghasilkan fail ZIP, mungkin mengambil sedikit masa.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Tidak boleh memuatnaik fail anda kerana mungkin ianya direktori atau saiz fail 0 bytes",
 "Upload Error" => "Muat naik ralat",
@@ -23,10 +19,6 @@
 "Name" => "Nama ",
 "Size" => "Saiz",
 "Modified" => "Dimodifikasi",
-"folder" => "direktori",
-"folders" => "direktori",
-"file" => "fail",
-"files" => "fail",
 "File handling" => "Pengendalian fail",
 "Maximum upload size" => "Saiz maksimum muat naik",
 "max. possible: " => "maksimum:",
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index f1cd054b1df..c6bb0b0552e 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -10,33 +10,22 @@
 "Unshare" => "Avslutt deling",
 "Delete" => "Slett",
 "Rename" => "Omdøp",
-"already exists" => "eksisterer allerede",
 "replace" => "erstatt",
 "suggest name" => "foreslå navn",
 "cancel" => "avbryt",
-"replaced" => "erstattet",
 "undo" => "angre",
-"with" => "med",
-"unshared" => "deling avsluttet",
-"deleted" => "slettet",
 "generating ZIP-file, it may take some time." => "opprettet ZIP-fil, dette kan ta litt tid",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes",
 "Upload Error" => "Opplasting feilet",
 "Pending" => "Ventende",
 "1 file uploading" => "1 fil lastes opp",
-"files uploading" => "filer lastes opp",
 "Upload cancelled." => "Opplasting avbrutt.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.",
 "Invalid name, '/' is not allowed." => "Ugyldig navn, '/' er ikke tillatt. ",
-"files scanned" => "Filer skannet",
 "error while scanning" => "feil under skanning",
 "Name" => "Navn",
 "Size" => "Størrelse",
 "Modified" => "Endret",
-"folder" => "mappe",
-"folders" => "mapper",
-"file" => "fil",
-"files" => "filer",
 "seconds ago" => "sekunder siden",
 "minute ago" => "minutt siden",
 "minutes ago" => "minutter siden",
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index 5f7f03a3d81..fa0a28f1c09 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -10,33 +10,22 @@
 "Unshare" => "Stop delen",
 "Delete" => "Verwijder",
 "Rename" => "Hernoem",
-"already exists" => "bestaat al",
 "replace" => "vervang",
 "suggest name" => "Stel een naam voor",
 "cancel" => "annuleren",
-"replaced" => "vervangen",
 "undo" => "ongedaan maken",
-"with" => "door",
-"unshared" => "niet gedeeld",
-"deleted" => "verwijderd",
 "generating ZIP-file, it may take some time." => "aanmaken ZIP-file, dit kan enige tijd duren.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "uploaden van de file mislukt, het is of een directory of de bestandsgrootte is 0 bytes",
 "Upload Error" => "Upload Fout",
 "Pending" => "Wachten",
 "1 file uploading" => "1 bestand wordt ge-upload",
-"files uploading" => "Bestanden aan het uploaden",
 "Upload cancelled." => "Uploaden geannuleerd.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Bestands upload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.",
 "Invalid name, '/' is not allowed." => "Ongeldige naam, '/' is niet toegestaan.",
-"files scanned" => "Gescande bestanden",
 "error while scanning" => "Fout tijdens het scannen",
 "Name" => "Naam",
 "Size" => "Bestandsgrootte",
 "Modified" => "Laatst aangepast",
-"folder" => "map",
-"folders" => "mappen",
-"file" => "bestand",
-"files" => "bestanden",
 "seconds ago" => "seconden geleden",
 "minute ago" => "minuut geleden",
 "minutes ago" => "minuten geleden",
diff --git a/apps/files/l10n/oc.php b/apps/files/l10n/oc.php
index 3f70761e903..a171fd8e631 100644
--- a/apps/files/l10n/oc.php
+++ b/apps/files/l10n/oc.php
@@ -10,33 +10,22 @@
 "Unshare" => "Non parteja",
 "Delete" => "Escafa",
 "Rename" => "Torna nomenar",
-"already exists" => "existís jà",
 "replace" => "remplaça",
 "suggest name" => "nom prepausat",
 "cancel" => "anulla",
-"replaced" => "remplaçat",
 "undo" => "defar",
-"with" => "amb",
-"unshared" => "Non partejat",
-"deleted" => "escafat",
 "generating ZIP-file, it may take some time." => "Fichièr ZIP a se far, aquò pòt trigar un briu.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Impossible d'amontcargar lo teu fichièr qu'es un repertòri o que ten pas que 0 octet.",
 "Upload Error" => "Error d'amontcargar",
 "Pending" => "Al esperar",
 "1 file uploading" => "1 fichièr al amontcargar",
-"files uploading" => "fichièrs al amontcargar",
 "Upload cancelled." => "Amontcargar anullat.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo cargament. ",
 "Invalid name, '/' is not allowed." => "Nom invalid, '/' es pas permis.",
-"files scanned" => "Fichièr explorat",
 "error while scanning" => "error pendant l'exploracion",
 "Name" => "Nom",
 "Size" => "Talha",
 "Modified" => "Modificat",
-"folder" => "Dorsièr",
-"folders" => "Dorsièrs",
-"file" => "fichièr",
-"files" => "fichièrs",
 "seconds ago" => "secondas",
 "minute ago" => "minuta",
 "minutes ago" => "minutas",
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index 425c6a5a18d..62569bb3789 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -10,33 +10,22 @@
 "Unshare" => "Nie udostępniaj",
 "Delete" => "Usuwa element",
 "Rename" => "Zmień nazwę",
-"already exists" => "Już istnieje",
 "replace" => "zastap",
 "suggest name" => "zasugeruj nazwÄ™",
 "cancel" => "anuluj",
-"replaced" => "zastÄ…pione",
 "undo" => "wróć",
-"with" => "z",
-"unshared" => "Nie udostępnione",
-"deleted" => "skasuj",
 "generating ZIP-file, it may take some time." => "Generowanie pliku ZIP, może potrwać pewien czas.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nie można wczytać pliku jeśli jest katalogiem lub ma 0 bajtów",
 "Upload Error" => "BÅ‚Ä…d wczytywania",
 "Pending" => "OczekujÄ…ce",
 "1 file uploading" => "1 plik wczytany",
-"files uploading" => "pliki wczytane",
 "Upload cancelled." => "Wczytywanie anulowane.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Wysyłanie pliku jest w toku. Teraz opuszczając stronę wysyłanie zostanie anulowane.",
 "Invalid name, '/' is not allowed." => "Nieprawidłowa nazwa '/' jest niedozwolone.",
-"files scanned" => "Pliki skanowane",
 "error while scanning" => "Wystąpił błąd podczas skanowania",
 "Name" => "Nazwa",
 "Size" => "Rozmiar",
 "Modified" => "Czas modyfikacji",
-"folder" => "folder",
-"folders" => "foldery",
-"file" => "plik",
-"files" => "pliki",
 "seconds ago" => "sekund temu",
 "minute ago" => "minutÄ™ temu",
 "minutes ago" => "minut temu",
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index 59ec8a8a018..3e57e2c39e1 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -10,33 +10,22 @@
 "Unshare" => "Descompartilhar",
 "Delete" => "Excluir",
 "Rename" => "Renomear",
-"already exists" => "já existe",
 "replace" => "substituir",
 "suggest name" => "sugerir nome",
 "cancel" => "cancelar",
-"replaced" => "substituido ",
 "undo" => "desfazer",
-"with" => "com",
-"unshared" => "descompartilhado",
-"deleted" => "deletado",
 "generating ZIP-file, it may take some time." => "gerando arquivo ZIP, isso pode levar um tempo.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Impossível enviar seus arquivo como diretório ou ele tem 0 bytes.",
 "Upload Error" => "Erro de envio",
 "Pending" => "Pendente",
 "1 file uploading" => "enviando 1 arquivo",
-"files uploading" => "enviando arquivos",
 "Upload cancelled." => "Envio cancelado.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Upload em andamento. Sair da página agora resultará no cancelamento do envio.",
 "Invalid name, '/' is not allowed." => "Nome inválido, '/' não é permitido.",
-"files scanned" => "arquivos verificados",
 "error while scanning" => "erro durante verificação",
 "Name" => "Nome",
 "Size" => "Tamanho",
 "Modified" => "Modificado",
-"folder" => "pasta",
-"folders" => "pastas",
-"file" => "arquivo",
-"files" => "arquivos",
 "seconds ago" => "segundos atrás",
 "minute ago" => "minuto atrás",
 "minutes ago" => "minutos atrás",
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index 5968769f2a1..c702b70e759 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -10,33 +10,22 @@
 "Unshare" => "Deixar de partilhar",
 "Delete" => "Apagar",
 "Rename" => "Renomear",
-"already exists" => "já existe",
 "replace" => "substituir",
 "suggest name" => "Sugira um nome",
 "cancel" => "cancelar",
-"replaced" => "substituído",
 "undo" => "desfazer",
-"with" => "com",
-"unshared" => "não partilhado",
-"deleted" => "apagado",
 "generating ZIP-file, it may take some time." => "a gerar o ficheiro ZIP, poderá demorar algum tempo.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Não é possível fazer o envio do ficheiro devido a ser uma pasta ou ter 0 bytes",
 "Upload Error" => "Erro no envio",
 "Pending" => "Pendente",
 "1 file uploading" => "A enviar 1 ficheiro",
-"files uploading" => "ficheiros a serem enviados",
 "Upload cancelled." => "O envio foi cancelado.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página agora.",
 "Invalid name, '/' is not allowed." => "Nome inválido, '/' não permitido.",
-"files scanned" => "ficheiros analisados",
 "error while scanning" => "erro ao analisar",
 "Name" => "Nome",
 "Size" => "Tamanho",
 "Modified" => "Modificado",
-"folder" => "pasta",
-"folders" => "pastas",
-"file" => "ficheiro",
-"files" => "ficheiros",
 "seconds ago" => "há segundos",
 "minute ago" => "há um minuto",
 "minutes ago" => "há minutos",
diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php
index 8d651e23827..f05cd25462e 100644
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@@ -10,33 +10,22 @@
 "Unshare" => "Anulează partajarea",
 "Delete" => "Șterge",
 "Rename" => "Redenumire",
-"already exists" => "deja există",
 "replace" => "înlocuire",
 "suggest name" => "sugerează nume",
 "cancel" => "anulare",
-"replaced" => "înlocuit",
 "undo" => "Anulează ultima acțiune",
-"with" => "cu",
-"unshared" => "nepartajat",
-"deleted" => "șters",
 "generating ZIP-file, it may take some time." => "se generază fișierul ZIP, va dura ceva timp.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nu s-a putut încărca fișierul tău deoarece pare să fie un director sau are 0 bytes.",
 "Upload Error" => "Eroare la încărcare",
 "Pending" => "În așteptare",
 "1 file uploading" => "un fișier se încarcă",
-"files uploading" => "fișiere se încarcă",
 "Upload cancelled." => "Încărcare anulată.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea.",
 "Invalid name, '/' is not allowed." => "Nume invalid, '/' nu este permis.",
-"files scanned" => "fișiere scanate",
 "error while scanning" => "eroare la scanarea",
 "Name" => "Nume",
 "Size" => "Dimensiune",
 "Modified" => "Modificat",
-"folder" => "director",
-"folders" => "directoare",
-"file" => "fișier",
-"files" => "fișiere",
 "seconds ago" => "secunde în urmă",
 "minute ago" => "minut în urmă",
 "minutes ago" => "minute în urmă",
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 64010937fdb..42241d4b931 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -10,31 +10,21 @@
 "Unshare" => "Отменить публикацию",
 "Delete" => "Удалить",
 "Rename" => "Переименовать",
-"already exists" => "уже существует",
 "replace" => "заменить",
 "suggest name" => "предложить название",
 "cancel" => "отмена",
-"replaced" => "заменён",
 "undo" => "отмена",
-"with" => "с",
-"unshared" => "публикация отменена",
-"deleted" => "удален",
 "generating ZIP-file, it may take some time." => "создание ZIP-файла, это может занять некоторое время.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Не удается загрузить файл размером 0 байт в каталог",
 "Upload Error" => "Ошибка загрузки",
 "Pending" => "Ожидание",
 "1 file uploading" => "загружается 1 файл",
-"files uploading" => "загружаются файлы",
 "Upload cancelled." => "Загрузка отменена.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Файл в процессе загрузки. Покинув страницу вы прервёте загрузку.",
 "Invalid name, '/' is not allowed." => "Неверное имя, '/' не допускается.",
 "Name" => "Название",
 "Size" => "Размер",
 "Modified" => "Изменён",
-"folder" => "папка",
-"folders" => "папки",
-"file" => "файл",
-"files" => "файлы",
 "minute ago" => "минуту назад",
 "today" => "сегодня",
 "yesterday" => "вчера",
diff --git a/apps/files/l10n/ru_RU.php b/apps/files/l10n/ru_RU.php
index 34e9d19ca33..2783dbdda9a 100644
--- a/apps/files/l10n/ru_RU.php
+++ b/apps/files/l10n/ru_RU.php
@@ -10,33 +10,22 @@
 "Unshare" => "Скрыть",
 "Delete" => "Удалить",
 "Rename" => "Переименовать",
-"already exists" => "уже существует",
 "replace" => "отмена",
 "suggest name" => "подобрать название",
 "cancel" => "отменить",
-"replaced" => "заменено",
 "undo" => "отменить действие",
-"with" => "с",
-"unshared" => "скрытый",
-"deleted" => "удалено",
 "generating ZIP-file, it may take some time." => "Создание ZIP-файла, это может занять некоторое время.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Невозможно загрузить файл,\n так как он имеет нулевой размер или является директорией",
 "Upload Error" => "Ошибка загрузки",
 "Pending" => "Ожидающий решения",
 "1 file uploading" => "загрузка 1 файла",
-"files uploading" => "загрузка файлов",
 "Upload cancelled." => "Загрузка отменена",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Процесс загрузки файла. Если покинуть страницу сейчас, загрузка будет отменена.",
 "Invalid name, '/' is not allowed." => "Неправильное имя, '/' не допускается.",
-"files scanned" => "файлы отсканированы",
 "error while scanning" => "ошибка при сканировании",
 "Name" => "Имя",
 "Size" => "Размер",
 "Modified" => "Изменен",
-"folder" => "папка",
-"folders" => "папки",
-"file" => "файл",
-"files" => "файлы",
 "seconds ago" => "секунд назад",
 "minute ago" => "минуту назад",
 "minutes ago" => "минут назад",
diff --git a/apps/files/l10n/si_LK.php b/apps/files/l10n/si_LK.php
index 97a125faff1..67247b5b094 100644
--- a/apps/files/l10n/si_LK.php
+++ b/apps/files/l10n/si_LK.php
@@ -5,10 +5,6 @@
 "Files" => "ගොනු",
 "Name" => "නම",
 "Size" => "ප්‍රමාණය",
-"folder" => "ෆෝල්ඩරය",
-"folders" => "ෆෝල්ඩර",
-"file" => "ගොනුව",
-"files" => "ගොනු",
 "Maximum upload size" => "උඩුගත කිරීමක උපරිම ප්‍රමාණය",
 "New" => "නව",
 "Folder" => "ෆෝල්ඩරය",
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index 787e903ac8e..526c78273c2 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -10,33 +10,22 @@
 "Unshare" => "Nezdielať",
 "Delete" => "Odstrániť",
 "Rename" => "Premenovať",
-"already exists" => "už existuje",
 "replace" => "nahradiť",
 "suggest name" => "pomôcť s menom",
 "cancel" => "zrušiť",
-"replaced" => "zmenené",
 "undo" => "vrátiť",
-"with" => "s",
-"unshared" => "zdielané",
-"deleted" => "zmazané",
 "generating ZIP-file, it may take some time." => "generujem ZIP-súbor, môže to chvíľu trvať.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nemôžem nahrať súbor lebo je to priečinok alebo má 0 bajtov.",
 "Upload Error" => "Chyba odosielania",
 "Pending" => "Čaká sa",
 "1 file uploading" => "1 súbor sa posiela ",
-"files uploading" => "súbory sa posielajú",
 "Upload cancelled." => "Odosielanie zrušené",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Opustenie stránky zruší práve prebiehajúce odosielanie súboru.",
 "Invalid name, '/' is not allowed." => "Chybný názov, \"/\" nie je povolené",
-"files scanned" => "skontrolovaných súborov",
 "error while scanning" => "chyba počas kontroly",
 "Name" => "Meno",
 "Size" => "Veľkosť",
 "Modified" => "Upravené",
-"folder" => "priečinok",
-"folders" => "priečinky",
-"file" => "súbor",
-"files" => "súbory",
 "seconds ago" => "pred sekundami",
 "minute ago" => "pred minútou",
 "minutes ago" => "pred minútami",
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index 2a733d2c26a..f487ba584ef 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -10,15 +10,10 @@
 "Unshare" => "Odstrani iz souporabe",
 "Delete" => "Izbriši",
 "Rename" => "Preimenuj",
-"already exists" => "že obstaja",
 "replace" => "nadomesti",
 "suggest name" => "predlagaj ime",
 "cancel" => "ekliči",
-"replaced" => "nadomeščen",
 "undo" => "razveljavi",
-"with" => "z",
-"unshared" => "odstranjeno iz souporabe",
-"deleted" => "izbrisano",
 "generating ZIP-file, it may take some time." => "Ustvarjam ZIP datoteko. To lahko traja nekaj časa.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nalaganje ni mogoče, saj gre za mapo, ali pa ima datoteka velikost 0 bajtov.",
 "Upload Error" => "Napaka pri nalaganju",
@@ -26,15 +21,10 @@
 "Upload cancelled." => "Nalaganje je bilo preklicano.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Nalaganje datoteke je v teku. ÄŒe zapustite to stran zdaj, boste nalaganje preklicali.",
 "Invalid name, '/' is not allowed." => "Neveljavno ime. Znak '/' ni dovoljen.",
-"files scanned" => "pregledanih datotek",
 "error while scanning" => "napaka med pregledovanjem datotek",
 "Name" => "Ime",
 "Size" => "Velikost",
 "Modified" => "Spremenjeno",
-"folder" => "mapa",
-"folders" => "mape",
-"file" => "datoteka",
-"files" => "datoteke",
 "File handling" => "Rokovanje z datotekami",
 "Maximum upload size" => "Največja velikost za nalaganje",
 "max. possible: " => "največ mogoče:",
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index d5dcf1ad2e8..be947cf963b 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -10,33 +10,22 @@
 "Unshare" => "Sluta dela",
 "Delete" => "Radera",
 "Rename" => "Byt namn",
-"already exists" => "finns redan",
 "replace" => "ersätt",
 "suggest name" => "föreslå namn",
 "cancel" => "avbryt",
-"replaced" => "ersatt",
 "undo" => "Ã¥ngra",
-"with" => "med",
-"unshared" => "Ej delad",
-"deleted" => "raderad",
 "generating ZIP-file, it may take some time." => "genererar ZIP-fil, det kan ta lite tid.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Kunde inte ladda upp dina filer eftersom det antingen är en mapp eller har 0 bytes.",
 "Upload Error" => "Uppladdningsfel",
 "Pending" => "Väntar",
 "1 file uploading" => "1 filuppladdning",
-"files uploading" => "filer laddas upp",
 "Upload cancelled." => "Uppladdning avbruten.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.",
 "Invalid name, '/' is not allowed." => "Ogiltigt namn, '/' är inte tillåten.",
-"files scanned" => "filer skannade",
 "error while scanning" => "fel vid skanning",
 "Name" => "Namn",
 "Size" => "Storlek",
 "Modified" => "Ändrad",
-"folder" => "mapp",
-"folders" => "mappar",
-"file" => "fil",
-"files" => "filer",
 "seconds ago" => "sekunder sedan",
 "minute ago" => "minut sedan",
 "minutes ago" => "minuter sedan",
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index dc94ddc7de5..0d725cd529f 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -10,33 +10,22 @@
 "Unshare" => "ยกเลิกการแชร์ข้อมูล",
 "Delete" => "ลบ",
 "Rename" => "เปลี่ยนชื่อ",
-"already exists" => "มีอยู่แล้ว",
 "replace" => "แทนที่",
 "suggest name" => "แนะนำชื่อ",
 "cancel" => "ยกเลิก",
-"replaced" => "แทนที่แล้ว",
 "undo" => "เลิกทำ",
-"with" => "กับ",
-"unshared" => "ยกเลิกการแชร์ข้อมูลแล้ว",
-"deleted" => "ลบแล้ว",
 "generating ZIP-file, it may take some time." => "กำลังสร้างไฟล์บีบอัด ZIP อาจใช้เวลาสักครู่",
 "Unable to upload your file as it is a directory or has 0 bytes" => "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่หรือมีขนาด 0 ไบต์",
 "Upload Error" => "เกิดข้อผิดพลาดในการอัพโหลด",
 "Pending" => "อยู่ระหว่างดำเนินการ",
 "1 file uploading" => "กำลังอัพโหลดไฟล์ 1 ไฟล์",
-"files uploading" => "การอัพโหลดไฟล์",
 "Upload cancelled." => "การอัพโหลดถูกยกเลิก",
 "File upload is in progress. Leaving the page now will cancel the upload." => "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก",
 "Invalid name, '/' is not allowed." => "ชื่อที่ใช้ไม่ถูกต้อง '/' ไม่อนุญาตให้ใช้งาน",
-"files scanned" => "ไฟล์ต่างๆได้รับการสแกนแล้ว",
 "error while scanning" => "พบข้อผิดพลาดในระหว่างการสแกนไฟล์",
 "Name" => "ชื่อ",
 "Size" => "ขนาด",
 "Modified" => "ปรับปรุงล่าสุด",
-"folder" => "โฟลเดอร์",
-"folders" => "โฟลเดอร์",
-"file" => "ไฟล์",
-"files" => "ไฟล์",
 "seconds ago" => "วินาที ก่อนหน้านี้",
 "minute ago" => "นาที ที่ผ่านมา",
 "minutes ago" => "นาที ที่ผ่านมา",
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index bcbee7c5aca..d9a619353d1 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -8,13 +8,9 @@
 "Failed to write to disk" => "Diske yazılamadı",
 "Files" => "Dosyalar",
 "Delete" => "Sil",
-"already exists" => "zaten mevcut",
 "replace" => "deÄŸiÅŸtir",
 "cancel" => "iptal",
-"replaced" => "deÄŸiÅŸtirildi",
 "undo" => "geri al",
-"with" => "ile",
-"deleted" => "silindi",
 "generating ZIP-file, it may take some time." => "ZIP dosyası oluşturuluyor, biraz sürebilir.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Dosyanızın boyutu 0 byte olduğundan veya bir dizin olduğundan yüklenemedi",
 "Upload Error" => "Yükleme hatası",
@@ -25,10 +21,6 @@
 "Name" => "Ad",
 "Size" => "Boyut",
 "Modified" => "DeÄŸiÅŸtirilme",
-"folder" => "dizin",
-"folders" => "dizinler",
-"file" => "dosya",
-"files" => "dosyalar",
 "File handling" => "Dosya taşıma",
 "Maximum upload size" => "Maksimum yükleme boyutu",
 "max. possible: " => "mümkün olan en fazla: ",
diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index 7e72683b8ba..6276b6074ca 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -8,7 +8,6 @@
 "Files" => "Файли",
 "Delete" => "Видалити",
 "undo" => "відмінити",
-"deleted" => "видалені",
 "generating ZIP-file, it may take some time." => "Створення ZIP-файлу, це може зайняти певний час.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Неможливо завантажити ваш файл тому, що він тека або файл розміром 0 байт",
 "Upload Error" => "Помилка завантаження",
@@ -18,10 +17,6 @@
 "Name" => "Ім'я",
 "Size" => "Розмір",
 "Modified" => "Змінено",
-"folder" => "тека",
-"folders" => "теки",
-"file" => "файл",
-"files" => "файли",
 "Maximum upload size" => "Максимальний розмір відвантажень",
 "max. possible: " => "макс.можливе:",
 "0 is unlimited" => "0 є безліміт",
diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php
index a519c1a2ba1..efe9a544d83 100644
--- a/apps/files/l10n/vi.php
+++ b/apps/files/l10n/vi.php
@@ -10,33 +10,22 @@
 "Unshare" => "Không chia sẽ",
 "Delete" => "Xóa",
 "Rename" => "Sửa tên",
-"already exists" => "đã tồn tại",
 "replace" => "thay thế",
 "suggest name" => "tên gợi ý",
 "cancel" => "hủy",
-"replaced" => "đã được thay thế",
 "undo" => "lùi lại",
-"with" => "vá»›i",
-"unshared" => "gỡ chia sẻ",
-"deleted" => "đã xóa",
 "generating ZIP-file, it may take some time." => "Tạo tập tinh ZIP, điều này có thể mất một ít thời gian",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Không thể tải lên tập tin này do nó là một thư mục hoặc kích thước tập tin bằng 0 byte",
 "Upload Error" => "Tải lên lỗi",
 "Pending" => "Chờ",
 "1 file uploading" => "1 tệp tin đang được tải lên",
-"files uploading" => "tệp tin đang được tải lên",
 "Upload cancelled." => "Hủy tải lên",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này.",
 "Invalid name, '/' is not allowed." => "Tên không hợp lệ ,không được phép dùng '/'",
-"files scanned" => "tệp tin đã quét",
 "error while scanning" => "lỗi trong khi quét",
 "Name" => "Tên",
 "Size" => "Kích cỡ",
 "Modified" => "Thay đổi",
-"folder" => "folder",
-"folders" => "folders",
-"file" => "file",
-"files" => "files",
 "seconds ago" => "giây trước",
 "minute ago" => "một phút trước",
 "minutes ago" => "phút trước",
diff --git a/apps/files/l10n/zh_CN.GB2312.php b/apps/files/l10n/zh_CN.GB2312.php
index 8d4ae972b9b..17ca450432b 100644
--- a/apps/files/l10n/zh_CN.GB2312.php
+++ b/apps/files/l10n/zh_CN.GB2312.php
@@ -10,33 +10,22 @@
 "Unshare" => "取消共享",
 "Delete" => "删除",
 "Rename" => "重命名",
-"already exists" => "已经存在了",
 "replace" => "替换",
 "suggest name" => "推荐名称",
 "cancel" => "取消",
-"replaced" => "替换过了",
 "undo" => "撤销",
-"with" => "随着",
-"unshared" => "已取消共享",
-"deleted" => "删除",
 "generating ZIP-file, it may take some time." => "正在生成ZIP文件,这可能需要点时间",
 "Unable to upload your file as it is a directory or has 0 bytes" => "不能上传你指定的文件,可能因为它是个文件夹或者大小为0",
 "Upload Error" => "上传错误",
 "Pending" => "Pending",
 "1 file uploading" => "1 个文件正在上传",
-"files uploading" => "个文件正在上传",
 "Upload cancelled." => "上传取消了",
 "File upload is in progress. Leaving the page now will cancel the upload." => "文件正在上传。关闭页面会取消上传。",
 "Invalid name, '/' is not allowed." => "非法文件名,\"/\"是不被许可的",
-"files scanned" => "文件已扫描",
 "error while scanning" => "扫描出错",
 "Name" => "名字",
 "Size" => "大小",
 "Modified" => "修改日期",
-"folder" => "文件夹",
-"folders" => "文件夹",
-"file" => "文件",
-"files" => "文件",
 "seconds ago" => "秒前",
 "minute ago" => "分钟前",
 "minutes ago" => "分钟前",
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index f2ea43ae81e..61210dcbee3 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -10,33 +10,22 @@
 "Unshare" => "取消分享",
 "Delete" => "删除",
 "Rename" => "重命名",
-"already exists" => "已经存在",
 "replace" => "替换",
 "suggest name" => "建议名称",
 "cancel" => "取消",
-"replaced" => "已经替换",
 "undo" => "撤销",
-"with" => "随着",
-"unshared" => "已取消分享",
-"deleted" => "已经删除",
 "generating ZIP-file, it may take some time." => "正在生成 ZIP 文件，可能需要一些时间",
 "Unable to upload your file as it is a directory or has 0 bytes" => "无法上传文件，因为它是一个目录或者大小为 0 字节",
 "Upload Error" => "上传错误",
 "Pending" => "操作等待中",
 "1 file uploading" => "1个文件上传中",
-"files uploading" => "文件上传中",
 "Upload cancelled." => "上传已取消",
 "File upload is in progress. Leaving the page now will cancel the upload." => "文件正在上传中。现在离开此页会导致上传动作被取消。",
 "Invalid name, '/' is not allowed." => "非法的名称，不允许使用‘/’。",
-"files scanned" => "已扫描文件",
 "error while scanning" => "扫描时出错",
 "Name" => "名称",
 "Size" => "大小",
 "Modified" => "修改日期",
-"folder" => "文件夹",
-"folders" => "文件夹",
-"file" => "文件",
-"files" => "文件",
 "seconds ago" => "几秒前",
 "minute ago" => "1分钟前",
 "minutes ago" => "分钟前",
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index 30ab1901a20..9013a752bc2 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -8,7 +8,6 @@
 "Failed to write to disk" => "寫入硬碟失敗",
 "Files" => "檔案",
 "Delete" => "刪除",
-"already exists" => "已經存在",
 "replace" => "取代",
 "cancel" => "取消",
 "generating ZIP-file, it may take some time." => "產生壓縮檔, 它可能需要一段時間.",
diff --git a/apps/files_external/l10n/zh_CN.php b/apps/files_external/l10n/zh_CN.php
new file mode 100644
index 00000000000..5dd78d9f9c9
--- /dev/null
+++ b/apps/files_external/l10n/zh_CN.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"Please provide a valid Dropbox app key and secret." => "请提供有效的Dropbox应用key和secret",
+"Error configuring Google Drive storage" => "配置Google Drive存储时出错",
+"External Storage" => "外部存储",
+"Mount point" => "挂载点",
+"Backend" => "后端",
+"Configuration" => "配置",
+"Options" => "选项",
+"Add mount point" => "增加挂载点",
+"All Users" => "所有用户",
+"Groups" => "组",
+"Users" => "用户",
+"Delete" => "删除",
+"Enable User External Storage" => "启用用户外部存储",
+"Allow users to mount their own external storage" => "允许用户挂载自有外部存储",
+"SSL root certificates" => "SSL根证书",
+"Import Root Certificate" => "导入根证书"
+);
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index d329b920302..63f337f9c56 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Error en compartir",
 "Error while unsharing" => "Error en deixar de compartir",
 "Error while changing permissions" => "Error en canviar els permisos",
-"Shared with you and the group" => "Compartit amb vós i amb el grup",
-"by" => "per",
-"Shared with you by" => "compartit amb vós per",
 "Share with" => "Comparteix amb",
 "Share with link" => "Comparteix amb enllaç",
 "Password protect" => "Protegir amb contrasenya",
@@ -37,8 +34,6 @@
 "Share via email:" => "Comparteix per correu electrònic",
 "No people found" => "No s'ha trobat ningú",
 "Resharing is not allowed" => "No es permet compartir de nou",
-"Shared in" => "Compartit en",
-"with" => "amb",
 "Unshare" => "Deixa de compartir",
 "can edit" => "pot editar",
 "access control" => "control d'accés",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index a6e0d42dac3..9ccb3b01430 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Chyba při sdílení",
 "Error while unsharing" => "Chyba při rušení sdílení",
 "Error while changing permissions" => "Chyba při změně oprávnění",
-"Shared with you and the group" => "S Vámi a skupinou",
-"by" => "sdílí",
-"Shared with you by" => "S Vámi sdílí",
 "Share with" => "Sdílet s",
 "Share with link" => "Sdílet s odkazem",
 "Password protect" => "Chránit heslem",
@@ -37,8 +34,6 @@
 "Share via email:" => "Sdílet e-mailem:",
 "No people found" => "Žádní lidé nenalezeni",
 "Resharing is not allowed" => "Sdílení již sdílené položky není povoleno",
-"Shared in" => "Sdíleno v",
-"with" => "s",
 "Unshare" => "Zrušit sdílení",
 "can edit" => "lze upravovat",
 "access control" => "řízení přístupu",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 5a56b670859..6d925e5b616 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Fejl under deling",
 "Error while unsharing" => "Fejl under annullering af deling",
 "Error while changing permissions" => "Fejl under justering af rettigheder",
-"Shared with you and the group" => "Delt med dig og gruppen",
-"by" => "af",
-"Shared with you by" => "Delt med dig af",
 "Share with" => "Del med",
 "Share with link" => "Del med link",
 "Password protect" => "Beskyt med adgangskode",
@@ -37,8 +34,6 @@
 "Share via email:" => "Del via email:",
 "No people found" => "Ingen personer fundet",
 "Resharing is not allowed" => "Videredeling ikke tilladt",
-"Shared in" => "Delt i",
-"with" => "med",
 "Unshare" => "Fjern deling",
 "can edit" => "kan redigere",
 "access control" => "Adgangskontrol",
@@ -69,6 +64,7 @@
 "Cloud not found" => "Sky ikke fundet",
 "Edit categories" => "Rediger kategorier",
 "Add" => "Tilføj",
+"Security Warning" => "Sikkerhedsadvarsel",
 "Create an <strong>admin account</strong>" => "Opret en <strong>administratorkonto</strong>",
 "Advanced" => "Avanceret",
 "Data folder" => "Datamappe",
@@ -82,10 +78,16 @@
 "Finish setup" => "Afslut opsætning",
 "web services under your control" => "Webtjenester under din kontrol",
 "Log out" => "Log ud",
+"Automatic logon rejected!" => "Automatisk login afvist!",
+"If you did not change your password recently, your account may be compromised!" => "Hvis du ikke har ændret din adgangskode for nylig, har nogen muligvis tiltvunget sig adgang til din konto!",
+"Please change your password to secure your account again." => "Skift adgangskode for at sikre din konto igen.",
 "Lost your password?" => "Mistet dit kodeord?",
 "remember" => "husk",
 "Log in" => "Log ind",
 "You are logged out." => "Du er nu logget ud.",
 "prev" => "forrige",
-"next" => "næste"
+"next" => "næste",
+"Security Warning!" => "Sikkerhedsadvarsel!",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Verificer din adgangskode.<br/>Af sikkerhedsårsager kan du lejlighedsvist blive bedt om at indtaste din adgangskode igen.",
+"Verify" => "Verificer"
 );
diff --git a/core/l10n/de.php b/core/l10n/de.php
index cb6df3b6d10..230d4fc8402 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Fehler beim Freigeben",
 "Error while unsharing" => "Fehler beim Aufheben der Freigabe",
 "Error while changing permissions" => "Fehler beim Ändern  der Rechte",
-"Shared with you and the group" => "Für Dich und folgende Gruppe freigegeben",
-"by" => "mit",
-"Shared with you by" => "Dies wurde mit dir geteilt von",
 "Share with" => "Freigeben für",
 "Share with link" => "Ãœber einen Link freigeben",
 "Password protect" => "Passwortschutz",
@@ -37,8 +34,6 @@
 "Share via email:" => "Ãœber eine E-Mail freigeben:",
 "No people found" => "Niemand gefunden",
 "Resharing is not allowed" => "Weiterverteilen ist nicht erlaubt",
-"Shared in" => "Freigegeben in",
-"with" => "mit",
 "Unshare" => "Freigabe aufheben",
 "can edit" => "kann bearbeiten",
 "access control" => "Zugriffskontrolle",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index 1d2daeef037..55f5ac63336 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Fehler beim Freigeben",
 "Error while unsharing" => "Fehler beim Aufheben der Freigabe",
 "Error while changing permissions" => "Fehler beim Ändern  der Rechte",
-"Shared with you and the group" => "Für Dich und folgende Gruppe freigegeben",
-"by" => "mit",
-"Shared with you by" => "Dies wurde mit dir geteilt von",
 "Share with" => "Freigeben für",
 "Share with link" => "Ãœber einen Link freigeben",
 "Password protect" => "Passwortschutz",
@@ -37,8 +34,6 @@
 "Share via email:" => "Ãœber eine E-Mail freigeben:",
 "No people found" => "Niemand gefunden",
 "Resharing is not allowed" => "Weiterverteilen ist nicht erlaubt",
-"Shared in" => "Freigegeben in",
-"with" => "mit",
 "Unshare" => "Freigabe aufheben",
 "can edit" => "kann bearbeiten",
 "access control" => "Zugriffskontrolle",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index f2b9a48fe12..2914eb774ab 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Σφάλμα κατά τον διαμοιρασμό",
 "Error while unsharing" => "Σφάλμα κατά το σταμάτημα του διαμοιρασμού",
 "Error while changing permissions" => "Σφάλμα κατά την αλλαγή των δικαιωμάτων",
-"Shared with you and the group" => "Διαμοιρασμένο με εσένα και την ομάδα",
-"by" => "από",
-"Shared with you by" => "Μοιράστηκε μαζί σας από ",
 "Share with" => "Διαμοιρασμός με",
 "Share with link" => "Διαμοιρασμός με σύνδεσμο",
 "Password protect" => "Προστασία κωδικού",
@@ -37,8 +34,6 @@
 "Share via email:" => "Διαμοιρασμός μέσω email:",
 "No people found" => "Δεν βρέθηκε άνθρωπος",
 "Resharing is not allowed" => "Ξαναμοιρασμός δεν επιτρέπεται",
-"Shared in" => "Διαμοιράστηκε με",
-"with" => "με",
 "Unshare" => "Σταμάτημα μοιράσματος",
 "can edit" => "δυνατότητα αλλαγής",
 "access control" => "έλεγχος πρόσβασης",
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index a8f5b38a303..9b51bfc0737 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Eraro dum kunhavigo",
 "Error while unsharing" => "Eraro dum malkunhavigo",
 "Error while changing permissions" => "Eraro dum ŝanĝo de permesoj",
-"Shared with you and the group" => "Kunhavigita kun vi kaj la grupo",
-"by" => "de",
-"Shared with you by" => "Kunhavigita kun vi de",
 "Share with" => "Kunhavigi kun",
 "Share with link" => "Kunhavigi per ligilo",
 "Password protect" => "Protekti per pasvorto",
@@ -37,8 +34,6 @@
 "Share via email:" => "Kunhavigi per retpoŝto:",
 "No people found" => "Ne troviĝis gento",
 "Resharing is not allowed" => "Rekunhavigo ne permesatas",
-"Shared in" => "Kunhavigita en",
-"with" => "kun",
 "Unshare" => "Malkunhavigi",
 "can edit" => "povas redakti",
 "access control" => "alirkontrolo",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 6c929477453..d1c20087c7f 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Error compartiendo",
 "Error while unsharing" => "Error descompartiendo",
 "Error while changing permissions" => "Error cambiando permisos",
-"Shared with you and the group" => "Comprtido contigo y con el grupo",
-"by" => "por",
-"Shared with you by" => "Compartido contigo por",
 "Share with" => "Compartir con",
 "Share with link" => "Compartir con enlace",
 "Password protect" => "Protegido por contraseña",
@@ -37,8 +34,6 @@
 "Share via email:" => "compartido via e-mail:",
 "No people found" => "No se encontró gente",
 "Resharing is not allowed" => "No se permite compartir de nuevo",
-"Shared in" => "Compartido en",
-"with" => "con",
 "Unshare" => "No compartir",
 "can edit" => "puede editar",
 "access control" => "control de acceso",
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index ecb909e2ed7..38c7566f17a 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Error al compartir",
 "Error while unsharing" => "Error en el procedimiento de ",
 "Error while changing permissions" => "Error al cambiar permisos",
-"Shared with you and the group" => "Compartido con vos y con el grupo",
-"by" => "por",
-"Shared with you by" => "Compartido con vos por",
 "Share with" => "Compartir con",
 "Share with link" => "Compartir con link",
 "Password protect" => "Proteger con contraseña ",
@@ -37,14 +34,12 @@
 "Share via email:" => "compartido a través de e-mail:",
 "No people found" => "No se encontraron usuarios",
 "Resharing is not allowed" => "No se permite volver a compartir",
-"Shared in" => "Compartido en",
-"with" => "con",
 "Unshare" => "Remover compartir",
 "can edit" => "puede editar",
 "access control" => "control de acceso",
 "create" => "crear",
 "update" => "actualizar",
-"delete" => "remover",
+"delete" => "borrar",
 "share" => "compartir",
 "Password protected" => "Protegido por contraseña",
 "Error unsetting expiration date" => "Error al remover la fecha de caducidad",
@@ -53,10 +48,10 @@
 "Use the following link to reset your password: {link}" => "Usá este enlace para restablecer tu contraseña: {link}",
 "You will receive a link to reset your password via Email." => "Vas a recibir un enlace por e-mail para restablecer tu contraseña",
 "Requested" => "Pedido",
-"Login failed!" => "¡Fallo al iniciar sesión!",
+"Login failed!" => "¡Error al iniciar sesión!",
 "Username" => "Nombre de usuario",
 "Request reset" => "Solicitar restablecimiento",
-"Your password was reset" => "Tu contraseña ha sido restablecida",
+"Your password was reset" => "Tu contraseña fue restablecida",
 "To login page" => "A la página de inicio de sesión",
 "New password" => "Nueva contraseña",
 "Reset password" => "Restablecer contraseña",
@@ -66,14 +61,14 @@
 "Admin" => "Administrador",
 "Help" => "Ayuda",
 "Access forbidden" => "Acceso denegado",
-"Cloud not found" => "No se encontró owncloud",
+"Cloud not found" => "No se encontró ownCloud",
 "Edit categories" => "Editar categorías",
-"Add" => "Añadir",
+"Add" => "Agregar",
 "Security Warning" => "Advertencia de seguridad",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "No hay disponible ningún generador de números aleatorios seguro. Por favor habilitá la extensión OpenSSL de PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sin un generador de números aleatorios seguro un atacante podría predecir los tokens de reinicio de tu contraseña y tomar control de tu cuenta.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Tu directorio de datos y tus archivos son probablemente accesibles desde internet. El archivo .htaccess provisto por ownCloud no está funcionando. Te sugerimos que configures tu servidor web de manera que el directorio de datos ya no esté accesible, o que muevas el directorio de datos afuera del directorio raíz de tu servidor web.",
-"Create an <strong>admin account</strong>" => "Creá una <strong>cuenta de administrador</strong>",
+"Create an <strong>admin account</strong>" => "Crear una <strong>cuenta de administrador</strong>",
 "Advanced" => "Avanzado",
 "Data folder" => "Directorio de almacenamiento",
 "Configure the database" => "Configurar la base de datos",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index d60ddfa7349..c9025a0173e 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -25,8 +25,6 @@
 "Error while sharing" => "Errore bat egon da elkarbanatzean",
 "Error while unsharing" => "Errore bat egon da elkarbanaketa desegitean",
 "Error while changing permissions" => "Errore bat egon da baimenak aldatzean",
-"Shared with you and the group" => "Zurekin eta taldearekin elkarbanatuta",
-"Shared with you by" => "Honek zurekin elkarbanatuta:",
 "Share with" => "Elkarbanatu honekin",
 "Share with link" => "Elkarbanatu lotura batekin",
 "Password protect" => "Babestu pasahitzarekin",
@@ -36,8 +34,6 @@
 "Share via email:" => "Elkarbanatu eposta bidez:",
 "No people found" => "Ez da inor aurkitu",
 "Resharing is not allowed" => "Berriz elkarbanatzea ez dago baimendua",
-"Shared in" => "Elkarbanatua hemen:",
-"with" => "honekin",
 "Unshare" => "Ez elkarbanatu",
 "can edit" => "editatu dezake",
 "access control" => "sarrera kontrola",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index a1856067310..a8da4f37b4e 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -25,7 +25,6 @@
 "Error while sharing" => "Virhe jaettaessa",
 "Error while unsharing" => "Virhe jakoa peruttaessa",
 "Error while changing permissions" => "Virhe oikeuksia muuttaessa",
-"Shared with you and the group" => "Jaettu sinulle ja ryhmälle",
 "Share with link" => "Jaa linkillä",
 "Password protect" => "Suojaa salasanalla",
 "Password" => "Salasana",
@@ -34,7 +33,6 @@
 "Share via email:" => "Jaa sähköpostilla:",
 "No people found" => "Henkilöitä ei löytynyt",
 "Resharing is not allowed" => "Jakaminen uudelleen ei ole salittu",
-"with" => "kanssa",
 "Unshare" => "Peru jakaminen",
 "can edit" => "voi muokata",
 "access control" => "Pääsyn hallinta",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 0bdc3a33bdd..7d5c967c9f4 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Erreur lors de la mise en partage",
 "Error while unsharing" => "Erreur lors de l'annulation du partage",
 "Error while changing permissions" => "Erreur lors du changement des permissions",
-"Shared with you and the group" => "Partagé avec vous ainsi qu'avec le groupe",
-"by" => "par",
-"Shared with you by" => "Partagé avec vous par",
 "Share with" => "Partager avec",
 "Share with link" => "Partager via lien",
 "Password protect" => "Protéger par un mot de passe",
@@ -37,8 +34,6 @@
 "Share via email:" => "Partager via e-mail :",
 "No people found" => "Aucun utilisateur trouvé",
 "Resharing is not allowed" => "Le repartage n'est pas autorisé",
-"Shared in" => "Partagé dans",
-"with" => "avec",
 "Unshare" => "Ne plus partager",
 "can edit" => "édition autorisée",
 "access control" => "contrôle des accès",
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index 54b42547428..dfc834a88cb 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Greška prilikom djeljenja",
 "Error while unsharing" => "Greška prilikom isključivanja djeljenja",
 "Error while changing permissions" => "Greška prilikom promjena prava",
-"Shared with you and the group" => "Dijeli sa tobom i grupom",
-"by" => "preko",
-"Shared with you by" => "Dijeljeno sa tobom preko ",
 "Share with" => "Djeli sa",
 "Share with link" => "Djeli preko link-a",
 "Password protect" => "Zaštiti lozinkom",
@@ -37,8 +34,6 @@
 "Share via email:" => "Dijeli preko email-a:",
 "No people found" => "Osobe nisu pronađene",
 "Resharing is not allowed" => "Ponovo dijeljenje nije dopušteno",
-"Shared in" => "Dijeljeno u",
-"with" => "sa",
 "Unshare" => "Makni djeljenje",
 "can edit" => "može mjenjat",
 "access control" => "kontrola pristupa",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 950517f9d07..4e95683071f 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Errore durante la condivisione",
 "Error while unsharing" => "Errore durante la rimozione della condivisione",
 "Error while changing permissions" => "Errore durante la modifica dei permessi",
-"Shared with you and the group" => "Condiviso con te e con il gruppo",
-"by" => "da",
-"Shared with you by" => "Condiviso con te da",
 "Share with" => "Condividi con",
 "Share with link" => "Condividi con collegamento",
 "Password protect" => "Proteggi con password",
@@ -37,8 +34,6 @@
 "Share via email:" => "Condividi tramite email:",
 "No people found" => "Non sono state trovate altre persone",
 "Resharing is not allowed" => "La ri-condivisione non è consentita",
-"Shared in" => "Condiviso in",
-"with" => "con",
 "Unshare" => "Rimuovi condivisione",
 "can edit" => "può modificare",
 "access control" => "controllo d'accesso",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index cb3f02a2efd..021790ae190 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "共有でエラー発生",
 "Error while unsharing" => "共有解除でエラー発生",
 "Error while changing permissions" => "権限変更でエラー発生",
-"Shared with you and the group" => "あなたとグループで共有中",
-"by" => "により",
-"Shared with you by" => "あなたと共有",
 "Share with" => "共有者",
 "Share with link" => "URLリンクで共有",
 "Password protect" => "パスワード保護",
@@ -37,8 +34,6 @@
 "Share via email:" => "メール経由で共有:",
 "No people found" => "ユーザーが見つかりません",
 "Resharing is not allowed" => "再共有は許可されていません",
-"Shared in" => "の中で共有中",
-"with" => "と",
 "Unshare" => "共有解除",
 "can edit" => "編集可能",
 "access control" => "アクセス権限",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 2e2a32c29bb..3c010491dc7 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Fout tijdens het delen",
 "Error while unsharing" => "Fout tijdens het stoppen met delen",
 "Error while changing permissions" => "Fout tijdens het veranderen van permissies",
-"Shared with you and the group" => "Gedeeld me u en de groep",
-"by" => "door",
-"Shared with you by" => "Gedeeld met u door",
 "Share with" => "Deel met",
 "Share with link" => "Deel met link",
 "Password protect" => "Passeerwoord beveiliging",
@@ -37,8 +34,6 @@
 "Share via email:" => "Deel via email:",
 "No people found" => "Geen mensen gevonden",
 "Resharing is not allowed" => "Verder delen is niet toegestaan",
-"Shared in" => "Gedeeld in",
-"with" => "met",
 "Unshare" => "Stop met delen",
 "can edit" => "kan wijzigen",
 "access control" => "toegangscontrole",
@@ -69,6 +64,7 @@
 "Cloud not found" => "Cloud niet gevonden",
 "Edit categories" => "Wijzigen categorieën",
 "Add" => "Toevoegen",
+"Security Warning" => "Beveiligings waarschuwing",
 "Create an <strong>admin account</strong>" => "Maak een <strong>beheerdersaccount</strong> aan",
 "Advanced" => "Geavanceerd",
 "Data folder" => "Gegevensmap",
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
index 328cc0b60ba..e80e7641644 100644
--- a/core/l10n/oc.php
+++ b/core/l10n/oc.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Error al partejar",
 "Error while unsharing" => "Error al non partejar",
 "Error while changing permissions" => "Error al cambiar permissions",
-"Shared with you and the group" => "Partejat amb tu e lo grop",
-"by" => "per",
-"Shared with you by" => "Partejat amb tu per",
 "Share with" => "Parteja amb",
 "Share with link" => "Parteja amb lo ligam",
 "Password protect" => "Parat per senhal",
@@ -37,8 +34,6 @@
 "Share via email:" => "Parteja tras corrièl :",
 "No people found" => "Deguns trobat",
 "Resharing is not allowed" => "Tornar partejar es pas permis",
-"Shared in" => "Partejat dins",
-"with" => "amb",
 "Unshare" => "Non parteje",
 "can edit" => "pòt modificar",
 "access control" => "Contraròtle d'acces",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 44e8aa65457..a0fa51da76d 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Błąd podczas współdzielenia",
 "Error while unsharing" => "Błąd podczas zatrzymywania współdzielenia",
 "Error while changing permissions" => "Błąd przy zmianie uprawnień",
-"Shared with you and the group" => "Współdzielony z tobą i grupą",
-"by" => "przez",
-"Shared with you by" => "Współdzielone z taba przez",
 "Share with" => "Współdziel z",
 "Share with link" => "Współdziel z link",
 "Password protect" => "Zabezpieczone hasłem",
@@ -37,8 +34,6 @@
 "Share via email:" => "Współdziel poprzez maila",
 "No people found" => "Nie znaleziono ludzi",
 "Resharing is not allowed" => "Współdzielenie nie jest możliwe",
-"Shared in" => "Współdziel  w",
-"with" => "z",
 "Unshare" => "Zatrzymaj współdzielenie",
 "can edit" => "można edytować",
 "access control" => "kontrola dostępu",
@@ -69,6 +64,10 @@
 "Cloud not found" => "Nie odnaleziono chmury",
 "Edit categories" => "Edytuj kategoriÄ™",
 "Add" => "Dodaj",
+"Security Warning" => "Ostrzeżenie o zabezpieczeniach",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Niedostępny bezpieczny generator liczb losowych, należy włączyć rozszerzenie OpenSSL w PHP.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez bezpiecznego generatora liczb losowych, osoba atakująca może być w stanie przewidzieć resetujące hasło tokena i przejąć kontrolę nad swoim kontem.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Katalog danych (data) i pliki są prawdopodobnie dostępnego z Internetu. Sprawdź plik .htaccess oraz konfigurację serwera (hosta). Sugerujemy, skonfiguruj swój serwer w taki sposób, żeby dane katalogu nie były dostępne lub przenieść katalog danych spoza głównego dokumentu webserwera.",
 "Create an <strong>admin account</strong>" => "Tworzenie <strong>konta administratora</strong>",
 "Advanced" => "Zaawansowane",
 "Data folder" => "Katalog danych",
@@ -82,10 +81,16 @@
 "Finish setup" => "Zakończ konfigurowanie",
 "web services under your control" => "usługi internetowe pod kontrolą",
 "Log out" => "Wylogowuje użytkownika",
+"Automatic logon rejected!" => "Automatyczne logowanie odrzucone!",
+"If you did not change your password recently, your account may be compromised!" => "Jeśli nie było zmianie niedawno hasło, Twoje konto może być zagrożone!",
+"Please change your password to secure your account again." => "Proszę zmienić swoje hasło, aby zabezpieczyć swoje konto ponownie.",
 "Lost your password?" => "Nie pamiętasz hasła?",
 "remember" => "Zapamiętanie",
 "Log in" => "Zaloguj",
 "You are logged out." => "Wylogowano użytkownika.",
 "prev" => "wstecz",
-"next" => "naprzód"
+"next" => "naprzód",
+"Security Warning!" => "Ostrzeżenie o zabezpieczeniach!",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Sprawdź swoje hasło.<br/>Ze względów bezpieczeństwa możesz zostać czasami poproszony o wprowadzenie hasła ponownie.",
+"Verify" => "Zweryfikowane"
 );
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index 54a442bc2f2..17a24ae4e19 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Erro ao compartilhar",
 "Error while unsharing" => "Erro ao descompartilhar",
 "Error while changing permissions" => "Erro ao mudar permissões",
-"Shared with you and the group" => "Compartilhado com você e o grupo",
-"by" => "por",
-"Shared with you by" => "Compartilhado com você por",
 "Share with" => "Compartilhar com",
 "Share with link" => "Compartilhar com link",
 "Password protect" => "Proteger com senha",
@@ -37,8 +34,6 @@
 "Share via email:" => "Compartilhar via e-mail:",
 "No people found" => "Nenhuma pessoa encontrada",
 "Resharing is not allowed" => "Não é permitido re-compartilhar",
-"Shared in" => "Compartilhado em",
-"with" => "com",
 "Unshare" => "Descompartilhar",
 "can edit" => "pode editar",
 "access control" => "controle de acesso",
@@ -85,10 +80,12 @@
 "Finish setup" => "Concluir configuração",
 "web services under your control" => "web services sob seu controle",
 "Log out" => "Sair",
+"Please change your password to secure your account again." => "Por favor troque sua senha para tornar sua conta segura novamente.",
 "Lost your password?" => "Esqueçeu sua senha?",
 "remember" => "lembrete",
 "Log in" => "Log in",
 "You are logged out." => "Você está desconectado.",
 "prev" => "anterior",
-"next" => "próximo"
+"next" => "próximo",
+"Security Warning!" => "Aviso de Segurança!"
 );
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index d483d087103..dfb2e8a5e79 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Erro ao partilhar",
 "Error while unsharing" => "Erro ao deixar de partilhar",
 "Error while changing permissions" => "Erro ao mudar permissões",
-"Shared with you and the group" => "Partilhado consigo e o grupo",
-"by" => "por",
-"Shared with you by" => "Partilhado consigo por",
 "Share with" => "Partilhar com",
 "Share with link" => "Partilhar com link",
 "Password protect" => "Proteger com palavra-passe",
@@ -37,8 +34,6 @@
 "Share via email:" => "Partilhar via email:",
 "No people found" => "Não foi encontrado ninguém",
 "Resharing is not allowed" => "Não é permitido partilhar de novo",
-"Shared in" => "Partilhado em",
-"with" => "com",
 "Unshare" => "Deixar de partilhar",
 "can edit" => "pode editar",
 "access control" => "Controlo de acesso",
diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php
index d658ecb18e5..ca2b18ae7ac 100644
--- a/core/l10n/ru_RU.php
+++ b/core/l10n/ru_RU.php
@@ -26,6 +26,7 @@
 "Error while unsharing" => "Ошибка отключения общего доступа",
 "Error while changing permissions" => "Ошибка при изменении прав доступа",
 "Share with" => "Сделать общим с",
+"Share with link" => "Опубликовать с ссылкой",
 "Password protect" => "Защитить паролем",
 "Password" => "Пароль",
 "Set expiration date" => "Установить срок действия",
@@ -33,7 +34,6 @@
 "Share via email:" => "Сделать общедоступным посредством email:",
 "No people found" => "Не найдено людей",
 "Resharing is not allowed" => "Рекурсивный общий доступ не разрешен",
-"with" => "с",
 "Unshare" => "Отключить общий доступ",
 "can edit" => "возможно редактирование",
 "access control" => "контроль доступа",
@@ -65,6 +65,8 @@
 "Edit categories" => "Редактирование категорий",
 "Add" => "Добавить",
 "Security Warning" => "Предупреждение системы безопасности",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Нет доступного защищенного генератора случайных чисел, пожалуйста, включите расширение PHP OpenSSL.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Без защищенного генератора случайных чисел злоумышленник может спрогнозировать пароль, сбросить учетные данные и завладеть Вашим аккаунтом.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ваши каталоги данных и файлы, вероятно, доступны из Интернета. Файл .htaccess, предоставляемый ownCloud, не работает. Мы настоятельно рекомендуем Вам настроить вебсервер таким образом, чтобы каталоги данных больше не были доступны, или переместить их за пределы корневого каталога документов веб-сервера.",
 "Create an <strong>admin account</strong>" => "Создать <strong>admin account</strong>",
 "Advanced" => "Расширенный",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 935f9ab16f4..2743262a774 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Chyba počas zdieľania",
 "Error while unsharing" => "Chyba počas ukončenia zdieľania",
 "Error while changing permissions" => "Chyba počas zmeny oprávnení",
-"Shared with you and the group" => "Zdieľané s vami a so skupinou",
-"by" => "od",
-"Shared with you by" => "Zdieľané s vami od",
 "Share with" => "Zdieľať s",
 "Share with link" => "Zdieľať cez odkaz",
 "Password protect" => "Chrániť heslom",
@@ -36,7 +33,6 @@
 "Expiration date" => "Dátum expirácie",
 "Share via email:" => "Zdieľať cez e-mail:",
 "No people found" => "Užívateľ nenájdený",
-"with" => "s",
 "Unshare" => "Zrušiť zdieľanie",
 "can edit" => "môže upraviť",
 "access control" => "riadenie prístupu",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 2833792e0b7..799e4bb6c76 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "Fel vid delning",
 "Error while unsharing" => "Fel när delning skulle avslutas",
 "Error while changing permissions" => "Fel vid ändring av rättigheter",
-"Shared with you and the group" => "Delas med dig och gruppen",
-"by" => "av",
-"Shared with you by" => "Delas med dig av",
 "Share with" => "Delad med",
 "Share with link" => "Delad med länk",
 "Password protect" => "Lösenordsskydda",
@@ -37,8 +34,6 @@
 "Share via email:" => "Dela via e-post:",
 "No people found" => "Hittar inga användare",
 "Resharing is not allowed" => "Dela vidare är inte tillåtet",
-"Shared in" => "Delas i",
-"with" => "med",
 "Unshare" => "Sluta dela",
 "can edit" => "kan redigera",
 "access control" => "Ã¥tkomstkontroll",
@@ -90,5 +85,7 @@
 "Log in" => "Logga in",
 "You are logged out." => "Du är utloggad.",
 "prev" => "föregående",
-"next" => "nästa"
+"next" => "nästa",
+"Security Warning!" => "Säkerhetsvarning!",
+"Verify" => "Verifiera"
 );
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
new file mode 100644
index 00000000000..33a27d4058d
--- /dev/null
+++ b/core/l10n/ta_LK.php
@@ -0,0 +1,27 @@
+<?php $TRANSLATIONS = array(
+"Settings" => "அமைப்புகள்",
+"January" => "தை",
+"February" => "மாசி",
+"March" => "பங்குனி",
+"April" => "சித்திரை",
+"May" => "வைகாசி",
+"June" => "ஆனி",
+"July" => "ஆடி",
+"August" => "ஆவணி",
+"September" => "புரட்டாசி",
+"Password" => "கடவுச்சொல்",
+"create" => "படைத்தல்",
+"update" => "இற்றைப்படுத்தல்",
+"delete" => "நீக்குக",
+"Username" => "பயனாளர் பெயர்",
+"Help" => "உதவி",
+"Advanced" => "மேம்பட்ட",
+"Data folder" => "தரவு கோப்புறை",
+"Database user" => "தரவுத்தள பயனாளர்",
+"Database password" => "தரவுத்தள கடவுச்சொல்",
+"Database name" => "தரவுத்தள பெயர்",
+"Finish setup" => "அமைப்பை முடிக்க",
+"You are logged out." => "நீங்கள் விடுபதிகை செய்துவிட்டீர்கள்.",
+"prev" => "முந்தைய",
+"next" => "அடுத்து"
+);
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 79a50b2c78d..85a6e2d7eec 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "เกิดข้อผิดพลาดในระหว่างการแชร์ข้อมูล",
 "Error while unsharing" => "เกิดข้อผิดพลาดในการยกเลิกการแชร์ข้อมูล",
 "Error while changing permissions" => "เกิดข้อผิดพลาดในการเปลี่ยนสิทธิ์การเข้าใช้งาน",
-"Shared with you and the group" => "แชร์ให้คุณและกลุ่ม",
-"by" => "โดย",
-"Shared with you by" => "แชร์ให้คุณโดย",
 "Share with" => "แชร์ให้กับ",
 "Share with link" => "แชร์ด้วยลิงก์",
 "Password protect" => "ใส่รหัสผ่านไว้",
@@ -37,8 +34,6 @@
 "Share via email:" => "แชร์ผ่านทางอีเมล",
 "No people found" => "ไม่พบบุคคลที่ต้องการ",
 "Resharing is not allowed" => "ไม่อนุญาตให้แชร์ข้อมูลซ้ำได้",
-"Shared in" => "แชร์ไว้ใน",
-"with" => "ด้วย",
 "Unshare" => "ยกเลิกการแชร์",
 "can edit" => "สามารถแก้ไข",
 "access control" => "ระดับควบคุมการเข้าใช้งาน",
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index 758bd7274ff..5da698e2f07 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -25,8 +25,6 @@
 "Error while sharing" => "Lỗi trong quá trình chia sẻ",
 "Error while unsharing" => "Lỗi trong quá trình gỡ chia sẻ",
 "Error while changing permissions" => "Lỗi trong quá trình phân quyền",
-"Shared with you and the group" => "Được chia sẻ với bạn và Nhóm",
-"Shared with you by" => "Được chia sẻ với bạn qua",
 "Share with" => "Chia sẻ với",
 "Share with link" => "Chia sẻ với link",
 "Password" => "Mật khẩu",
@@ -34,8 +32,6 @@
 "Expiration date" => "Ngày kết thúc",
 "Share via email:" => "Chia sẻ thông qua email",
 "No people found" => "Không tìm thấy người nào",
-"Shared in" => "Chi sẻ trong",
-"with" => "vá»›i",
 "Unshare" => "Gỡ bỏ chia sẻ",
 "access control" => "quản lý truy cập",
 "create" => "tạo",
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
index a69bbec0b26..b27adf5517c 100644
--- a/core/l10n/zh_CN.GB2312.php
+++ b/core/l10n/zh_CN.GB2312.php
@@ -25,9 +25,6 @@
 "Error while sharing" => "分享出错",
 "Error while unsharing" => "取消分享出错",
 "Error while changing permissions" => "变更权限出错",
-"Shared with you and the group" => "与您和小组成员分享",
-"by" => "ç”±",
-"Shared with you by" => "与您的分享，由",
 "Share with" => "分享",
 "Share with link" => "分享链接",
 "Password protect" => "密码保护",
@@ -37,8 +34,6 @@
 "Share via email:" => "通过电子邮件分享：",
 "No people found" => "查无此人",
 "Resharing is not allowed" => "不允许重复分享",
-"Shared in" => "分享在",
-"with" => "与",
 "Unshare" => "取消分享",
 "can edit" => "可编辑",
 "access control" => "访问控制",
diff --git a/l10n/af/core.po b/l10n/af/core.po
index 61c871deff8..d2470d10b92 100644
--- a/l10n/af/core.po
+++ b/l10n/af/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -123,15 +123,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -172,11 +168,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/af/files.po b/l10n/af/files.po
index b7a6a22ae8f..f5db13f47a9 100644
--- a/l10n/af/files.po
+++ b/l10n/af/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -63,152 +63,152 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:241
-msgid "with"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:273
-msgid "unshared"
+#: js/filelist.js:275
+msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:275
-msgid "deleted"
+#: js/filelist.js:277
+msgid "deleted {files}"
 msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:667
-msgid "files scanned"
+#: js/files.js:681
+msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:675
+#: js/files.js:689
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr ""
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr ""
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:777
-msgid "folder"
+#: js/files.js:791
+msgid "1 folder"
 msgstr ""
 
-#: js/files.js:779
-msgid "folders"
+#: js/files.js:793
+msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:787
-msgid "file"
+#: js/files.js:801
+msgid "1 file"
 msgstr ""
 
-#: js/files.js:789
-msgid "files"
+#: js/files.js:803
+msgid "{count} files"
 msgstr ""
 
-#: js/files.js:833
+#: js/files.js:847
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:834
+#: js/files.js:848
 msgid "minute ago"
 msgstr ""
 
-#: js/files.js:835
+#: js/files.js:849
 msgid "minutes ago"
 msgstr ""
 
-#: js/files.js:838
+#: js/files.js:852
 msgid "today"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:853
 msgid "yesterday"
 msgstr ""
 
-#: js/files.js:840
+#: js/files.js:854
 msgid "days ago"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:855
 msgid "last month"
 msgstr ""
 
-#: js/files.js:843
+#: js/files.js:857
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:844
+#: js/files.js:858
 msgid "last year"
 msgstr ""
 
-#: js/files.js:845
+#: js/files.js:859
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 7338fcb1fa5..046bfa2b868 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -124,15 +124,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -173,11 +169,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index 34c24504f7b..069af5d803b 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -64,152 +64,152 @@ msgstr "محذوف"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:241
-msgid "with"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:273
-msgid "unshared"
+#: js/filelist.js:275
+msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:275
-msgid "deleted"
+#: js/filelist.js:277
+msgid "deleted {files}"
 msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:667
-msgid "files scanned"
+#: js/files.js:681
+msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:675
+#: js/files.js:689
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "الاسم"
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "حجم"
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "معدل"
 
-#: js/files.js:777
-msgid "folder"
+#: js/files.js:791
+msgid "1 folder"
 msgstr ""
 
-#: js/files.js:779
-msgid "folders"
+#: js/files.js:793
+msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:787
-msgid "file"
+#: js/files.js:801
+msgid "1 file"
 msgstr ""
 
-#: js/files.js:789
-msgid "files"
+#: js/files.js:803
+msgid "{count} files"
 msgstr ""
 
-#: js/files.js:833
+#: js/files.js:847
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:834
+#: js/files.js:848
 msgid "minute ago"
 msgstr ""
 
-#: js/files.js:835
+#: js/files.js:849
 msgid "minutes ago"
 msgstr ""
 
-#: js/files.js:838
+#: js/files.js:852
 msgid "today"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:853
 msgid "yesterday"
 msgstr ""
 
-#: js/files.js:840
+#: js/files.js:854
 msgid "days ago"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:855
 msgid "last month"
 msgstr ""
 
-#: js/files.js:843
+#: js/files.js:857
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:844
+#: js/files.js:858
 msgid "last year"
 msgstr ""
 
-#: js/files.js:845
+#: js/files.js:859
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/ar_SA/core.po b/l10n/ar_SA/core.po
index d567806a443..9f65ed02399 100644
--- a/l10n/ar_SA/core.po
+++ b/l10n/ar_SA/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
@@ -123,15 +123,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -172,11 +168,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/ar_SA/files.po b/l10n/ar_SA/files.po
index dd926c43632..28e2cb09538 100644
--- a/l10n/ar_SA/files.po
+++ b/l10n/ar_SA/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
 "MIME-Version: 1.0\n"
@@ -63,152 +63,152 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:241
-msgid "with"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:273
-msgid "unshared"
+#: js/filelist.js:275
+msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:275
-msgid "deleted"
+#: js/filelist.js:277
+msgid "deleted {files}"
 msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:667
-msgid "files scanned"
+#: js/files.js:681
+msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:675
+#: js/files.js:689
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr ""
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr ""
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:777
-msgid "folder"
+#: js/files.js:791
+msgid "1 folder"
 msgstr ""
 
-#: js/files.js:779
-msgid "folders"
+#: js/files.js:793
+msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:787
-msgid "file"
+#: js/files.js:801
+msgid "1 file"
 msgstr ""
 
-#: js/files.js:789
-msgid "files"
+#: js/files.js:803
+msgid "{count} files"
 msgstr ""
 
-#: js/files.js:833
+#: js/files.js:847
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:834
+#: js/files.js:848
 msgid "minute ago"
 msgstr ""
 
-#: js/files.js:835
+#: js/files.js:849
 msgid "minutes ago"
 msgstr ""
 
-#: js/files.js:838
+#: js/files.js:852
 msgid "today"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:853
 msgid "yesterday"
 msgstr ""
 
-#: js/files.js:840
+#: js/files.js:854
 msgid "days ago"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:855
 msgid "last month"
 msgstr ""
 
-#: js/files.js:843
+#: js/files.js:857
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:844
+#: js/files.js:858
 msgid "last year"
 msgstr ""
 
-#: js/files.js:845
+#: js/files.js:859
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index cbc25fc2b30..22b81cb5ef0 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -127,15 +127,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -176,11 +172,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index a084c7d44a0..dcae6f8b250 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -65,152 +65,152 @@ msgstr "Изтриване"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:241
-msgid "with"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:273
-msgid "unshared"
+#: js/filelist.js:275
+msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:275
-msgid "deleted"
+#: js/filelist.js:277
+msgid "deleted {files}"
 msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "Грешка при качване"
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "Качването е отменено."
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "Неправилно име – \"/\" не е позволено."
 
-#: js/files.js:667
-msgid "files scanned"
+#: js/files.js:681
+msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:675
+#: js/files.js:689
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "Променено"
 
-#: js/files.js:777
-msgid "folder"
-msgstr "папка"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:779
-msgid "folders"
-msgstr "папки"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:787
-msgid "file"
-msgstr "файл"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:789
-msgid "files"
+#: js/files.js:803
+msgid "{count} files"
 msgstr ""
 
-#: js/files.js:833
+#: js/files.js:847
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:834
+#: js/files.js:848
 msgid "minute ago"
 msgstr ""
 
-#: js/files.js:835
+#: js/files.js:849
 msgid "minutes ago"
 msgstr ""
 
-#: js/files.js:838
+#: js/files.js:852
 msgid "today"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:853
 msgid "yesterday"
 msgstr ""
 
-#: js/files.js:840
+#: js/files.js:854
 msgid "days ago"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:855
 msgid "last month"
 msgstr ""
 
-#: js/files.js:843
+#: js/files.js:857
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:844
+#: js/files.js:858
 msgid "last year"
 msgstr ""
 
-#: js/files.js:845
+#: js/files.js:859
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index c8709a4ef41..451d54d3c05 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 23:38+0200\n"
-"PO-Revision-Date: 2012-10-16 06:19+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -125,16 +125,12 @@ msgid "Error while changing permissions"
 msgstr "Error en canviar els permisos"
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr "Compartit amb vós i amb el grup"
-
-#: js/share.js:130
-msgid "by"
-msgstr "per"
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
-msgstr "compartit amb vós per"
+msgid "Shared with you by {owner}"
+msgstr ""
 
 #: js/share.js:137
 msgid "Share with"
@@ -174,12 +170,8 @@ msgid "Resharing is not allowed"
 msgstr "No es permet compartir de nou"
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr "Compartit en"
-
-#: js/share.js:250
-msgid "with"
-msgstr "amb"
+msgid "Shared in {item} with {user}"
+msgstr ""
 
 #: js/share.js:271
 msgid "Unshare"
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index b78da53d8b9..894bb117b62 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 02:02+0200\n"
-"PO-Revision-Date: 2012-10-01 08:52+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -67,152 +67,152 @@ msgstr "Suprimeix"
 msgid "Rename"
 msgstr "Reanomena"
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
-msgstr "ja existeix"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
+msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr "substitueix"
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr "sugereix un nom"
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr "cancel·la"
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
-msgstr "substituït"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "desfés"
 
-#: js/filelist.js:241
-msgid "with"
-msgstr "per"
-
-#: js/filelist.js:273
-msgid "unshared"
-msgstr "No compartits"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
 
 #: js/filelist.js:275
-msgid "deleted"
-msgstr "esborrat"
+msgid "unshared {files}"
+msgstr ""
+
+#: js/filelist.js:277
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "s'estan generant fitxers ZIP, pot trigar una estona."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "No es pot pujar el fitxer perquè és una carpeta o té 0 bytes"
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "Error en la pujada"
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr "Pendents"
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr "1 fitxer pujant"
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
-msgstr "fitxers pujant"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
+msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "La pujada s'ha cancel·lat."
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà."
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "El nom no és vàlid, no es permet '/'."
 
-#: js/files.js:668
-msgid "files scanned"
-msgstr "arxius escanejats"
+#: js/files.js:681
+msgid "{count} files scanned"
+msgstr ""
 
-#: js/files.js:676
+#: js/files.js:689
 msgid "error while scanning"
 msgstr "error durant l'escaneig"
 
-#: js/files.js:749 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:750 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "Mida"
 
-#: js/files.js:751 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:778
-msgid "folder"
-msgstr "carpeta"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:780
-msgid "folders"
-msgstr "carpetes"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:788
-msgid "file"
-msgstr "fitxer"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:790
-msgid "files"
-msgstr "fitxers"
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
 
-#: js/files.js:834
+#: js/files.js:847
 msgid "seconds ago"
 msgstr "segons enrere"
 
-#: js/files.js:835
+#: js/files.js:848
 msgid "minute ago"
 msgstr "minut enrere"
 
-#: js/files.js:836
+#: js/files.js:849
 msgid "minutes ago"
 msgstr "minuts enrere"
 
-#: js/files.js:839
+#: js/files.js:852
 msgid "today"
 msgstr "avui"
 
-#: js/files.js:840
+#: js/files.js:853
 msgid "yesterday"
 msgstr "ahir"
 
-#: js/files.js:841
+#: js/files.js:854
 msgid "days ago"
 msgstr "dies enrere"
 
-#: js/files.js:842
+#: js/files.js:855
 msgid "last month"
 msgstr "el mes passat"
 
-#: js/files.js:844
+#: js/files.js:857
 msgid "months ago"
 msgstr "mesos enrere"
 
-#: js/files.js:845
+#: js/files.js:858
 msgid "last year"
 msgstr "l'any passat"
 
-#: js/files.js:846
+#: js/files.js:859
 msgid "years ago"
 msgstr "anys enrere"
 
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index 356ffa03df5..34b704cf839 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 23:38+0200\n"
-"PO-Revision-Date: 2012-10-16 08:31+0000\n"
-"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -127,16 +127,12 @@ msgid "Error while changing permissions"
 msgstr "Chyba při změně oprávnění"
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr "S Vámi a skupinou"
-
-#: js/share.js:130
-msgid "by"
-msgstr "sdílí"
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
-msgstr "S Vámi sdílí"
+msgid "Shared with you by {owner}"
+msgstr ""
 
 #: js/share.js:137
 msgid "Share with"
@@ -176,12 +172,8 @@ msgid "Resharing is not allowed"
 msgstr "Sdílení již sdílené položky není povoleno"
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr "Sdíleno v"
-
-#: js/share.js:250
-msgid "with"
-msgstr "s"
+msgid "Shared in {item} with {user}"
+msgstr ""
 
 #: js/share.js:271
 msgid "Unshare"
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 423a5045da8..7c4bb9bb82e 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-27 02:01+0200\n"
-"PO-Revision-Date: 2012-09-26 12:01+0000\n"
-"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -66,152 +66,152 @@ msgstr "Smazat"
 msgid "Rename"
 msgstr "Přejmenovat"
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
-msgstr "již existuje"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
+msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr "nahradit"
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr "navrhnout název"
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr "zrušit"
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
-msgstr "nahrazeno"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "zpět"
 
-#: js/filelist.js:241
-msgid "with"
-msgstr "s"
-
-#: js/filelist.js:273
-msgid "unshared"
-msgstr "sdílení zrušeno"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
 
 #: js/filelist.js:275
-msgid "deleted"
-msgstr "smazáno"
+msgid "unshared {files}"
+msgstr ""
+
+#: js/filelist.js:277
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "generuji ZIP soubor, může to nějakou dobu trvat."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Nelze odeslat Váš soubor, protože je to adresář nebo má velikost 0 bajtů"
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "Chyba odesílání"
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr "Čekající"
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr "odesílá se 1 soubor"
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
-msgstr "souborů se odesílá"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
+msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "Odesílání zrušeno."
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Probíhá odesílání souboru. Opuštění stránky vyústí ve zrušení nahrávání."
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "Neplatný název, znak '/' není povolen"
 
-#: js/files.js:668
-msgid "files scanned"
-msgstr "soubory prohledány"
+#: js/files.js:681
+msgid "{count} files scanned"
+msgstr ""
 
-#: js/files.js:676
+#: js/files.js:689
 msgid "error while scanning"
 msgstr "chyba při prohledávání"
 
-#: js/files.js:749 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "Název"
 
-#: js/files.js:750 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:751 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "Změněno"
 
-#: js/files.js:778
-msgid "folder"
-msgstr "složka"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:780
-msgid "folders"
-msgstr "složky"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:788
-msgid "file"
-msgstr "soubor"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:790
-msgid "files"
-msgstr "soubory"
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
 
-#: js/files.js:834
+#: js/files.js:847
 msgid "seconds ago"
 msgstr "před pár sekundami"
 
-#: js/files.js:835
+#: js/files.js:848
 msgid "minute ago"
 msgstr "před minutou"
 
-#: js/files.js:836
+#: js/files.js:849
 msgid "minutes ago"
 msgstr "před pár minutami"
 
-#: js/files.js:839
+#: js/files.js:852
 msgid "today"
 msgstr "dnes"
 
-#: js/files.js:840
+#: js/files.js:853
 msgid "yesterday"
 msgstr "včera"
 
-#: js/files.js:841
+#: js/files.js:854
 msgid "days ago"
 msgstr "před pár dny"
 
-#: js/files.js:842
+#: js/files.js:855
 msgid "last month"
 msgstr "minulý měsíc"
 
-#: js/files.js:844
+#: js/files.js:857
 msgid "months ago"
 msgstr "před pár měsíci"
 
-#: js/files.js:845
+#: js/files.js:858
 msgid "last year"
 msgstr "minulý rok"
 
-#: js/files.js:846
+#: js/files.js:859
 msgid "years ago"
 msgstr "před pár lety"
 
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 98ece178a5d..4d2fa9ac9d7 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -130,16 +130,12 @@ msgid "Error while changing permissions"
 msgstr "Fejl under justering af rettigheder"
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr "Delt med dig og gruppen"
-
-#: js/share.js:130
-msgid "by"
-msgstr "af"
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
-msgstr "Delt med dig af"
+msgid "Shared with you by {owner}"
+msgstr ""
 
 #: js/share.js:137
 msgid "Share with"
@@ -179,12 +175,8 @@ msgid "Resharing is not allowed"
 msgstr "Videredeling ikke tilladt"
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr "Delt i"
-
-#: js/share.js:250
-msgid "with"
-msgstr "med"
+msgid "Shared in {item} with {user}"
+msgstr ""
 
 #: js/share.js:271
 msgid "Unshare"
@@ -309,7 +301,7 @@ msgstr "Tilføj"
 
 #: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
-msgstr ""
+msgstr "Sikkerhedsadvarsel"
 
 #: templates/installation.php:24
 msgid ""
@@ -387,17 +379,17 @@ msgstr "Log ud"
 
 #: templates/login.php:8
 msgid "Automatic logon rejected!"
-msgstr ""
+msgstr "Automatisk login afvist!"
 
 #: templates/login.php:9
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
-msgstr ""
+msgstr "Hvis du ikke har ændret din adgangskode for nylig, har nogen muligvis tiltvunget sig adgang til din konto!"
 
 #: templates/login.php:10
 msgid "Please change your password to secure your account again."
-msgstr ""
+msgstr "Skift adgangskode for at sikre din konto igen."
 
 #: templates/login.php:15
 msgid "Lost your password?"
@@ -425,14 +417,14 @@ msgstr "næste"
 
 #: templates/verify.php:5
 msgid "Security Warning!"
-msgstr ""
+msgstr "Sikkerhedsadvarsel!"
 
 #: templates/verify.php:6
 msgid ""
 "Please verify your password. <br/>For security reasons you may be "
 "occasionally asked to enter your password again."
-msgstr ""
+msgstr "Verificer din adgangskode.<br/>Af sikkerhedsårsager kan du lejlighedsvist blive bedt om at indtaste din adgangskode igen."
 
 #: templates/verify.php:16
 msgid "Verify"
-msgstr ""
+msgstr "Verificer"
diff --git a/l10n/da/files.po b/l10n/da/files.po
index a5e95472c71..71c9599503c 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-13 02:04+0200\n"
-"PO-Revision-Date: 2012-10-12 17:48+0000\n"
-"Last-Translator: Ole Holm Frandsen <froksen@gmail.com>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -71,8 +71,8 @@ msgid "Rename"
 msgstr "Omdøb"
 
 #: js/filelist.js:192 js/filelist.js:194
-msgid "already exists"
-msgstr "findes allerede"
+msgid "{new_name} already exists"
+msgstr ""
 
 #: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
@@ -86,25 +86,25 @@ msgstr "foreslå navn"
 msgid "cancel"
 msgstr "fortryd"
 
-#: js/filelist.js:241 js/filelist.js:243
-msgid "replaced"
-msgstr "erstattet"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
 #: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "fortryd"
 
 #: js/filelist.js:243
-msgid "with"
-msgstr "med"
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
 
 #: js/filelist.js:275
-msgid "unshared"
-msgstr "udelt"
+msgid "unshared {files}"
+msgstr ""
 
 #: js/filelist.js:277
-msgid "deleted"
-msgstr "Slettet"
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
@@ -127,8 +127,8 @@ msgid "1 file uploading"
 msgstr "1 fil uploades"
 
 #: js/files.js:265 js/files.js:310 js/files.js:325
-msgid "files uploading"
-msgstr "filer uploades"
+msgid "{count} files uploading"
+msgstr ""
 
 #: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
@@ -144,8 +144,8 @@ msgid "Invalid name, '/' is not allowed."
 msgstr "Ugyldigt navn, '/' er ikke tilladt."
 
 #: js/files.js:681
-msgid "files scanned"
-msgstr "filer scannet"
+msgid "{count} files scanned"
+msgstr ""
 
 #: js/files.js:689
 msgid "error while scanning"
@@ -164,20 +164,20 @@ msgid "Modified"
 msgstr "Ændret"
 
 #: js/files.js:791
-msgid "folder"
-msgstr "mappe"
+msgid "1 folder"
+msgstr ""
 
 #: js/files.js:793
-msgid "folders"
-msgstr "mapper"
+msgid "{count} folders"
+msgstr ""
 
 #: js/files.js:801
-msgid "file"
-msgstr "fil"
+msgid "1 file"
+msgstr ""
 
 #: js/files.js:803
-msgid "files"
-msgstr "filer"
+msgid "{count} files"
+msgstr ""
 
 #: js/files.js:847
 msgid "seconds ago"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 0804a79cde3..d1e35ea4da1 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -20,9 +20,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 23:38+0200\n"
-"PO-Revision-Date: 2012-10-16 21:24+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -136,16 +136,12 @@ msgid "Error while changing permissions"
 msgstr "Fehler beim Ändern  der Rechte"
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr "Für Dich und folgende Gruppe freigegeben"
-
-#: js/share.js:130
-msgid "by"
-msgstr "mit"
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
-msgstr "Dies wurde mit dir geteilt von"
+msgid "Shared with you by {owner}"
+msgstr ""
 
 #: js/share.js:137
 msgid "Share with"
@@ -185,12 +181,8 @@ msgid "Resharing is not allowed"
 msgstr "Weiterverteilen ist nicht erlaubt"
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr "Freigegeben in"
-
-#: js/share.js:250
-msgid "with"
-msgstr "mit"
+msgid "Shared in {item} with {user}"
+msgstr ""
 
 #: js/share.js:271
 msgid "Unshare"
diff --git a/l10n/de/files.po b/l10n/de/files.po
index 0c178f2f82c..b1b40c63c6f 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -22,9 +22,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 23:37+0200\n"
-"PO-Revision-Date: 2012-10-16 21:36+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -79,8 +79,8 @@ msgid "Rename"
 msgstr "Umbenennen"
 
 #: js/filelist.js:192 js/filelist.js:194
-msgid "already exists"
-msgstr "ist bereits vorhanden"
+msgid "{new_name} already exists"
+msgstr ""
 
 #: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
@@ -94,25 +94,25 @@ msgstr "Name vorschlagen"
 msgid "cancel"
 msgstr "abbrechen"
 
-#: js/filelist.js:241 js/filelist.js:243
-msgid "replaced"
-msgstr "ersetzt"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
 #: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "rückgängig machen"
 
 #: js/filelist.js:243
-msgid "with"
-msgstr "mit"
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
 
 #: js/filelist.js:275
-msgid "unshared"
-msgstr "Nicht mehr freigegeben"
+msgid "unshared {files}"
+msgstr ""
 
 #: js/filelist.js:277
-msgid "deleted"
-msgstr "gelöscht"
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
@@ -135,8 +135,8 @@ msgid "1 file uploading"
 msgstr "Eine Datei wird hoch geladen"
 
 #: js/files.js:265 js/files.js:310 js/files.js:325
-msgid "files uploading"
-msgstr "Dateien werden hoch geladen"
+msgid "{count} files uploading"
+msgstr ""
 
 #: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
@@ -152,8 +152,8 @@ msgid "Invalid name, '/' is not allowed."
 msgstr "Ungültiger Name: \"/\" ist nicht erlaubt."
 
 #: js/files.js:681
-msgid "files scanned"
-msgstr "Dateien gescannt"
+msgid "{count} files scanned"
+msgstr ""
 
 #: js/files.js:689
 msgid "error while scanning"
@@ -172,20 +172,20 @@ msgid "Modified"
 msgstr "Bearbeitet"
 
 #: js/files.js:791
-msgid "folder"
-msgstr "Ordner"
+msgid "1 folder"
+msgstr ""
 
 #: js/files.js:793
-msgid "folders"
-msgstr "Ordner"
+msgid "{count} folders"
+msgstr ""
 
 #: js/files.js:801
-msgid "file"
-msgstr "Datei"
+msgid "1 file"
+msgstr ""
 
 #: js/files.js:803
-msgid "files"
-msgstr "Dateien"
+msgid "{count} files"
+msgstr ""
 
 #: js/files.js:847
 msgid "seconds ago"
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index ed3c87f03f6..1ee644ddea5 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 23:38+0200\n"
-"PO-Revision-Date: 2012-10-16 20:38+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
@@ -136,16 +136,12 @@ msgid "Error while changing permissions"
 msgstr "Fehler beim Ändern  der Rechte"
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr "Für Dich und folgende Gruppe freigegeben"
-
-#: js/share.js:130
-msgid "by"
-msgstr "mit"
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
-msgstr "Dies wurde mit dir geteilt von"
+msgid "Shared with you by {owner}"
+msgstr ""
 
 #: js/share.js:137
 msgid "Share with"
@@ -185,12 +181,8 @@ msgid "Resharing is not allowed"
 msgstr "Weiterverteilen ist nicht erlaubt"
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr "Freigegeben in"
-
-#: js/share.js:250
-msgid "with"
-msgstr "mit"
+msgid "Shared in {item} with {user}"
+msgstr ""
 
 #: js/share.js:271
 msgid "Unshare"
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index da2c94995c7..88e8468ce59 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -22,9 +22,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 23:37+0200\n"
-"PO-Revision-Date: 2012-10-16 21:37+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -79,8 +79,8 @@ msgid "Rename"
 msgstr "Umbenennen"
 
 #: js/filelist.js:192 js/filelist.js:194
-msgid "already exists"
-msgstr "ist bereits vorhanden"
+msgid "{new_name} already exists"
+msgstr ""
 
 #: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
@@ -94,25 +94,25 @@ msgstr "Name vorschlagen"
 msgid "cancel"
 msgstr "abbrechen"
 
-#: js/filelist.js:241 js/filelist.js:243
-msgid "replaced"
-msgstr "ersetzt"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
 #: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "rückgängig machen"
 
 #: js/filelist.js:243
-msgid "with"
-msgstr "mit"
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
 
 #: js/filelist.js:275
-msgid "unshared"
-msgstr "Nicht mehr freigegeben"
+msgid "unshared {files}"
+msgstr ""
 
 #: js/filelist.js:277
-msgid "deleted"
-msgstr "gelöscht"
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
@@ -135,8 +135,8 @@ msgid "1 file uploading"
 msgstr "Eine Datei wird hoch geladen"
 
 #: js/files.js:265 js/files.js:310 js/files.js:325
-msgid "files uploading"
-msgstr "Dateien werden hoch geladen"
+msgid "{count} files uploading"
+msgstr ""
 
 #: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
@@ -152,8 +152,8 @@ msgid "Invalid name, '/' is not allowed."
 msgstr "Ungültiger Name: \"/\" ist nicht erlaubt."
 
 #: js/files.js:681
-msgid "files scanned"
-msgstr "Dateien gescannt"
+msgid "{count} files scanned"
+msgstr ""
 
 #: js/files.js:689
 msgid "error while scanning"
@@ -172,20 +172,20 @@ msgid "Modified"
 msgstr "Bearbeitet"
 
 #: js/files.js:791
-msgid "folder"
-msgstr "Ordner"
+msgid "1 folder"
+msgstr ""
 
 #: js/files.js:793
-msgid "folders"
-msgstr "Ordner"
+msgid "{count} folders"
+msgstr ""
 
 #: js/files.js:801
-msgid "file"
-msgstr "Datei"
+msgid "1 file"
+msgstr ""
 
 #: js/files.js:803
-msgid "files"
-msgstr "Dateien"
+msgid "{count} files"
+msgstr ""
 
 #: js/files.js:847
 msgid "seconds ago"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 35782e6e575..89006b05b50 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -128,16 +128,12 @@ msgid "Error while changing permissions"
 msgstr "Σφάλμα κατά την αλλαγή των δικαιωμάτων"
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr "Διαμοιρασμένο με εσένα και την ομάδα"
-
-#: js/share.js:130
-msgid "by"
-msgstr "από"
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
-msgstr "Μοιράστηκε μαζί σας από "
+msgid "Shared with you by {owner}"
+msgstr ""
 
 #: js/share.js:137
 msgid "Share with"
@@ -177,12 +173,8 @@ msgid "Resharing is not allowed"
 msgstr "Ξαναμοιρασμός δεν επιτρέπεται"
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr "Διαμοιράστηκε με"
-
-#: js/share.js:250
-msgid "with"
-msgstr "με"
+msgid "Shared in {item} with {user}"
+msgstr ""
 
 #: js/share.js:271
 msgid "Unshare"
diff --git a/l10n/el/files.po b/l10n/el/files.po
index 1d6375014dc..4474e37e0ef 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-28 23:34+0200\n"
-"PO-Revision-Date: 2012-09-28 01:41+0000\n"
-"Last-Translator: Dimitris M. <monopatis@gmail.com>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -68,152 +68,152 @@ msgstr "Διαγραφή"
 msgid "Rename"
 msgstr "Μετονομασία"
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
-msgstr "υπάρχει ήδη"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
+msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr "αντικατέστησε"
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr "συνιστώμενο όνομα"
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr "ακύρωση"
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
-msgstr "αντικαταστάθηκε"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "αναίρεση"
 
-#: js/filelist.js:241
-msgid "with"
-msgstr "με"
-
-#: js/filelist.js:273
-msgid "unshared"
-msgstr "Διακόπηκε ο διαμοιρασμός"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
 
 #: js/filelist.js:275
-msgid "deleted"
-msgstr "διαγράφηκε"
+msgid "unshared {files}"
+msgstr ""
+
+#: js/filelist.js:277
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "παραγωγή αρχείου ZIP, ίσως διαρκέσει αρκετά."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Αδυναμία στην μεταφόρτωση του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes"
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "Σφάλμα Μεταφόρτωσης"
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr "Εκκρεμεί"
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr "1 αρχείο ανεβαίνει"
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
-msgstr "αρχεία ανεβαίνουν"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
+msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "Η μεταφόρτωση ακυρώθηκε."
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Η μεταφόρτωση του αρχείου βρίσκεται σε εξέλιξη.  Έξοδος από την σελίδα τώρα θα ακυρώσει την μεταφόρτωση."
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "Μη έγκυρο όνομα, το '/' δεν επιτρέπεται."
 
-#: js/files.js:668
-msgid "files scanned"
-msgstr "αρχεία σαρώθηκαν"
+#: js/files.js:681
+msgid "{count} files scanned"
+msgstr ""
 
-#: js/files.js:676
+#: js/files.js:689
 msgid "error while scanning"
 msgstr "σφάλμα κατά την ανίχνευση"
 
-#: js/files.js:749 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "Όνομα"
 
-#: js/files.js:750 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: js/files.js:751 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "Τροποποιήθηκε"
 
-#: js/files.js:778
-msgid "folder"
-msgstr "φάκελος"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:780
-msgid "folders"
-msgstr "φάκελοι"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:788
-msgid "file"
-msgstr "αρχείο"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:790
-msgid "files"
-msgstr "αρχεία"
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
 
-#: js/files.js:834
+#: js/files.js:847
 msgid "seconds ago"
 msgstr "δευτερόλεπτα πριν"
 
-#: js/files.js:835
+#: js/files.js:848
 msgid "minute ago"
 msgstr "λεπτό πριν"
 
-#: js/files.js:836
+#: js/files.js:849
 msgid "minutes ago"
 msgstr "λεπτά πριν"
 
-#: js/files.js:839
+#: js/files.js:852
 msgid "today"
 msgstr "σήμερα"
 
-#: js/files.js:840
+#: js/files.js:853
 msgid "yesterday"
 msgstr "χτες"
 
-#: js/files.js:841
+#: js/files.js:854
 msgid "days ago"
 msgstr "μέρες πριν"
 
-#: js/files.js:842
+#: js/files.js:855
 msgid "last month"
 msgstr "τελευταίο μήνα"
 
-#: js/files.js:844
+#: js/files.js:857
 msgid "months ago"
 msgstr "μήνες πριν"
 
-#: js/files.js:845
+#: js/files.js:858
 msgid "last year"
 msgstr "τελευταίο χρόνο"
 
-#: js/files.js:846
+#: js/files.js:859
 msgid "years ago"
 msgstr "χρόνια πριν"
 
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index 294292e186f..47fa0437a4c 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -126,16 +126,12 @@ msgid "Error while changing permissions"
 msgstr "Eraro dum ŝanĝo de permesoj"
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr "Kunhavigita kun vi kaj la grupo"
-
-#: js/share.js:130
-msgid "by"
-msgstr "de"
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
-msgstr "Kunhavigita kun vi de"
+msgid "Shared with you by {owner}"
+msgstr ""
 
 #: js/share.js:137
 msgid "Share with"
@@ -175,12 +171,8 @@ msgid "Resharing is not allowed"
 msgstr "Rekunhavigo ne permesatas"
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr "Kunhavigita en"
-
-#: js/share.js:250
-msgid "with"
-msgstr "kun"
+msgid "Shared in {item} with {user}"
+msgstr ""
 
 #: js/share.js:271
 msgid "Unshare"
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index 5f27b8764f8..3dcf01b99f7 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-14 02:05+0200\n"
-"PO-Revision-Date: 2012-10-13 04:22+0000\n"
-"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -66,8 +66,8 @@ msgid "Rename"
 msgstr "Alinomigi"
 
 #: js/filelist.js:192 js/filelist.js:194
-msgid "already exists"
-msgstr "jam ekzistas"
+msgid "{new_name} already exists"
+msgstr ""
 
 #: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
@@ -81,25 +81,25 @@ msgstr "sugesti nomon"
 msgid "cancel"
 msgstr "nuligi"
 
-#: js/filelist.js:241 js/filelist.js:243
-msgid "replaced"
-msgstr "anstataÅ­igita"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
 #: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "malfari"
 
 #: js/filelist.js:243
-msgid "with"
-msgstr "kun"
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
 
 #: js/filelist.js:275
-msgid "unshared"
-msgstr "malkunhavigita"
+msgid "unshared {files}"
+msgstr ""
 
 #: js/filelist.js:277
-msgid "deleted"
-msgstr "forigita"
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
@@ -122,8 +122,8 @@ msgid "1 file uploading"
 msgstr "1 dosiero estas alŝutata"
 
 #: js/files.js:265 js/files.js:310 js/files.js:325
-msgid "files uploading"
-msgstr "dosieroj estas alŝutataj"
+msgid "{count} files uploading"
+msgstr ""
 
 #: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
@@ -139,8 +139,8 @@ msgid "Invalid name, '/' is not allowed."
 msgstr "Nevalida nomo, “/” ne estas permesata."
 
 #: js/files.js:681
-msgid "files scanned"
-msgstr "dosieroj skanitaj"
+msgid "{count} files scanned"
+msgstr ""
 
 #: js/files.js:689
 msgid "error while scanning"
@@ -159,20 +159,20 @@ msgid "Modified"
 msgstr "Modifita"
 
 #: js/files.js:791
-msgid "folder"
-msgstr "dosierujo"
+msgid "1 folder"
+msgstr ""
 
 #: js/files.js:793
-msgid "folders"
-msgstr "dosierujoj"
+msgid "{count} folders"
+msgstr ""
 
 #: js/files.js:801
-msgid "file"
-msgstr "dosiero"
+msgid "1 file"
+msgstr ""
 
 #: js/files.js:803
-msgid "files"
-msgstr "dosieroj"
+msgid "{count} files"
+msgstr ""
 
 #: js/files.js:847
 msgid "seconds ago"
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 9896bc5bef4..d6fb3158138 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -16,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 23:38+0200\n"
-"PO-Revision-Date: 2012-10-16 20:22+0000\n"
-"Last-Translator: scambra <sergio@entrecables.com>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -132,16 +132,12 @@ msgid "Error while changing permissions"
 msgstr "Error cambiando permisos"
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr "Comprtido contigo y con el grupo"
-
-#: js/share.js:130
-msgid "by"
-msgstr "por"
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
-msgstr "Compartido contigo por"
+msgid "Shared with you by {owner}"
+msgstr ""
 
 #: js/share.js:137
 msgid "Share with"
@@ -181,12 +177,8 @@ msgid "Resharing is not allowed"
 msgstr "No se permite compartir de nuevo"
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr "Compartido en"
-
-#: js/share.js:250
-msgid "with"
-msgstr "con"
+msgid "Shared in {item} with {user}"
+msgstr ""
 
 #: js/share.js:271
 msgid "Unshare"
diff --git a/l10n/es/files.po b/l10n/es/files.po
index edab4fc1363..67bc9db4f0a 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-28 23:34+0200\n"
-"PO-Revision-Date: 2012-09-28 18:08+0000\n"
-"Last-Translator: scambra <sergio@entrecables.com>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -68,152 +68,152 @@ msgstr "Eliminar"
 msgid "Rename"
 msgstr "Renombrar"
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
-msgstr "ya existe"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
+msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr "reemplazar"
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr "sugerir nombre"
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
-msgstr "reemplazado"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "deshacer"
 
-#: js/filelist.js:241
-msgid "with"
-msgstr "con"
-
-#: js/filelist.js:273
-msgid "unshared"
-msgstr "no compartido"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
 
 #: js/filelist.js:275
-msgid "deleted"
-msgstr "borrado"
+msgid "unshared {files}"
+msgstr ""
+
+#: js/filelist.js:277
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "generando un fichero ZIP, puede llevar un tiempo."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "No ha sido posible subir tu archivo porque es un directorio o tiene 0 bytes"
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "Error al subir el archivo"
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr "Pendiente"
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr "subiendo 1 archivo"
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
-msgstr "archivos subiendo"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
+msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "Subida cancelada."
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "La subida del archivo está en proceso. Salir de la página ahora cancelará la subida."
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nombre no válido, '/' no está permitido."
 
-#: js/files.js:668
-msgid "files scanned"
-msgstr "archivos escaneados"
+#: js/files.js:681
+msgid "{count} files scanned"
+msgstr ""
 
-#: js/files.js:676
+#: js/files.js:689
 msgid "error while scanning"
 msgstr "error escaneando"
 
-#: js/files.js:749 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:750 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:751 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:778
-msgid "folder"
-msgstr "carpeta"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:780
-msgid "folders"
-msgstr "carpetas"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:788
-msgid "file"
-msgstr "archivo"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:790
-msgid "files"
-msgstr "archivos"
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
 
-#: js/files.js:834
+#: js/files.js:847
 msgid "seconds ago"
 msgstr "hace segundos"
 
-#: js/files.js:835
+#: js/files.js:848
 msgid "minute ago"
 msgstr "minuto"
 
-#: js/files.js:836
+#: js/files.js:849
 msgid "minutes ago"
 msgstr "hace minutos"
 
-#: js/files.js:839
+#: js/files.js:852
 msgid "today"
 msgstr "hoy"
 
-#: js/files.js:840
+#: js/files.js:853
 msgid "yesterday"
 msgstr "ayer"
 
-#: js/files.js:841
+#: js/files.js:854
 msgid "days ago"
 msgstr "días"
 
-#: js/files.js:842
+#: js/files.js:855
 msgid "last month"
 msgstr "mes pasado"
 
-#: js/files.js:844
+#: js/files.js:857
 msgid "months ago"
 msgstr "hace meses"
 
-#: js/files.js:845
+#: js/files.js:858
 msgid "last year"
 msgstr "año pasado"
 
-#: js/files.js:846
+#: js/files.js:859
 msgid "years ago"
 msgstr "hace años"
 
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index a213004d47d..8a31818caaa 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 23:38+0200\n"
-"PO-Revision-Date: 2012-10-16 08:55+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -124,16 +124,12 @@ msgid "Error while changing permissions"
 msgstr "Error al cambiar permisos"
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr "Compartido con vos y con el grupo"
-
-#: js/share.js:130
-msgid "by"
-msgstr "por"
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
-msgstr "Compartido con vos por"
+msgid "Shared with you by {owner}"
+msgstr ""
 
 #: js/share.js:137
 msgid "Share with"
@@ -173,12 +169,8 @@ msgid "Resharing is not allowed"
 msgstr "No se permite volver a compartir"
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr "Compartido en"
-
-#: js/share.js:250
-msgid "with"
-msgstr "con"
+msgid "Shared in {item} with {user}"
+msgstr ""
 
 #: js/share.js:271
 msgid "Unshare"
@@ -202,7 +194,7 @@ msgstr "actualizar"
 
 #: js/share.js:294
 msgid "delete"
-msgstr "remover"
+msgstr "borrar"
 
 #: js/share.js:297
 msgid "share"
@@ -238,7 +230,7 @@ msgstr "Pedido"
 
 #: lostpassword/templates/lostpassword.php:8
 msgid "Login failed!"
-msgstr "¡Fallo al iniciar sesión!"
+msgstr "¡Error al iniciar sesión!"
 
 #: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
 #: templates/login.php:20
@@ -251,7 +243,7 @@ msgstr "Solicitar restablecimiento"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
-msgstr "Tu contraseña ha sido restablecida"
+msgstr "Tu contraseña fue restablecida"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
@@ -291,7 +283,7 @@ msgstr "Acceso denegado"
 
 #: templates/404.php:12
 msgid "Cloud not found"
-msgstr "No se encontró owncloud"
+msgstr "No se encontró ownCloud"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -299,7 +291,7 @@ msgstr "Editar categorías"
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr "Añadir"
+msgstr "Agregar"
 
 #: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
@@ -328,7 +320,7 @@ msgstr "Tu directorio de datos y tus archivos son probablemente accesibles desde
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
-msgstr "Creá una <strong>cuenta de administrador</strong>"
+msgstr "Crear una <strong>cuenta de administrador</strong>"
 
 #: templates/installation.php:48
 msgid "Advanced"
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index 072de5c06f6..854e20ad311 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-28 23:34+0200\n"
-"PO-Revision-Date: 2012-09-28 09:21+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -64,152 +64,152 @@ msgstr "Borrar"
 msgid "Rename"
 msgstr "cambiar nombre"
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
-msgstr "ya existe"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
+msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr "reemplazar"
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr "sugerir nombre"
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
-msgstr "reemplazado"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "deshacer"
 
-#: js/filelist.js:241
-msgid "with"
-msgstr "con"
-
-#: js/filelist.js:273
-msgid "unshared"
-msgstr "no compartido"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
 
 #: js/filelist.js:275
-msgid "deleted"
-msgstr "borrado"
+msgid "unshared {files}"
+msgstr ""
+
+#: js/filelist.js:277
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "generando un archivo ZIP, puede llevar un tiempo."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "No fue posible subir tu archivo porque es un directorio o su tamaño es 0 bytes"
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "Error al subir el archivo"
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr "Pendiente"
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr "Subiendo 1 archivo"
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
-msgstr "Subiendo archivos"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
+msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "La subida fue cancelada"
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará."
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nombre no válido, '/' no está permitido."
 
-#: js/files.js:668
-msgid "files scanned"
-msgstr "archivos escaneados"
+#: js/files.js:681
+msgid "{count} files scanned"
+msgstr ""
 
-#: js/files.js:676
+#: js/files.js:689
 msgid "error while scanning"
 msgstr "error mientras se escaneaba"
 
-#: js/files.js:749 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:750 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:751 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:778
-msgid "folder"
-msgstr "carpeta"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:780
-msgid "folders"
-msgstr "carpetas"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:788
-msgid "file"
-msgstr "archivo"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:790
-msgid "files"
-msgstr "archivos"
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
 
-#: js/files.js:834
+#: js/files.js:847
 msgid "seconds ago"
 msgstr "segundos atrás"
 
-#: js/files.js:835
+#: js/files.js:848
 msgid "minute ago"
 msgstr "hace un minuto"
 
-#: js/files.js:836
+#: js/files.js:849
 msgid "minutes ago"
 msgstr "minutos atrás"
 
-#: js/files.js:839
+#: js/files.js:852
 msgid "today"
 msgstr "hoy"
 
-#: js/files.js:840
+#: js/files.js:853
 msgid "yesterday"
 msgstr "ayer"
 
-#: js/files.js:841
+#: js/files.js:854
 msgid "days ago"
 msgstr "días atrás"
 
-#: js/files.js:842
+#: js/files.js:855
 msgid "last month"
 msgstr "el mes pasado"
 
-#: js/files.js:844
+#: js/files.js:857
 msgid "months ago"
 msgstr "meses atrás"
 
-#: js/files.js:845
+#: js/files.js:858
 msgid "last year"
 msgstr "el año pasado"
 
-#: js/files.js:846
+#: js/files.js:859
 msgid "years ago"
 msgstr "años atrás"
 
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index bad107a5f86..66dc61258ca 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-11 02:04+0200\n"
-"PO-Revision-Date: 2012-10-10 06:43+0000\n"
+"POT-Creation-Date: 2012-10-18 02:04+0200\n"
+"PO-Revision-Date: 2012-10-17 14:30+0000\n"
 "Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -22,16 +22,11 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Imposible cargar la lista desde el App Store"
 
-#: ajax/creategroup.php:9 ajax/removeuser.php:18 ajax/setquota.php:18
-#: ajax/togglegroups.php:15
-msgid "Authentication error"
-msgstr "Error al autenticar"
-
-#: ajax/creategroup.php:19
+#: ajax/creategroup.php:12
 msgid "Group already exists"
 msgstr "El grupo ya existe"
 
-#: ajax/creategroup.php:28
+#: ajax/creategroup.php:21
 msgid "Unable to add group"
 msgstr "No fue posible añadir el grupo"
 
@@ -59,6 +54,10 @@ msgstr "Solicitud no válida"
 msgid "Unable to delete group"
 msgstr "No fue posible eliminar el grupo"
 
+#: ajax/removeuser.php:18 ajax/setquota.php:18 ajax/togglegroups.php:15
+msgid "Authentication error"
+msgstr "Error al autenticar"
+
 #: ajax/removeuser.php:27
 msgid "Unable to delete user"
 msgstr "No fue posible eliminar el usuario"
@@ -89,7 +88,7 @@ msgstr "Activar"
 msgid "Saving..."
 msgstr "Guardando..."
 
-#: personal.php:47 personal.php:48
+#: personal.php:42 personal.php:43
 msgid "__language_name__"
 msgstr "Castellano (Argentina)"
 
@@ -118,13 +117,13 @@ msgstr "Ejecutar una tarea con cada página cargada"
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
-msgstr "cron.php está registrado como un servicio del webcron. Llamá a la página de cron.php en la raíz de ownCloud cada minuto sobre http."
+msgstr "cron.php está registrado como un servicio del webcron. Esto carga la página de cron.php en la raíz de ownCloud cada minuto sobre http."
 
 #: templates/admin.php:49
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
-msgstr "Usar el servicio de cron del sistema. Llamá al archivo cron.php en la carpeta de ownCloud via servidor cronjob cada minuto."
+msgstr "Usar el servicio de cron del sistema. Esto carga  el archivo cron.php en la carpeta de ownCloud via servidor cronjob cada minuto."
 
 #: templates/admin.php:56
 msgid "Sharing"
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 6476f3b1ae4..928b2065db3 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -124,15 +124,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -173,11 +169,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 4aedcde54d1..e39593df86a 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -64,152 +64,152 @@ msgstr "Kustuta"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
-msgstr "on juba olemas"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
+msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr "asenda"
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr "soovita nime"
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr "loobu"
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
-msgstr "asendatud"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "tagasi"
 
-#: js/filelist.js:241
-msgid "with"
-msgstr "millega"
-
-#: js/filelist.js:273
-msgid "unshared"
-msgstr "jagamata"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
 
 #: js/filelist.js:275
-msgid "deleted"
-msgstr "kustutatud"
+msgid "unshared {files}"
+msgstr ""
+
+#: js/filelist.js:277
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "ZIP-faili loomine, see võib veidi aega võtta."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Sinu faili üleslaadimine ebaõnnestus, kuna see on kaust või selle suurus on 0 baiti"
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "Ãœleslaadimise viga"
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr "Ootel"
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "Üleslaadimine tühistati."
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Faili üleslaadimine on töös.  Lehelt lahkumine katkestab selle üleslaadimise."
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "Vigane nimi, '/' pole lubatud."
 
-#: js/files.js:667
-msgid "files scanned"
+#: js/files.js:681
+msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:675
+#: js/files.js:689
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "Nimi"
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "Suurus"
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "Muudetud"
 
-#: js/files.js:777
-msgid "folder"
-msgstr "kaust"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:779
-msgid "folders"
-msgstr "kausta"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:787
-msgid "file"
-msgstr "fail"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:789
-msgid "files"
-msgstr "faili"
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
 
-#: js/files.js:833
+#: js/files.js:847
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:834
+#: js/files.js:848
 msgid "minute ago"
 msgstr ""
 
-#: js/files.js:835
+#: js/files.js:849
 msgid "minutes ago"
 msgstr ""
 
-#: js/files.js:838
+#: js/files.js:852
 msgid "today"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:853
 msgid "yesterday"
 msgstr ""
 
-#: js/files.js:840
+#: js/files.js:854
 msgid "days ago"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:855
 msgid "last month"
 msgstr ""
 
-#: js/files.js:843
+#: js/files.js:857
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:844
+#: js/files.js:858
 msgid "last year"
 msgstr ""
 
-#: js/files.js:845
+#: js/files.js:859
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index c72e8ac4949..06f2b47cd2c 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -125,16 +125,12 @@ msgid "Error while changing permissions"
 msgstr "Errore bat egon da baimenak aldatzean"
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr "Zurekin eta taldearekin elkarbanatuta"
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
-msgstr "Honek zurekin elkarbanatuta:"
+msgid "Shared with you by {owner}"
+msgstr ""
 
 #: js/share.js:137
 msgid "Share with"
@@ -174,12 +170,8 @@ msgid "Resharing is not allowed"
 msgstr "Berriz elkarbanatzea ez dago baimendua"
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr "Elkarbanatua hemen:"
-
-#: js/share.js:250
-msgid "with"
-msgstr "honekin"
+msgid "Shared in {item} with {user}"
+msgstr ""
 
 #: js/share.js:271
 msgid "Unshare"
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index 47d4c288f1a..5a99e123f8e 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-04 02:04+0200\n"
-"PO-Revision-Date: 2012-10-03 07:58+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -65,152 +65,152 @@ msgstr "Ezabatu"
 msgid "Rename"
 msgstr "Berrizendatu"
 
-#: js/filelist.js:189 js/filelist.js:191
-msgid "already exists"
-msgstr "dagoeneko existitzen da"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
+msgstr ""
 
-#: js/filelist.js:189 js/filelist.js:191
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr "ordeztu"
 
-#: js/filelist.js:189
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr "aholkatu izena"
 
-#: js/filelist.js:189 js/filelist.js:191
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr "ezeztatu"
 
-#: js/filelist.js:238 js/filelist.js:240
-msgid "replaced"
-msgstr "ordeztua"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
-#: js/filelist.js:238 js/filelist.js:240 js/filelist.js:272 js/filelist.js:274
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "desegin"
 
-#: js/filelist.js:240
-msgid "with"
-msgstr "honekin"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
 
-#: js/filelist.js:272
-msgid "unshared"
-msgstr "Ez partekatuta"
+#: js/filelist.js:275
+msgid "unshared {files}"
+msgstr ""
 
-#: js/filelist.js:274
-msgid "deleted"
-msgstr "ezabatuta"
+#: js/filelist.js:277
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "ZIP-fitxategia sortzen ari da, denbora har dezake"
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Ezin da zure fitxategia igo, karpeta bat da edo 0 byt ditu"
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "Igotzean errore bat suertatu da"
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr "Zain"
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr "fitxategi 1 igotzen"
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
-msgstr "fitxategiak igotzen"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
+msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "Igoera ezeztatuta"
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du."
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "Baliogabeko izena, '/' ezin da erabili. "
 
-#: js/files.js:668
-msgid "files scanned"
-msgstr "fitxategiak eskaneatuta"
+#: js/files.js:681
+msgid "{count} files scanned"
+msgstr ""
 
-#: js/files.js:676
+#: js/files.js:689
 msgid "error while scanning"
 msgstr "errore bat egon da eskaneatzen zen bitartean"
 
-#: js/files.js:749 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "Izena"
 
-#: js/files.js:750 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "Tamaina"
 
-#: js/files.js:751 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "Aldatuta"
 
-#: js/files.js:778
-msgid "folder"
-msgstr "karpeta"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:780
-msgid "folders"
-msgstr "Karpetak"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:788
-msgid "file"
-msgstr "fitxategia"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:790
-msgid "files"
-msgstr "fitxategiak"
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
 
-#: js/files.js:834
+#: js/files.js:847
 msgid "seconds ago"
 msgstr "segundu"
 
-#: js/files.js:835
+#: js/files.js:848
 msgid "minute ago"
 msgstr "minutu"
 
-#: js/files.js:836
+#: js/files.js:849
 msgid "minutes ago"
 msgstr "minutu"
 
-#: js/files.js:839
+#: js/files.js:852
 msgid "today"
 msgstr "gaur"
 
-#: js/files.js:840
+#: js/files.js:853
 msgid "yesterday"
 msgstr "atzo"
 
-#: js/files.js:841
+#: js/files.js:854
 msgid "days ago"
 msgstr "egun"
 
-#: js/files.js:842
+#: js/files.js:855
 msgid "last month"
 msgstr "joan den hilabetean"
 
-#: js/files.js:844
+#: js/files.js:857
 msgid "months ago"
 msgstr "hilabete"
 
-#: js/files.js:845
+#: js/files.js:858
 msgid "last year"
 msgstr "joan den urtean"
 
-#: js/files.js:846
+#: js/files.js:859
 msgid "years ago"
 msgstr "urte"
 
diff --git a/l10n/eu_ES/core.po b/l10n/eu_ES/core.po
index a83a3117caf..0bb862f9f47 100644
--- a/l10n/eu_ES/core.po
+++ b/l10n/eu_ES/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -123,15 +123,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -172,11 +168,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/eu_ES/files.po b/l10n/eu_ES/files.po
index e697b9cd624..948105f4de4 100644
--- a/l10n/eu_ES/files.po
+++ b/l10n/eu_ES/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -63,152 +63,152 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:241
-msgid "with"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:273
-msgid "unshared"
+#: js/filelist.js:275
+msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:275
-msgid "deleted"
+#: js/filelist.js:277
+msgid "deleted {files}"
 msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:667
-msgid "files scanned"
+#: js/files.js:681
+msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:675
+#: js/files.js:689
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr ""
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr ""
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:777
-msgid "folder"
+#: js/files.js:791
+msgid "1 folder"
 msgstr ""
 
-#: js/files.js:779
-msgid "folders"
+#: js/files.js:793
+msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:787
-msgid "file"
+#: js/files.js:801
+msgid "1 file"
 msgstr ""
 
-#: js/files.js:789
-msgid "files"
+#: js/files.js:803
+msgid "{count} files"
 msgstr ""
 
-#: js/files.js:833
+#: js/files.js:847
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:834
+#: js/files.js:848
 msgid "minute ago"
 msgstr ""
 
-#: js/files.js:835
+#: js/files.js:849
 msgid "minutes ago"
 msgstr ""
 
-#: js/files.js:838
+#: js/files.js:852
 msgid "today"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:853
 msgid "yesterday"
 msgstr ""
 
-#: js/files.js:840
+#: js/files.js:854
 msgid "days ago"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:855
 msgid "last month"
 msgstr ""
 
-#: js/files.js:843
+#: js/files.js:857
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:844
+#: js/files.js:858
 msgid "last year"
 msgstr ""
 
-#: js/files.js:845
+#: js/files.js:859
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index beb8c04f5ff..920a719a356 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -124,15 +124,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -173,11 +169,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index c5f1da76fed..29868042414 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -66,152 +66,152 @@ msgstr "پاک کردن"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
-msgstr "وجود دارد"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
+msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr "جایگزین"
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr "لغو"
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
-msgstr "جایگزین‌شده"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "بازگشت"
 
-#: js/filelist.js:241
-msgid "with"
-msgstr "همراه"
-
-#: js/filelist.js:273
-msgid "unshared"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
 #: js/filelist.js:275
-msgid "deleted"
-msgstr "حذف شده"
+msgid "unshared {files}"
+msgstr ""
+
+#: js/filelist.js:277
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "در حال ساخت فایل فشرده ممکن است زمان زیادی به طول بیانجامد"
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "ناتوان در بارگذاری یا فایل یک پوشه است یا 0بایت دارد"
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "خطا در بار گذاری"
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr "در انتظار"
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "بار گذاری لغو شد"
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "نام نامناسب '/' غیرفعال است"
 
-#: js/files.js:667
-msgid "files scanned"
+#: js/files.js:681
+msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:675
+#: js/files.js:689
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "نام"
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "اندازه"
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "تغییر یافته"
 
-#: js/files.js:777
-msgid "folder"
-msgstr "پوشه"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:779
-msgid "folders"
-msgstr "پوشه ها"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:787
-msgid "file"
-msgstr "پرونده"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:789
-msgid "files"
-msgstr "پرونده ها"
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
 
-#: js/files.js:833
+#: js/files.js:847
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:834
+#: js/files.js:848
 msgid "minute ago"
 msgstr ""
 
-#: js/files.js:835
+#: js/files.js:849
 msgid "minutes ago"
 msgstr ""
 
-#: js/files.js:838
+#: js/files.js:852
 msgid "today"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:853
 msgid "yesterday"
 msgstr ""
 
-#: js/files.js:840
+#: js/files.js:854
 msgid "days ago"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:855
 msgid "last month"
 msgstr ""
 
-#: js/files.js:843
+#: js/files.js:857
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:844
+#: js/files.js:858
 msgid "last year"
 msgstr ""
 
-#: js/files.js:845
+#: js/files.js:859
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/fi/core.po b/l10n/fi/core.po
index b8ba8133417..a291bd38987 100644
--- a/l10n/fi/core.po
+++ b/l10n/fi/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
 "MIME-Version: 1.0\n"
@@ -123,15 +123,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -172,11 +168,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/fi/files.po b/l10n/fi/files.po
index 5f2a86b4856..f6e5c18c2f9 100644
--- a/l10n/fi/files.po
+++ b/l10n/fi/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
 "MIME-Version: 1.0\n"
@@ -63,152 +63,152 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:241
-msgid "with"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:273
-msgid "unshared"
+#: js/filelist.js:275
+msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:275
-msgid "deleted"
+#: js/filelist.js:277
+msgid "deleted {files}"
 msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:667
-msgid "files scanned"
+#: js/files.js:681
+msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:675
+#: js/files.js:689
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr ""
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr ""
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:777
-msgid "folder"
+#: js/files.js:791
+msgid "1 folder"
 msgstr ""
 
-#: js/files.js:779
-msgid "folders"
+#: js/files.js:793
+msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:787
-msgid "file"
+#: js/files.js:801
+msgid "1 file"
 msgstr ""
 
-#: js/files.js:789
-msgid "files"
+#: js/files.js:803
+msgid "{count} files"
 msgstr ""
 
-#: js/files.js:833
+#: js/files.js:847
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:834
+#: js/files.js:848
 msgid "minute ago"
 msgstr ""
 
-#: js/files.js:835
+#: js/files.js:849
 msgid "minutes ago"
 msgstr ""
 
-#: js/files.js:838
+#: js/files.js:852
 msgid "today"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:853
 msgid "yesterday"
 msgstr ""
 
-#: js/files.js:840
+#: js/files.js:854
 msgid "days ago"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:855
 msgid "last month"
 msgstr ""
 
-#: js/files.js:843
+#: js/files.js:857
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:844
+#: js/files.js:858
 msgid "last year"
 msgstr ""
 
-#: js/files.js:845
+#: js/files.js:859
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 313e7668c11..b7a76621ae4 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -130,15 +130,11 @@ msgid "Error while changing permissions"
 msgstr "Virhe oikeuksia muuttaessa"
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr "Jaettu sinulle ja ryhmälle"
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -179,13 +175,9 @@ msgid "Resharing is not allowed"
 msgstr "Jakaminen uudelleen ei ole salittu"
 
 #: js/share.js:250
-msgid "Shared in"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:250
-msgid "with"
-msgstr "kanssa"
-
 #: js/share.js:271
 msgid "Unshare"
 msgstr "Peru jakaminen"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 361afe1ce0c..b5d6ea35197 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-27 02:01+0200\n"
-"PO-Revision-Date: 2012-09-26 12:21+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -68,152 +68,152 @@ msgstr "Poista"
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
-msgstr "on jo olemassa"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
+msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr "korvaa"
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr "ehdota nimeä"
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr "peru"
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
-msgstr "korvattu"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "kumoa"
 
-#: js/filelist.js:241
-msgid "with"
-msgstr "käyttäen"
-
-#: js/filelist.js:273
-msgid "unshared"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
 #: js/filelist.js:275
-msgid "deleted"
-msgstr "poistettu"
+msgid "unshared {files}"
+msgstr ""
+
+#: js/filelist.js:277
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "luodaan ZIP-tiedostoa, tämä saattaa kestää hetken."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä on kansio"
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "Lähetysvirhe."
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr "Odottaa"
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "Lähetys peruttu."
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen."
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "Virheellinen nimi, merkki '/' ei ole sallittu."
 
-#: js/files.js:668
-msgid "files scanned"
+#: js/files.js:681
+msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:676
+#: js/files.js:689
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:749 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "Nimi"
 
-#: js/files.js:750 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "Koko"
 
-#: js/files.js:751 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "Muutettu"
 
-#: js/files.js:778
-msgid "folder"
-msgstr "kansio"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:780
-msgid "folders"
-msgstr "kansiota"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:788
-msgid "file"
-msgstr "tiedosto"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:790
-msgid "files"
-msgstr "tiedostoa"
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
 
-#: js/files.js:834
+#: js/files.js:847
 msgid "seconds ago"
 msgstr "sekuntia sitten"
 
-#: js/files.js:835
+#: js/files.js:848
 msgid "minute ago"
 msgstr "minuutti sitten"
 
-#: js/files.js:836
+#: js/files.js:849
 msgid "minutes ago"
 msgstr "minuuttia sitten"
 
-#: js/files.js:839
+#: js/files.js:852
 msgid "today"
 msgstr "tänään"
 
-#: js/files.js:840
+#: js/files.js:853
 msgid "yesterday"
 msgstr "eilen"
 
-#: js/files.js:841
+#: js/files.js:854
 msgid "days ago"
 msgstr "päivää sitten"
 
-#: js/files.js:842
+#: js/files.js:855
 msgid "last month"
 msgstr "viime kuussa"
 
-#: js/files.js:844
+#: js/files.js:857
 msgid "months ago"
 msgstr "kuukautta sitten"
 
-#: js/files.js:845
+#: js/files.js:858
 msgid "last year"
 msgstr "viime vuonna"
 
-#: js/files.js:846
+#: js/files.js:859
 msgid "years ago"
 msgstr "vuotta sitten"
 
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 1c412d0c968..d3c428cba75 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 23:38+0200\n"
-"PO-Revision-Date: 2012-10-16 15:01+0000\n"
-"Last-Translator: fkhannouf <fkhannouf@me.com>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -131,16 +131,12 @@ msgid "Error while changing permissions"
 msgstr "Erreur lors du changement des permissions"
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr "Partagé avec vous ainsi qu'avec le groupe"
-
-#: js/share.js:130
-msgid "by"
-msgstr "par"
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
-msgstr "Partagé avec vous par"
+msgid "Shared with you by {owner}"
+msgstr ""
 
 #: js/share.js:137
 msgid "Share with"
@@ -180,12 +176,8 @@ msgid "Resharing is not allowed"
 msgstr "Le repartage n'est pas autorisé"
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr "Partagé dans"
-
-#: js/share.js:250
-msgid "with"
-msgstr "avec"
+msgid "Shared in {item} with {user}"
+msgstr ""
 
 #: js/share.js:271
 msgid "Unshare"
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index b4ed9df3a69..574946bacc4 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-27 02:01+0200\n"
-"PO-Revision-Date: 2012-09-26 12:42+0000\n"
-"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,152 +73,152 @@ msgstr "Supprimer"
 msgid "Rename"
 msgstr "Renommer"
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
-msgstr "existe déjà"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
+msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr "remplacer"
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr "Suggérer un nom"
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr "annuler"
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
-msgstr "remplacé"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "annuler"
 
-#: js/filelist.js:241
-msgid "with"
-msgstr "avec"
-
-#: js/filelist.js:273
-msgid "unshared"
-msgstr "non partagée"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
 
 #: js/filelist.js:275
-msgid "deleted"
-msgstr "supprimé"
+msgid "unshared {files}"
+msgstr ""
+
+#: js/filelist.js:277
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "Fichier ZIP en cours d'assemblage ;  cela peut prendre du temps."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Impossible de charger vos fichiers car il s'agit d'un dossier ou le fichier fait 0 octet."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "Erreur de chargement"
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr "En cours"
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr "1 fichier en cours de téléchargement"
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
-msgstr "fichiers en cours de téléchargement"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
+msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "Chargement annulé."
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier."
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nom invalide, '/' n'est pas autorisé."
 
-#: js/files.js:668
-msgid "files scanned"
-msgstr "fichiers indexés"
+#: js/files.js:681
+msgid "{count} files scanned"
+msgstr ""
 
-#: js/files.js:676
+#: js/files.js:689
 msgid "error while scanning"
 msgstr "erreur lors de l'indexation"
 
-#: js/files.js:749 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:750 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "Taille"
 
-#: js/files.js:751 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "Modifié"
 
-#: js/files.js:778
-msgid "folder"
-msgstr "dossier"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:780
-msgid "folders"
-msgstr "dossiers"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:788
-msgid "file"
-msgstr "fichier"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:790
-msgid "files"
-msgstr "fichiers"
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
 
-#: js/files.js:834
+#: js/files.js:847
 msgid "seconds ago"
 msgstr "secondes passées"
 
-#: js/files.js:835
+#: js/files.js:848
 msgid "minute ago"
 msgstr "minute passée"
 
-#: js/files.js:836
+#: js/files.js:849
 msgid "minutes ago"
 msgstr "minutes passées"
 
-#: js/files.js:839
+#: js/files.js:852
 msgid "today"
 msgstr "aujourd'hui"
 
-#: js/files.js:840
+#: js/files.js:853
 msgid "yesterday"
 msgstr "hier"
 
-#: js/files.js:841
+#: js/files.js:854
 msgid "days ago"
 msgstr "jours passés"
 
-#: js/files.js:842
+#: js/files.js:855
 msgid "last month"
 msgstr "mois dernier"
 
-#: js/files.js:844
+#: js/files.js:857
 msgid "months ago"
 msgstr "mois passés"
 
-#: js/files.js:845
+#: js/files.js:858
 msgid "last year"
 msgstr "année dernière"
 
-#: js/files.js:846
+#: js/files.js:859
 msgid "years ago"
 msgstr "années passées"
 
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index ba2c90991a2..761374f4c47 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -125,15 +125,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -174,11 +170,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index d55fcad4c60..4886a45c4ef 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -65,152 +65,152 @@ msgstr "Eliminar"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
-msgstr "xa existe"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
+msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr "substituír"
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr "suxira nome"
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
-msgstr "substituído"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "desfacer"
 
-#: js/filelist.js:241
-msgid "with"
-msgstr "con"
-
-#: js/filelist.js:273
-msgid "unshared"
-msgstr "non compartido"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
 
 #: js/filelist.js:275
-msgid "deleted"
-msgstr "eliminado"
+msgid "unshared {files}"
+msgstr ""
+
+#: js/filelist.js:277
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "xerando ficheiro ZIP, pode levar un anaco."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Non se puido subir o ficheiro pois ou é un directorio ou ten 0 bytes"
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "Erro na subida"
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr "Pendentes"
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "Subida cancelada."
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "A subida do ficheiro está en curso. Saír agora da páxina cancelará a subida."
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nome non válido, '/' non está permitido."
 
-#: js/files.js:667
-msgid "files scanned"
-msgstr "ficheiros analizados"
+#: js/files.js:681
+msgid "{count} files scanned"
+msgstr ""
 
-#: js/files.js:675
+#: js/files.js:689
 msgid "error while scanning"
 msgstr "erro mentras analizaba"
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:777
-msgid "folder"
-msgstr "cartafol"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:779
-msgid "folders"
-msgstr "cartafoles"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:787
-msgid "file"
-msgstr "ficheiro"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:789
-msgid "files"
-msgstr "ficheiros"
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
 
-#: js/files.js:833
+#: js/files.js:847
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:834
+#: js/files.js:848
 msgid "minute ago"
 msgstr ""
 
-#: js/files.js:835
+#: js/files.js:849
 msgid "minutes ago"
 msgstr ""
 
-#: js/files.js:838
+#: js/files.js:852
 msgid "today"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:853
 msgid "yesterday"
 msgstr ""
 
-#: js/files.js:840
+#: js/files.js:854
 msgid "days ago"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:855
 msgid "last month"
 msgstr ""
 
-#: js/files.js:843
+#: js/files.js:857
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:844
+#: js/files.js:858
 msgid "last year"
 msgstr ""
 
-#: js/files.js:845
+#: js/files.js:859
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/he/core.po b/l10n/he/core.po
index ba5968dffac..9162d3c2d54 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -127,15 +127,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -176,11 +172,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/he/files.po b/l10n/he/files.po
index 2e585d9a670..1436abf2059 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -67,152 +67,152 @@ msgstr "מחיקה"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
-msgstr "כבר קיים"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
+msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:241
-msgid "with"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:273
-msgid "unshared"
+#: js/filelist.js:275
+msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:275
-msgid "deleted"
+#: js/filelist.js:277
+msgid "deleted {files}"
 msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "יוצר קובץ ZIP, אנא המתן."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "לא יכול להעלות את הקובץ מכיוון שזו תקיה או שמשקל הקובץ 0 בתים"
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "שגיאת העלאה"
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr "ממתין"
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "ההעלאה בוטלה."
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "שם לא חוקי, '/' אסור לשימוש."
 
-#: js/files.js:667
-msgid "files scanned"
+#: js/files.js:681
+msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:675
+#: js/files.js:689
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "שם"
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "גודל"
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "זמן שינוי"
 
-#: js/files.js:777
-msgid "folder"
-msgstr "תקיה"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:779
-msgid "folders"
-msgstr "תקיות"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:787
-msgid "file"
-msgstr "קובץ"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:789
-msgid "files"
-msgstr "קבצים"
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
 
-#: js/files.js:833
+#: js/files.js:847
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:834
+#: js/files.js:848
 msgid "minute ago"
 msgstr ""
 
-#: js/files.js:835
+#: js/files.js:849
 msgid "minutes ago"
 msgstr ""
 
-#: js/files.js:838
+#: js/files.js:852
 msgid "today"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:853
 msgid "yesterday"
 msgstr ""
 
-#: js/files.js:840
+#: js/files.js:854
 msgid "days ago"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:855
 msgid "last month"
 msgstr ""
 
-#: js/files.js:843
+#: js/files.js:857
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:844
+#: js/files.js:858
 msgid "last year"
 msgstr ""
 
-#: js/files.js:845
+#: js/files.js:859
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index 9f9f0bf0823..f3f287ff68d 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -124,15 +124,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -173,11 +169,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
index cc9c0f501ff..0fc06df5ca7 100644
--- a/l10n/hi/files.po
+++ b/l10n/hi/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -63,152 +63,152 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:241
-msgid "with"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:273
-msgid "unshared"
+#: js/filelist.js:275
+msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:275
-msgid "deleted"
+#: js/filelist.js:277
+msgid "deleted {files}"
 msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:667
-msgid "files scanned"
+#: js/files.js:681
+msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:675
+#: js/files.js:689
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr ""
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr ""
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:777
-msgid "folder"
+#: js/files.js:791
+msgid "1 folder"
 msgstr ""
 
-#: js/files.js:779
-msgid "folders"
+#: js/files.js:793
+msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:787
-msgid "file"
+#: js/files.js:801
+msgid "1 file"
 msgstr ""
 
-#: js/files.js:789
-msgid "files"
+#: js/files.js:803
+msgid "{count} files"
 msgstr ""
 
-#: js/files.js:833
+#: js/files.js:847
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:834
+#: js/files.js:848
 msgid "minute ago"
 msgstr ""
 
-#: js/files.js:835
+#: js/files.js:849
 msgid "minutes ago"
 msgstr ""
 
-#: js/files.js:838
+#: js/files.js:852
 msgid "today"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:853
 msgid "yesterday"
 msgstr ""
 
-#: js/files.js:840
+#: js/files.js:854
 msgid "days ago"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:855
 msgid "last month"
 msgstr ""
 
-#: js/files.js:843
+#: js/files.js:857
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:844
+#: js/files.js:858
 msgid "last year"
 msgstr ""
 
-#: js/files.js:845
+#: js/files.js:859
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index 9ab1d15928b..a807d261ea7 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -127,16 +127,12 @@ msgid "Error while changing permissions"
 msgstr "Greška prilikom promjena prava"
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr "Dijeli sa tobom i grupom"
-
-#: js/share.js:130
-msgid "by"
-msgstr "preko"
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
-msgstr "Dijeljeno sa tobom preko "
+msgid "Shared with you by {owner}"
+msgstr ""
 
 #: js/share.js:137
 msgid "Share with"
@@ -176,12 +172,8 @@ msgid "Resharing is not allowed"
 msgstr "Ponovo dijeljenje nije dopušteno"
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr "Dijeljeno u"
-
-#: js/share.js:250
-msgid "with"
-msgstr "sa"
+msgid "Shared in {item} with {user}"
+msgstr ""
 
 #: js/share.js:271
 msgid "Unshare"
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index 5cdd0eb8894..216d911878f 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-08 02:02+0200\n"
-"PO-Revision-Date: 2012-10-07 16:01+0000\n"
-"Last-Translator: fposavec <franz@franz-net.info>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -66,152 +66,152 @@ msgstr "Briši"
 msgid "Rename"
 msgstr "Promjeni ime"
 
-#: js/filelist.js:189 js/filelist.js:191
-msgid "already exists"
-msgstr "već postoji"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
+msgstr ""
 
-#: js/filelist.js:189 js/filelist.js:191
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr "zamjeni"
 
-#: js/filelist.js:189
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr "predloži ime"
 
-#: js/filelist.js:189 js/filelist.js:191
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr "odustani"
 
-#: js/filelist.js:238 js/filelist.js:240
-msgid "replaced"
-msgstr "zamjenjeno"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
-#: js/filelist.js:238 js/filelist.js:240 js/filelist.js:272 js/filelist.js:274
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "vrati"
 
-#: js/filelist.js:240
-msgid "with"
-msgstr "sa"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
 
-#: js/filelist.js:272
-msgid "unshared"
-msgstr "maknuto djeljenje"
+#: js/filelist.js:275
+msgid "unshared {files}"
+msgstr ""
 
-#: js/filelist.js:274
-msgid "deleted"
-msgstr "izbrisano"
+#: js/filelist.js:277
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "generiranje ZIP datoteke, ovo može potrajati."
 
-#: js/files.js:213
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Nemoguće poslati datoteku jer je prazna ili je direktorij"
 
-#: js/files.js:213
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "Pogreška pri slanju"
 
-#: js/files.js:241 js/files.js:346 js/files.js:376
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr "U tijeku"
 
-#: js/files.js:261
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr "1 datoteka se učitava"
 
-#: js/files.js:264 js/files.js:309 js/files.js:324
-msgid "files uploading"
-msgstr "datoteke se učitavaju"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
+msgstr ""
 
-#: js/files.js:327 js/files.js:360
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "Slanje poništeno."
 
-#: js/files.js:429
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Učitavanje datoteke. Napuštanjem stranice će prekinuti učitavanje."
 
-#: js/files.js:499
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "Neispravan naziv, znak '/' nije dozvoljen."
 
-#: js/files.js:676
-msgid "files scanned"
-msgstr "datoteka skenirana"
+#: js/files.js:681
+msgid "{count} files scanned"
+msgstr ""
 
-#: js/files.js:684
+#: js/files.js:689
 msgid "error while scanning"
 msgstr "grečka prilikom skeniranja"
 
-#: js/files.js:757 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "Naziv"
 
-#: js/files.js:758 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:759 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "Zadnja promjena"
 
-#: js/files.js:786
-msgid "folder"
-msgstr "mapa"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:788
-msgid "folders"
-msgstr "mape"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:796
-msgid "file"
-msgstr "datoteka"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:798
-msgid "files"
-msgstr "datoteke"
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
 
-#: js/files.js:842
+#: js/files.js:847
 msgid "seconds ago"
 msgstr "sekundi prije"
 
-#: js/files.js:843
+#: js/files.js:848
 msgid "minute ago"
 msgstr "minutu"
 
-#: js/files.js:844
+#: js/files.js:849
 msgid "minutes ago"
 msgstr "minuta"
 
-#: js/files.js:847
+#: js/files.js:852
 msgid "today"
 msgstr "danas"
 
-#: js/files.js:848
+#: js/files.js:853
 msgid "yesterday"
 msgstr "jučer"
 
-#: js/files.js:849
+#: js/files.js:854
 msgid "days ago"
 msgstr "dana"
 
-#: js/files.js:850
+#: js/files.js:855
 msgid "last month"
 msgstr "prošli mjesec"
 
-#: js/files.js:852
+#: js/files.js:857
 msgid "months ago"
 msgstr "mjeseci"
 
-#: js/files.js:853
+#: js/files.js:858
 msgid "last year"
 msgstr "prošlu godinu"
 
-#: js/files.js:854
+#: js/files.js:859
 msgid "years ago"
 msgstr "godina"
 
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 20cf6de2f5d..66d7b669284 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -126,15 +126,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -175,11 +171,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index bd28c3b21e4..c92bbae5f7d 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -66,152 +66,152 @@ msgstr "Törlés"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
-msgstr "már létezik"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
+msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr "cserél"
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr "mégse"
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
-msgstr "kicserélve"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "visszavon"
 
-#: js/filelist.js:241
-msgid "with"
-msgstr "-val/-vel"
-
-#: js/filelist.js:273
-msgid "unshared"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
 #: js/filelist.js:275
-msgid "deleted"
-msgstr "törölve"
+msgid "unshared {files}"
+msgstr ""
+
+#: js/filelist.js:277
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "ZIP-fájl generálása, ez eltarthat egy ideig."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Nem tölthető fel, mert mappa volt, vagy 0 byte méretű"
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "Feltöltési hiba"
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr "Folyamatban"
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "Feltöltés megszakítva"
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "Érvénytelen név, a '/' nem megengedett"
 
-#: js/files.js:667
-msgid "files scanned"
+#: js/files.js:681
+msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:675
+#: js/files.js:689
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "Név"
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "Méret"
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "Módosítva"
 
-#: js/files.js:777
-msgid "folder"
-msgstr "mappa"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:779
-msgid "folders"
-msgstr "mappák"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:787
-msgid "file"
-msgstr "fájl"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:789
-msgid "files"
-msgstr "fájlok"
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
 
-#: js/files.js:833
+#: js/files.js:847
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:834
+#: js/files.js:848
 msgid "minute ago"
 msgstr ""
 
-#: js/files.js:835
+#: js/files.js:849
 msgid "minutes ago"
 msgstr ""
 
-#: js/files.js:838
+#: js/files.js:852
 msgid "today"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:853
 msgid "yesterday"
 msgstr ""
 
-#: js/files.js:840
+#: js/files.js:854
 msgid "days ago"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:855
 msgid "last month"
 msgstr ""
 
-#: js/files.js:843
+#: js/files.js:857
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:844
+#: js/files.js:858
 msgid "last year"
 msgstr ""
 
-#: js/files.js:845
+#: js/files.js:859
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index 92b68ed29b0..868a6e0e91c 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -123,15 +123,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -172,11 +168,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index c512f61b785..3e5237cd388 100644
--- a/l10n/hy/files.po
+++ b/l10n/hy/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -63,152 +63,152 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:241
-msgid "with"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:273
-msgid "unshared"
+#: js/filelist.js:275
+msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:275
-msgid "deleted"
+#: js/filelist.js:277
+msgid "deleted {files}"
 msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:667
-msgid "files scanned"
+#: js/files.js:681
+msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:675
+#: js/files.js:689
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr ""
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr ""
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:777
-msgid "folder"
+#: js/files.js:791
+msgid "1 folder"
 msgstr ""
 
-#: js/files.js:779
-msgid "folders"
+#: js/files.js:793
+msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:787
-msgid "file"
+#: js/files.js:801
+msgid "1 file"
 msgstr ""
 
-#: js/files.js:789
-msgid "files"
+#: js/files.js:803
+msgid "{count} files"
 msgstr ""
 
-#: js/files.js:833
+#: js/files.js:847
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:834
+#: js/files.js:848
 msgid "minute ago"
 msgstr ""
 
-#: js/files.js:835
+#: js/files.js:849
 msgid "minutes ago"
 msgstr ""
 
-#: js/files.js:838
+#: js/files.js:852
 msgid "today"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:853
 msgid "yesterday"
 msgstr ""
 
-#: js/files.js:840
+#: js/files.js:854
 msgid "days ago"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:855
 msgid "last month"
 msgstr ""
 
-#: js/files.js:843
+#: js/files.js:857
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:844
+#: js/files.js:858
 msgid "last year"
 msgstr ""
 
-#: js/files.js:845
+#: js/files.js:859
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index f194ff40eb6..f6e1960d712 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -124,15 +124,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -173,11 +169,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 193354c48b2..c420b732cd2 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -65,152 +65,152 @@ msgstr "Deler"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:241
-msgid "with"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:273
-msgid "unshared"
+#: js/filelist.js:275
+msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:275
-msgid "deleted"
+#: js/filelist.js:277
+msgid "deleted {files}"
 msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:667
-msgid "files scanned"
+#: js/files.js:681
+msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:675
+#: js/files.js:689
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "Nomine"
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "Dimension"
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "Modificate"
 
-#: js/files.js:777
-msgid "folder"
+#: js/files.js:791
+msgid "1 folder"
 msgstr ""
 
-#: js/files.js:779
-msgid "folders"
+#: js/files.js:793
+msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:787
-msgid "file"
+#: js/files.js:801
+msgid "1 file"
 msgstr ""
 
-#: js/files.js:789
-msgid "files"
+#: js/files.js:803
+msgid "{count} files"
 msgstr ""
 
-#: js/files.js:833
+#: js/files.js:847
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:834
+#: js/files.js:848
 msgid "minute ago"
 msgstr ""
 
-#: js/files.js:835
+#: js/files.js:849
 msgid "minutes ago"
 msgstr ""
 
-#: js/files.js:838
+#: js/files.js:852
 msgid "today"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:853
 msgid "yesterday"
 msgstr ""
 
-#: js/files.js:840
+#: js/files.js:854
 msgid "days ago"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:855
 msgid "last month"
 msgstr ""
 
-#: js/files.js:843
+#: js/files.js:857
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:844
+#: js/files.js:858
 msgid "last year"
 msgstr ""
 
-#: js/files.js:845
+#: js/files.js:859
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 2f45fed4aaf..9ec10fab12f 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -126,15 +126,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -175,11 +171,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/id/files.po b/l10n/id/files.po
index a24bba4147a..f4f86d9d196 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -66,152 +66,152 @@ msgstr "Hapus"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
-msgstr "sudah ada"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
+msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr "mengganti"
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr "batalkan"
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
-msgstr "diganti"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "batal dikerjakan"
 
-#: js/filelist.js:241
-msgid "with"
-msgstr "dengan"
-
-#: js/filelist.js:273
-msgid "unshared"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
 #: js/filelist.js:275
-msgid "deleted"
-msgstr "dihapus"
+msgid "unshared {files}"
+msgstr ""
+
+#: js/filelist.js:277
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "membuat berkas ZIP, ini mungkin memakan waktu."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Gagal mengunggah berkas anda karena berupa direktori atau mempunyai ukuran 0 byte"
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "Terjadi Galat Pengunggahan"
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr "Menunggu"
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "Pengunggahan dibatalkan."
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "Kesalahan nama, '/' tidak diijinkan."
 
-#: js/files.js:667
-msgid "files scanned"
+#: js/files.js:681
+msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:675
+#: js/files.js:689
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "Nama"
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "Ukuran"
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:777
-msgid "folder"
-msgstr "folder"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:779
-msgid "folders"
-msgstr "folder-folder"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:787
-msgid "file"
-msgstr "berkas"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:789
-msgid "files"
-msgstr "berkas-berkas"
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
 
-#: js/files.js:833
+#: js/files.js:847
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:834
+#: js/files.js:848
 msgid "minute ago"
 msgstr ""
 
-#: js/files.js:835
+#: js/files.js:849
 msgid "minutes ago"
 msgstr ""
 
-#: js/files.js:838
+#: js/files.js:852
 msgid "today"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:853
 msgid "yesterday"
 msgstr ""
 
-#: js/files.js:840
+#: js/files.js:854
 msgid "days ago"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:855
 msgid "last month"
 msgstr ""
 
-#: js/files.js:843
+#: js/files.js:857
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:844
+#: js/files.js:858
 msgid "last year"
 msgstr ""
 
-#: js/files.js:845
+#: js/files.js:859
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/id_ID/core.po b/l10n/id_ID/core.po
index bda0015060e..0b89da36b9f 100644
--- a/l10n/id_ID/core.po
+++ b/l10n/id_ID/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -123,15 +123,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -172,11 +168,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/id_ID/files.po b/l10n/id_ID/files.po
index a4212970ad4..68dc4f4431f 100644
--- a/l10n/id_ID/files.po
+++ b/l10n/id_ID/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
@@ -63,152 +63,152 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:241
-msgid "with"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:273
-msgid "unshared"
+#: js/filelist.js:275
+msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:275
-msgid "deleted"
+#: js/filelist.js:277
+msgid "deleted {files}"
 msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:667
-msgid "files scanned"
+#: js/files.js:681
+msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:675
+#: js/files.js:689
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr ""
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr ""
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:777
-msgid "folder"
+#: js/files.js:791
+msgid "1 folder"
 msgstr ""
 
-#: js/files.js:779
-msgid "folders"
+#: js/files.js:793
+msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:787
-msgid "file"
+#: js/files.js:801
+msgid "1 file"
 msgstr ""
 
-#: js/files.js:789
-msgid "files"
+#: js/files.js:803
+msgid "{count} files"
 msgstr ""
 
-#: js/files.js:833
+#: js/files.js:847
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:834
+#: js/files.js:848
 msgid "minute ago"
 msgstr ""
 
-#: js/files.js:835
+#: js/files.js:849
 msgid "minutes ago"
 msgstr ""
 
-#: js/files.js:838
+#: js/files.js:852
 msgid "today"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:853
 msgid "yesterday"
 msgstr ""
 
-#: js/files.js:840
+#: js/files.js:854
 msgid "days ago"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:855
 msgid "last month"
 msgstr ""
 
-#: js/files.js:843
+#: js/files.js:857
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:844
+#: js/files.js:858
 msgid "last year"
 msgstr ""
 
-#: js/files.js:845
+#: js/files.js:859
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 7cc9f7deddd..7cf5e9a088d 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 23:38+0200\n"
-"PO-Revision-Date: 2012-10-16 08:03+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -128,16 +128,12 @@ msgid "Error while changing permissions"
 msgstr "Errore durante la modifica dei permessi"
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr "Condiviso con te e con il gruppo"
-
-#: js/share.js:130
-msgid "by"
-msgstr "da"
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
-msgstr "Condiviso con te da"
+msgid "Shared with you by {owner}"
+msgstr ""
 
 #: js/share.js:137
 msgid "Share with"
@@ -177,12 +173,8 @@ msgid "Resharing is not allowed"
 msgstr "La ri-condivisione non è consentita"
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr "Condiviso in"
-
-#: js/share.js:250
-msgid "with"
-msgstr "con"
+msgid "Shared in {item} with {user}"
+msgstr ""
 
 #: js/share.js:271
 msgid "Unshare"
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 0677f2ddd44..5fe5b39487e 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-27 02:01+0200\n"
-"PO-Revision-Date: 2012-09-26 12:00+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -67,152 +67,152 @@ msgstr "Elimina"
 msgid "Rename"
 msgstr "Rinomina"
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
-msgstr "esiste già"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
+msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr "sostituisci"
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr "suggerisci nome"
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr "annulla"
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
-msgstr "sostituito"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "annulla"
 
-#: js/filelist.js:241
-msgid "with"
-msgstr "con"
-
-#: js/filelist.js:273
-msgid "unshared"
-msgstr "condivisione rimossa"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
 
 #: js/filelist.js:275
-msgid "deleted"
-msgstr "eliminati"
+msgid "unshared {files}"
+msgstr ""
+
+#: js/filelist.js:277
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "creazione file ZIP, potrebbe richiedere del tempo."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Impossibile inviare il file poiché è una cartella o ha dimensione 0 byte"
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "Errore di invio"
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr "In corso"
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr "1 file in fase di caricamento"
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
-msgstr "file in fase di caricamento"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
+msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "Invio annullato"
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento."
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nome non valido"
 
-#: js/files.js:668
-msgid "files scanned"
-msgstr "file analizzati"
+#: js/files.js:681
+msgid "{count} files scanned"
+msgstr ""
 
-#: js/files.js:676
+#: js/files.js:689
 msgid "error while scanning"
 msgstr "errore durante la scansione"
 
-#: js/files.js:749 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:750 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "Dimensione"
 
-#: js/files.js:751 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "Modificato"
 
-#: js/files.js:778
-msgid "folder"
-msgstr "cartella"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:780
-msgid "folders"
-msgstr "cartelle"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:788
-msgid "file"
-msgstr "file"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:790
-msgid "files"
-msgstr "file"
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
 
-#: js/files.js:834
+#: js/files.js:847
 msgid "seconds ago"
 msgstr "secondi fa"
 
-#: js/files.js:835
+#: js/files.js:848
 msgid "minute ago"
 msgstr "minuto fa"
 
-#: js/files.js:836
+#: js/files.js:849
 msgid "minutes ago"
 msgstr "minuti fa"
 
-#: js/files.js:839
+#: js/files.js:852
 msgid "today"
 msgstr "oggi"
 
-#: js/files.js:840
+#: js/files.js:853
 msgid "yesterday"
 msgstr "ieri"
 
-#: js/files.js:841
+#: js/files.js:854
 msgid "days ago"
 msgstr "giorni fa"
 
-#: js/files.js:842
+#: js/files.js:855
 msgid "last month"
 msgstr "mese scorso"
 
-#: js/files.js:844
+#: js/files.js:857
 msgid "months ago"
 msgstr "mesi fa"
 
-#: js/files.js:845
+#: js/files.js:858
 msgid "last year"
 msgstr "anno scorso"
 
-#: js/files.js:846
+#: js/files.js:859
 msgid "years ago"
 msgstr "anni fa"
 
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index ab8cf78a5b3..38c45af7017 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 23:38+0200\n"
-"PO-Revision-Date: 2012-10-16 06:57+0000\n"
-"Last-Translator: ttyn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -125,16 +125,12 @@ msgid "Error while changing permissions"
 msgstr "権限変更でエラー発生"
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr "あなたとグループで共有中"
-
-#: js/share.js:130
-msgid "by"
-msgstr "により"
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
-msgstr "あなたと共有"
+msgid "Shared with you by {owner}"
+msgstr ""
 
 #: js/share.js:137
 msgid "Share with"
@@ -174,12 +170,8 @@ msgid "Resharing is not allowed"
 msgstr "再共有は許可されていません"
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr "の中で共有中"
-
-#: js/share.js:250
-msgid "with"
-msgstr "と"
+msgid "Shared in {item} with {user}"
+msgstr ""
 
 #: js/share.js:271
 msgid "Unshare"
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index 786548648ce..7440715c996 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-28 02:02+0200\n"
-"PO-Revision-Date: 2012-09-27 00:51+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -65,152 +65,152 @@ msgstr "削除"
 msgid "Rename"
 msgstr "名前の変更"
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
-msgstr "既に存在します"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
+msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr "置き換え"
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr "推奨名称"
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr "キャンセル"
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
-msgstr "置換："
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "元に戻す"
 
-#: js/filelist.js:241
-msgid "with"
-msgstr "←"
-
-#: js/filelist.js:273
-msgid "unshared"
-msgstr "未共有"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
 
 #: js/filelist.js:275
-msgid "deleted"
-msgstr "削除"
+msgid "unshared {files}"
+msgstr ""
+
+#: js/filelist.js:277
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "ZIPファイルを生成中です、しばらくお待ちください。"
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "アップロード使用としているファイルがディレクトリ、もしくはサイズが0バイトのため、アップロードできません。"
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "アップロードエラー"
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr "保留"
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr "ファイルを1つアップロード中"
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
-msgstr "ファイルをアップロード中"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
+msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "アップロードはキャンセルされました。"
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。"
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "無効な名前、'/' は使用できません。"
 
-#: js/files.js:668
-msgid "files scanned"
-msgstr "ファイルをスキャンしました"
+#: js/files.js:681
+msgid "{count} files scanned"
+msgstr ""
 
-#: js/files.js:676
+#: js/files.js:689
 msgid "error while scanning"
 msgstr "スキャン中のエラー"
 
-#: js/files.js:749 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "名前"
 
-#: js/files.js:750 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "サイズ"
 
-#: js/files.js:751 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "更新日時"
 
-#: js/files.js:778
-msgid "folder"
-msgstr "フォルダ"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:780
-msgid "folders"
-msgstr "フォルダ"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:788
-msgid "file"
-msgstr "ファイル"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:790
-msgid "files"
-msgstr "ファイル"
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
 
-#: js/files.js:834
+#: js/files.js:847
 msgid "seconds ago"
 msgstr "秒前"
 
-#: js/files.js:835
+#: js/files.js:848
 msgid "minute ago"
 msgstr "分前"
 
-#: js/files.js:836
+#: js/files.js:849
 msgid "minutes ago"
 msgstr "分前"
 
-#: js/files.js:839
+#: js/files.js:852
 msgid "today"
 msgstr "今日"
 
-#: js/files.js:840
+#: js/files.js:853
 msgid "yesterday"
 msgstr "昨日"
 
-#: js/files.js:841
+#: js/files.js:854
 msgid "days ago"
 msgstr "日前"
 
-#: js/files.js:842
+#: js/files.js:855
 msgid "last month"
 msgstr "一月前"
 
-#: js/files.js:844
+#: js/files.js:857
 msgid "months ago"
 msgstr "月前"
 
-#: js/files.js:845
+#: js/files.js:858
 msgid "last year"
 msgstr "一年前"
 
-#: js/files.js:846
+#: js/files.js:859
 msgid "years ago"
 msgstr "年前"
 
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index 79125bc4578..bf5c8fb7c4d 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -125,15 +125,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -174,11 +170,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index fdbc75250d4..130d641acf5 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -65,152 +65,152 @@ msgstr "삭제"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
-msgstr "이미 존재 합니다"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
+msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr "대체"
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr "취소"
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
-msgstr "대체됨"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "복구"
 
-#: js/filelist.js:241
-msgid "with"
-msgstr "와"
-
-#: js/filelist.js:273
-msgid "unshared"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
 #: js/filelist.js:275
-msgid "deleted"
-msgstr "삭제"
+msgid "unshared {files}"
+msgstr ""
+
+#: js/filelist.js:277
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "ZIP파일 생성에 시간이 걸릴 수 있습니다."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "이 파일은 디렉토리이거나 0 바이트이기 때문에 업로드 할 수 없습니다."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "업로드 에러"
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr "보류 중"
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "업로드 취소."
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "잘못된 이름, '/' 은 허용이 되지 않습니다."
 
-#: js/files.js:667
-msgid "files scanned"
+#: js/files.js:681
+msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:675
+#: js/files.js:689
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "이름"
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "크기"
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "수정됨"
 
-#: js/files.js:777
-msgid "folder"
-msgstr "폴더"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:779
-msgid "folders"
-msgstr "폴더"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:787
-msgid "file"
-msgstr "파일"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:789
-msgid "files"
-msgstr "파일"
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
 
-#: js/files.js:833
+#: js/files.js:847
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:834
+#: js/files.js:848
 msgid "minute ago"
 msgstr ""
 
-#: js/files.js:835
+#: js/files.js:849
 msgid "minutes ago"
 msgstr ""
 
-#: js/files.js:838
+#: js/files.js:852
 msgid "today"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:853
 msgid "yesterday"
 msgstr ""
 
-#: js/files.js:840
+#: js/files.js:854
 msgid "days ago"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:855
 msgid "last month"
 msgstr ""
 
-#: js/files.js:843
+#: js/files.js:857
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:844
+#: js/files.js:858
 msgid "last year"
 msgstr ""
 
-#: js/files.js:845
+#: js/files.js:859
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po
index 56a268f7ba1..fc833256480 100644
--- a/l10n/ku_IQ/core.po
+++ b/l10n/ku_IQ/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -124,15 +124,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -173,11 +169,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po
index 49231949ee8..1b83c338d04 100644
--- a/l10n/ku_IQ/files.po
+++ b/l10n/ku_IQ/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-07 02:03+0200\n"
-"PO-Revision-Date: 2011-08-13 02:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -63,152 +63,152 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:189 js/filelist.js:191
-msgid "already exists"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:189 js/filelist.js:191
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:189
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:189 js/filelist.js:191
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:238 js/filelist.js:240
-msgid "replaced"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:238 js/filelist.js:240 js/filelist.js:272 js/filelist.js:274
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:240
-msgid "with"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:272
-msgid "unshared"
+#: js/filelist.js:275
+msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:274
-msgid "deleted"
+#: js/filelist.js:277
+msgid "deleted {files}"
 msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:215
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:215
+#: js/files.js:214
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:243 js/files.js:348 js/files.js:378
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:263
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:266 js/files.js:311 js/files.js:326
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:329 js/files.js:362
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:432
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:502
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:679
-msgid "files scanned"
+#: js/files.js:681
+msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:687
+#: js/files.js:689
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:760 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr ""
 
-#: js/files.js:761 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr ""
 
-#: js/files.js:762 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:789
-msgid "folder"
-msgstr ""
-
 #: js/files.js:791
-msgid "folders"
+msgid "1 folder"
 msgstr ""
 
-#: js/files.js:799
-msgid "file"
+#: js/files.js:793
+msgid "{count} folders"
 msgstr ""
 
 #: js/files.js:801
-msgid "files"
+msgid "1 file"
+msgstr ""
+
+#: js/files.js:803
+msgid "{count} files"
 msgstr ""
 
-#: js/files.js:845
+#: js/files.js:847
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:846
+#: js/files.js:848
 msgid "minute ago"
 msgstr ""
 
-#: js/files.js:847
+#: js/files.js:849
 msgid "minutes ago"
 msgstr ""
 
-#: js/files.js:850
+#: js/files.js:852
 msgid "today"
 msgstr ""
 
-#: js/files.js:851
+#: js/files.js:853
 msgid "yesterday"
 msgstr ""
 
-#: js/files.js:852
+#: js/files.js:854
 msgid "days ago"
 msgstr ""
 
-#: js/files.js:853
+#: js/files.js:855
 msgid "last month"
 msgstr ""
 
-#: js/files.js:855
+#: js/files.js:857
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:856
+#: js/files.js:858
 msgid "last year"
 msgstr ""
 
-#: js/files.js:857
+#: js/files.js:859
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index eeafec6d3bd..d0cb3ac53b6 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -124,15 +124,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -173,11 +169,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index 582e344c385..b81b7470107 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -64,152 +64,152 @@ msgstr "Läschen"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
-msgstr "existéiert schonn"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
+msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr "ofbriechen"
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
-msgstr "ersat"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "réckgängeg man"
 
-#: js/filelist.js:241
-msgid "with"
-msgstr "mat"
-
-#: js/filelist.js:273
-msgid "unshared"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
 #: js/filelist.js:275
-msgid "deleted"
-msgstr "geläscht"
+msgid "unshared {files}"
+msgstr ""
+
+#: js/filelist.js:277
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "Et  gëtt eng ZIP-File generéiert, dëst ka bëssen daueren."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Kann deng Datei net eroplueden well et en Dossier ass oder 0 byte grouss ass."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "Fehler beim eroplueden"
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "Upload ofgebrach."
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach."
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "Ongültege Numm, '/' net erlaabt."
 
-#: js/files.js:667
-msgid "files scanned"
+#: js/files.js:681
+msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:675
+#: js/files.js:689
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "Numm"
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "Gréisst"
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "Geännert"
 
-#: js/files.js:777
-msgid "folder"
-msgstr "Dossier"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:779
-msgid "folders"
-msgstr "Dossieren"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:787
-msgid "file"
-msgstr "Datei"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:789
-msgid "files"
-msgstr "Dateien"
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
 
-#: js/files.js:833
+#: js/files.js:847
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:834
+#: js/files.js:848
 msgid "minute ago"
 msgstr ""
 
-#: js/files.js:835
+#: js/files.js:849
 msgid "minutes ago"
 msgstr ""
 
-#: js/files.js:838
+#: js/files.js:852
 msgid "today"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:853
 msgid "yesterday"
 msgstr ""
 
-#: js/files.js:840
+#: js/files.js:854
 msgid "days ago"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:855
 msgid "last month"
 msgstr ""
 
-#: js/files.js:843
+#: js/files.js:857
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:844
+#: js/files.js:858
 msgid "last year"
 msgstr ""
 
-#: js/files.js:845
+#: js/files.js:859
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 529ba10793d..ecfaac10e97 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -124,15 +124,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -173,11 +169,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index 60cfe9abe22..8b49aa4a6d0 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -65,152 +65,152 @@ msgstr "IÅ¡trinti"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr "atšaukti"
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:241
-msgid "with"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:273
-msgid "unshared"
+#: js/filelist.js:275
+msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:275
-msgid "deleted"
+#: js/filelist.js:277
+msgid "deleted {files}"
 msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "kuriamas ZIP archyvas, tai gali užtrukti šiek tiek laiko."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Neįmanoma įkelti failo - jo dydis gali būti 0 bitų arba tai katalogas"
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "Įkėlimo klaida"
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr "Laukiantis"
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "Įkėlimas atšauktas."
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "Pavadinime negali būti naudojamas ženklas \"/\"."
 
-#: js/files.js:667
-msgid "files scanned"
+#: js/files.js:681
+msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:675
+#: js/files.js:689
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "Pavadinimas"
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "Dydis"
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "Pakeista"
 
-#: js/files.js:777
-msgid "folder"
-msgstr "katalogas"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:779
-msgid "folders"
-msgstr "katalogai"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:787
-msgid "file"
-msgstr "failas"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:789
-msgid "files"
-msgstr "failai"
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
 
-#: js/files.js:833
+#: js/files.js:847
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:834
+#: js/files.js:848
 msgid "minute ago"
 msgstr ""
 
-#: js/files.js:835
+#: js/files.js:849
 msgid "minutes ago"
 msgstr ""
 
-#: js/files.js:838
+#: js/files.js:852
 msgid "today"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:853
 msgid "yesterday"
 msgstr ""
 
-#: js/files.js:840
+#: js/files.js:854
 msgid "days ago"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:855
 msgid "last month"
 msgstr ""
 
-#: js/files.js:843
+#: js/files.js:857
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:844
+#: js/files.js:858
 msgid "last year"
 msgstr ""
 
-#: js/files.js:845
+#: js/files.js:859
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index dbc6b29788e..93cdffc7502 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -124,15 +124,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -173,11 +169,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index ae81cbe59e0..d42ae099cfc 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -64,152 +64,152 @@ msgstr "Izdzēst"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
-msgstr "tāds fails jau eksistē"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
+msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr "aizvietot"
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr "atcelt"
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
-msgstr "aizvietots"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "vienu soli atpakaļ"
 
-#: js/filelist.js:241
-msgid "with"
-msgstr "ar"
-
-#: js/filelist.js:273
-msgid "unshared"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
 #: js/filelist.js:275
-msgid "deleted"
-msgstr "izdzests"
+msgid "unshared {files}"
+msgstr ""
+
+#: js/filelist.js:277
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "lai uzģenerētu ZIP failu, kāds brīdis ir jāpagaida"
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Nav iespējams augšuplādēt jūsu failu, jo tāds jau eksistē vai arī failam nav izmēra (0 baiti)"
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "Augšuplādēšanas laikā radās kļūda"
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr "Gaida savu kārtu"
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "Augšuplāde ir atcelta"
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "Šis simbols '/', nav atļauts."
 
-#: js/files.js:667
-msgid "files scanned"
+#: js/files.js:681
+msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:675
+#: js/files.js:689
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "Nosaukums"
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "Izmērs"
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "Izmainīts"
 
-#: js/files.js:777
-msgid "folder"
-msgstr "mape"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:779
-msgid "folders"
-msgstr "mapes"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:787
-msgid "file"
-msgstr "fails"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:789
-msgid "files"
-msgstr "faili"
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
 
-#: js/files.js:833
+#: js/files.js:847
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:834
+#: js/files.js:848
 msgid "minute ago"
 msgstr ""
 
-#: js/files.js:835
+#: js/files.js:849
 msgid "minutes ago"
 msgstr ""
 
-#: js/files.js:838
+#: js/files.js:852
 msgid "today"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:853
 msgid "yesterday"
 msgstr ""
 
-#: js/files.js:840
+#: js/files.js:854
 msgid "days ago"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:855
 msgid "last month"
 msgstr ""
 
-#: js/files.js:843
+#: js/files.js:857
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:844
+#: js/files.js:858
 msgid "last year"
 msgstr ""
 
-#: js/files.js:845
+#: js/files.js:859
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index e3ef1875d13..11ecb975e03 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -126,15 +126,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -175,11 +171,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index c04e3640bb6..27e1743fd58 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -66,152 +66,152 @@ msgstr "Избриши"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:241
-msgid "with"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:273
-msgid "unshared"
+#: js/filelist.js:275
+msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:275
-msgid "deleted"
+#: js/filelist.js:277
+msgid "deleted {files}"
 msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "Се генерира ZIP фајлот, ќе треба извесно време."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Не може да се преземе вашата датотека бидејќи фолдерот во кој се наоѓа фајлот има големина од 0 бајти"
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "Грешка при преземање"
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr "Чека"
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "Преземањето е прекинато."
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "неисправно име, '/' не е дозволено."
 
-#: js/files.js:667
-msgid "files scanned"
+#: js/files.js:681
+msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:675
+#: js/files.js:689
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "Големина"
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "Променето"
 
-#: js/files.js:777
-msgid "folder"
-msgstr "фолдер"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:779
-msgid "folders"
-msgstr "фолдери"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:787
-msgid "file"
-msgstr "датотека"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:789
-msgid "files"
-msgstr "датотеки"
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
 
-#: js/files.js:833
+#: js/files.js:847
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:834
+#: js/files.js:848
 msgid "minute ago"
 msgstr ""
 
-#: js/files.js:835
+#: js/files.js:849
 msgid "minutes ago"
 msgstr ""
 
-#: js/files.js:838
+#: js/files.js:852
 msgid "today"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:853
 msgid "yesterday"
 msgstr ""
 
-#: js/files.js:840
+#: js/files.js:854
 msgid "days ago"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:855
 msgid "last month"
 msgstr ""
 
-#: js/files.js:843
+#: js/files.js:857
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:844
+#: js/files.js:858
 msgid "last year"
 msgstr ""
 
-#: js/files.js:845
+#: js/files.js:859
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index d336f9d5447..dfdf01bb11b 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -126,15 +126,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -175,11 +171,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index 49c390d75c4..40b64fd0bbb 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -67,152 +67,152 @@ msgstr "Padam"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
-msgstr "Sudah wujud"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
+msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr "ganti"
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr "Batal"
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
-msgstr "diganti"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:241
-msgid "with"
-msgstr "dengan"
-
-#: js/filelist.js:273
-msgid "unshared"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
 #: js/filelist.js:275
-msgid "deleted"
-msgstr "dihapus"
+msgid "unshared {files}"
+msgstr ""
+
+#: js/filelist.js:277
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "sedang menghasilkan fail ZIP, mungkin mengambil sedikit masa."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Tidak boleh memuatnaik fail anda kerana mungkin ianya direktori atau saiz fail 0 bytes"
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "Muat naik ralat"
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr "Dalam proses"
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "Muatnaik dibatalkan."
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "penggunaa nama tidak sah, '/' tidak dibenarkan."
 
-#: js/files.js:667
-msgid "files scanned"
+#: js/files.js:681
+msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:675
+#: js/files.js:689
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "Nama "
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "Saiz"
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:777
-msgid "folder"
-msgstr "direktori"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:779
-msgid "folders"
-msgstr "direktori"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:787
-msgid "file"
-msgstr "fail"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:789
-msgid "files"
-msgstr "fail"
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
 
-#: js/files.js:833
+#: js/files.js:847
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:834
+#: js/files.js:848
 msgid "minute ago"
 msgstr ""
 
-#: js/files.js:835
+#: js/files.js:849
 msgid "minutes ago"
 msgstr ""
 
-#: js/files.js:838
+#: js/files.js:852
 msgid "today"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:853
 msgid "yesterday"
 msgstr ""
 
-#: js/files.js:840
+#: js/files.js:854
 msgid "days ago"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:855
 msgid "last month"
 msgstr ""
 
-#: js/files.js:843
+#: js/files.js:857
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:844
+#: js/files.js:858
 msgid "last year"
 msgstr ""
 
-#: js/files.js:845
+#: js/files.js:859
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index baab6b280d8..80b8ee173eb 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -128,15 +128,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -177,11 +173,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index 1281f011d12..7c69ca3a48d 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 23:37+0200\n"
-"PO-Revision-Date: 2012-10-16 21:29+0000\n"
-"Last-Translator: sindrejh <sindre@haverstad.com>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -71,8 +71,8 @@ msgid "Rename"
 msgstr "Omdøp"
 
 #: js/filelist.js:192 js/filelist.js:194
-msgid "already exists"
-msgstr "eksisterer allerede"
+msgid "{new_name} already exists"
+msgstr ""
 
 #: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
@@ -86,25 +86,25 @@ msgstr "foreslå navn"
 msgid "cancel"
 msgstr "avbryt"
 
-#: js/filelist.js:241 js/filelist.js:243
-msgid "replaced"
-msgstr "erstattet"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
 #: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "angre"
 
 #: js/filelist.js:243
-msgid "with"
-msgstr "med"
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
 
 #: js/filelist.js:275
-msgid "unshared"
-msgstr "deling avsluttet"
+msgid "unshared {files}"
+msgstr ""
 
 #: js/filelist.js:277
-msgid "deleted"
-msgstr "slettet"
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
@@ -127,8 +127,8 @@ msgid "1 file uploading"
 msgstr "1 fil lastes opp"
 
 #: js/files.js:265 js/files.js:310 js/files.js:325
-msgid "files uploading"
-msgstr "filer lastes opp"
+msgid "{count} files uploading"
+msgstr ""
 
 #: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
@@ -144,8 +144,8 @@ msgid "Invalid name, '/' is not allowed."
 msgstr "Ugyldig navn, '/' er ikke tillatt. "
 
 #: js/files.js:681
-msgid "files scanned"
-msgstr "Filer skannet"
+msgid "{count} files scanned"
+msgstr ""
 
 #: js/files.js:689
 msgid "error while scanning"
@@ -164,20 +164,20 @@ msgid "Modified"
 msgstr "Endret"
 
 #: js/files.js:791
-msgid "folder"
-msgstr "mappe"
+msgid "1 folder"
+msgstr ""
 
 #: js/files.js:793
-msgid "folders"
-msgstr "mapper"
+msgid "{count} folders"
+msgstr ""
 
 #: js/files.js:801
-msgid "file"
-msgstr "fil"
+msgid "1 file"
+msgstr ""
 
 #: js/files.js:803
-msgid "files"
-msgstr "filer"
+msgid "{count} files"
+msgstr ""
 
 #: js/files.js:847
 msgid "seconds ago"
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index b4220820df5..a788b1fc68e 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -11,12 +11,13 @@
 #   <koen@vervloesem.eu>, 2011.
 #   <pietje8501@gmail.com>, 2012.
 # Richard Bos <radoeka@gmail.com>, 2012.
+#   <webbsite-mark@hotmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -131,16 +132,12 @@ msgid "Error while changing permissions"
 msgstr "Fout tijdens het veranderen van permissies"
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr "Gedeeld me u en de groep"
-
-#: js/share.js:130
-msgid "by"
-msgstr "door"
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
-msgstr "Gedeeld met u door"
+msgid "Shared with you by {owner}"
+msgstr ""
 
 #: js/share.js:137
 msgid "Share with"
@@ -180,12 +177,8 @@ msgid "Resharing is not allowed"
 msgstr "Verder delen is niet toegestaan"
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr "Gedeeld in"
-
-#: js/share.js:250
-msgid "with"
-msgstr "met"
+msgid "Shared in {item} with {user}"
+msgstr ""
 
 #: js/share.js:271
 msgid "Unshare"
@@ -310,7 +303,7 @@ msgstr "Toevoegen"
 
 #: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
-msgstr ""
+msgstr "Beveiligings waarschuwing"
 
 #: templates/installation.php:24
 msgid ""
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index cae768deb5d..057f5ec9c1e 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -16,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-14 02:05+0200\n"
-"PO-Revision-Date: 2012-10-13 08:51+0000\n"
-"Last-Translator: Richard Bos <radoeka@gmail.com>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,8 +73,8 @@ msgid "Rename"
 msgstr "Hernoem"
 
 #: js/filelist.js:192 js/filelist.js:194
-msgid "already exists"
-msgstr "bestaat al"
+msgid "{new_name} already exists"
+msgstr ""
 
 #: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
@@ -88,25 +88,25 @@ msgstr "Stel een naam voor"
 msgid "cancel"
 msgstr "annuleren"
 
-#: js/filelist.js:241 js/filelist.js:243
-msgid "replaced"
-msgstr "vervangen"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
 #: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "ongedaan maken"
 
 #: js/filelist.js:243
-msgid "with"
-msgstr "door"
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
 
 #: js/filelist.js:275
-msgid "unshared"
-msgstr "niet gedeeld"
+msgid "unshared {files}"
+msgstr ""
 
 #: js/filelist.js:277
-msgid "deleted"
-msgstr "verwijderd"
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
@@ -129,8 +129,8 @@ msgid "1 file uploading"
 msgstr "1 bestand wordt ge-upload"
 
 #: js/files.js:265 js/files.js:310 js/files.js:325
-msgid "files uploading"
-msgstr "Bestanden aan het uploaden"
+msgid "{count} files uploading"
+msgstr ""
 
 #: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
@@ -146,8 +146,8 @@ msgid "Invalid name, '/' is not allowed."
 msgstr "Ongeldige naam, '/' is niet toegestaan."
 
 #: js/files.js:681
-msgid "files scanned"
-msgstr "Gescande bestanden"
+msgid "{count} files scanned"
+msgstr ""
 
 #: js/files.js:689
 msgid "error while scanning"
@@ -166,20 +166,20 @@ msgid "Modified"
 msgstr "Laatst aangepast"
 
 #: js/files.js:791
-msgid "folder"
-msgstr "map"
+msgid "1 folder"
+msgstr ""
 
 #: js/files.js:793
-msgid "folders"
-msgstr "mappen"
+msgid "{count} folders"
+msgstr ""
 
 #: js/files.js:801
-msgid "file"
-msgstr "bestand"
+msgid "1 file"
+msgstr ""
 
 #: js/files.js:803
-msgid "files"
-msgstr "bestanden"
+msgid "{count} files"
+msgstr ""
 
 #: js/files.js:847
 msgid "seconds ago"
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index 36653dc6fb7..ae5b783c45f 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -125,15 +125,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -174,11 +170,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 7dc3daff6d2..43cf3468041 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -65,152 +65,152 @@ msgstr "Slett"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:241
-msgid "with"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:273
-msgid "unshared"
+#: js/filelist.js:275
+msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:275
-msgid "deleted"
+#: js/filelist.js:277
+msgid "deleted {files}"
 msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:667
-msgid "files scanned"
+#: js/files.js:681
+msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:675
+#: js/files.js:689
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "Namn"
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "Storleik"
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "Endra"
 
-#: js/files.js:777
-msgid "folder"
+#: js/files.js:791
+msgid "1 folder"
 msgstr ""
 
-#: js/files.js:779
-msgid "folders"
+#: js/files.js:793
+msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:787
-msgid "file"
+#: js/files.js:801
+msgid "1 file"
 msgstr ""
 
-#: js/files.js:789
-msgid "files"
+#: js/files.js:803
+msgid "{count} files"
 msgstr ""
 
-#: js/files.js:833
+#: js/files.js:847
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:834
+#: js/files.js:848
 msgid "minute ago"
 msgstr ""
 
-#: js/files.js:835
+#: js/files.js:849
 msgid "minutes ago"
 msgstr ""
 
-#: js/files.js:838
+#: js/files.js:852
 msgid "today"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:853
 msgid "yesterday"
 msgstr ""
 
-#: js/files.js:840
+#: js/files.js:854
 msgid "days ago"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:855
 msgid "last month"
 msgstr ""
 
-#: js/files.js:843
+#: js/files.js:857
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:844
+#: js/files.js:858
 msgid "last year"
 msgstr ""
 
-#: js/files.js:845
+#: js/files.js:859
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
index 2e89d694c30..9656baa566e 100644
--- a/l10n/oc/core.po
+++ b/l10n/oc/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -124,16 +124,12 @@ msgid "Error while changing permissions"
 msgstr "Error al cambiar permissions"
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr "Partejat amb tu e lo grop"
-
-#: js/share.js:130
-msgid "by"
-msgstr "per"
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
-msgstr "Partejat amb tu per"
+msgid "Shared with you by {owner}"
+msgstr ""
 
 #: js/share.js:137
 msgid "Share with"
@@ -173,12 +169,8 @@ msgid "Resharing is not allowed"
 msgstr "Tornar partejar es pas permis"
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr "Partejat dins"
-
-#: js/share.js:250
-msgid "with"
-msgstr "amb"
+msgid "Shared in {item} with {user}"
+msgstr ""
 
 #: js/share.js:271
 msgid "Unshare"
diff --git a/l10n/oc/files.po b/l10n/oc/files.po
index 1e4cc9832bc..3e397a007da 100644
--- a/l10n/oc/files.po
+++ b/l10n/oc/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-28 23:34+0200\n"
-"PO-Revision-Date: 2012-09-28 11:55+0000\n"
-"Last-Translator: tartafione <d.chateau@laposte.net>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -64,152 +64,152 @@ msgstr "Escafa"
 msgid "Rename"
 msgstr "Torna nomenar"
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
-msgstr "existís jà"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
+msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr "remplaça"
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr "nom prepausat"
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr "anulla"
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
-msgstr "remplaçat"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "defar"
 
-#: js/filelist.js:241
-msgid "with"
-msgstr "amb"
-
-#: js/filelist.js:273
-msgid "unshared"
-msgstr "Non partejat"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
 
 #: js/filelist.js:275
-msgid "deleted"
-msgstr "escafat"
+msgid "unshared {files}"
+msgstr ""
+
+#: js/filelist.js:277
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "Fichièr ZIP a se far, aquò pòt trigar un briu."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Impossible d'amontcargar lo teu fichièr qu'es un repertòri o que ten pas que 0 octet."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "Error d'amontcargar"
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr "Al esperar"
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr "1 fichièr al amontcargar"
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
-msgstr "fichièrs al amontcargar"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
+msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "Amontcargar anullat."
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo cargament. "
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nom invalid, '/' es pas permis."
 
-#: js/files.js:668
-msgid "files scanned"
-msgstr "Fichièr explorat"
+#: js/files.js:681
+msgid "{count} files scanned"
+msgstr ""
 
-#: js/files.js:676
+#: js/files.js:689
 msgid "error while scanning"
 msgstr "error pendant l'exploracion"
 
-#: js/files.js:749 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:750 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "Talha"
 
-#: js/files.js:751 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:778
-msgid "folder"
-msgstr "Dorsièr"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:780
-msgid "folders"
-msgstr "Dorsièrs"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:788
-msgid "file"
-msgstr "fichièr"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:790
-msgid "files"
-msgstr "fichièrs"
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
 
-#: js/files.js:834
+#: js/files.js:847
 msgid "seconds ago"
 msgstr "secondas"
 
-#: js/files.js:835
+#: js/files.js:848
 msgid "minute ago"
 msgstr "minuta"
 
-#: js/files.js:836
+#: js/files.js:849
 msgid "minutes ago"
 msgstr "minutas"
 
-#: js/files.js:839
+#: js/files.js:852
 msgid "today"
 msgstr "uèi"
 
-#: js/files.js:840
+#: js/files.js:853
 msgid "yesterday"
 msgstr "ièr"
 
-#: js/files.js:841
+#: js/files.js:854
 msgid "days ago"
 msgstr "jorns"
 
-#: js/files.js:842
+#: js/files.js:855
 msgid "last month"
 msgstr "mes passat"
 
-#: js/files.js:844
+#: js/files.js:857
 msgid "months ago"
 msgstr "meses"
 
-#: js/files.js:845
+#: js/files.js:858
 msgid "last year"
 msgstr "an passat"
 
-#: js/files.js:846
+#: js/files.js:859
 msgid "years ago"
 msgstr "ans"
 
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 7e47de56d83..3f60174102e 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -131,16 +131,12 @@ msgid "Error while changing permissions"
 msgstr "Błąd przy zmianie uprawnień"
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr "Współdzielony z tobą i grupą"
-
-#: js/share.js:130
-msgid "by"
-msgstr "przez"
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
-msgstr "Współdzielone z taba przez"
+msgid "Shared with you by {owner}"
+msgstr ""
 
 #: js/share.js:137
 msgid "Share with"
@@ -180,12 +176,8 @@ msgid "Resharing is not allowed"
 msgstr "Współdzielenie nie jest możliwe"
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr "Współdziel  w"
-
-#: js/share.js:250
-msgid "with"
-msgstr "z"
+msgid "Shared in {item} with {user}"
+msgstr ""
 
 #: js/share.js:271
 msgid "Unshare"
@@ -310,19 +302,19 @@ msgstr "Dodaj"
 
 #: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
-msgstr ""
+msgstr "Ostrzeżenie o zabezpieczeniach"
 
 #: templates/installation.php:24
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr ""
+msgstr "Niedostępny bezpieczny generator liczb losowych, należy włączyć rozszerzenie OpenSSL w PHP."
 
 #: templates/installation.php:26
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
-msgstr ""
+msgstr "Bez bezpiecznego generatora liczb losowych, osoba atakująca może być w stanie przewidzieć resetujące hasło tokena i przejąć kontrolę nad swoim kontem."
 
 #: templates/installation.php:32
 msgid ""
@@ -331,7 +323,7 @@ msgid ""
 "strongly suggest that you configure your webserver in a way that the data "
 "directory is no longer accessible or you move the data directory outside the"
 " webserver document root."
-msgstr ""
+msgstr "Katalog danych (data) i pliki są prawdopodobnie dostępnego z Internetu. Sprawdź plik .htaccess oraz konfigurację serwera (hosta). Sugerujemy, skonfiguruj swój serwer w taki sposób, żeby dane katalogu nie były dostępne lub przenieść katalog danych spoza głównego dokumentu webserwera."
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
@@ -388,17 +380,17 @@ msgstr "Wylogowuje użytkownika"
 
 #: templates/login.php:8
 msgid "Automatic logon rejected!"
-msgstr ""
+msgstr "Automatyczne logowanie odrzucone!"
 
 #: templates/login.php:9
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
-msgstr ""
+msgstr "Jeśli nie było zmianie niedawno hasło, Twoje konto może być zagrożone!"
 
 #: templates/login.php:10
 msgid "Please change your password to secure your account again."
-msgstr ""
+msgstr "Proszę zmienić swoje hasło, aby zabezpieczyć swoje konto ponownie."
 
 #: templates/login.php:15
 msgid "Lost your password?"
@@ -426,14 +418,14 @@ msgstr "naprzód"
 
 #: templates/verify.php:5
 msgid "Security Warning!"
-msgstr ""
+msgstr "Ostrzeżenie o zabezpieczeniach!"
 
 #: templates/verify.php:6
 msgid ""
 "Please verify your password. <br/>For security reasons you may be "
 "occasionally asked to enter your password again."
-msgstr ""
+msgstr "Sprawdź swoje hasło.<br/>Ze względów bezpieczeństwa możesz zostać czasami poproszony o wprowadzenie hasła ponownie."
 
 #: templates/verify.php:16
 msgid "Verify"
-msgstr ""
+msgstr "Zweryfikowane"
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index 5cae59fb451..38ba35f368f 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-06 02:02+0200\n"
-"PO-Revision-Date: 2012-10-05 21:03+0000\n"
-"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -69,152 +69,152 @@ msgstr "Usuwa element"
 msgid "Rename"
 msgstr "Zmień nazwę"
 
-#: js/filelist.js:189 js/filelist.js:191
-msgid "already exists"
-msgstr "Już istnieje"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
+msgstr ""
 
-#: js/filelist.js:189 js/filelist.js:191
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr "zastap"
 
-#: js/filelist.js:189
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr "zasugeruj nazwÄ™"
 
-#: js/filelist.js:189 js/filelist.js:191
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr "anuluj"
 
-#: js/filelist.js:238 js/filelist.js:240
-msgid "replaced"
-msgstr "zastÄ…pione"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
-#: js/filelist.js:238 js/filelist.js:240 js/filelist.js:272 js/filelist.js:274
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "wróć"
 
-#: js/filelist.js:240
-msgid "with"
-msgstr "z"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
 
-#: js/filelist.js:272
-msgid "unshared"
-msgstr "Nie udostępnione"
+#: js/filelist.js:275
+msgid "unshared {files}"
+msgstr ""
 
-#: js/filelist.js:274
-msgid "deleted"
-msgstr "skasuj"
+#: js/filelist.js:277
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "Generowanie pliku ZIP, może potrwać pewien czas."
 
-#: js/files.js:215
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Nie można wczytać pliku jeśli jest katalogiem lub ma 0 bajtów"
 
-#: js/files.js:215
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "BÅ‚Ä…d wczytywania"
 
-#: js/files.js:243 js/files.js:348 js/files.js:378
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr "OczekujÄ…ce"
 
-#: js/files.js:263
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr "1 plik wczytany"
 
-#: js/files.js:266 js/files.js:311 js/files.js:326
-msgid "files uploading"
-msgstr "pliki wczytane"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
+msgstr ""
 
-#: js/files.js:329 js/files.js:362
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "Wczytywanie anulowane."
 
-#: js/files.js:432
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Wysyłanie pliku jest w toku. Teraz opuszczając stronę wysyłanie zostanie anulowane."
 
-#: js/files.js:502
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nieprawidłowa nazwa '/' jest niedozwolone."
 
-#: js/files.js:679
-msgid "files scanned"
-msgstr "Pliki skanowane"
+#: js/files.js:681
+msgid "{count} files scanned"
+msgstr ""
 
-#: js/files.js:687
+#: js/files.js:689
 msgid "error while scanning"
 msgstr "Wystąpił błąd podczas skanowania"
 
-#: js/files.js:760 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "Nazwa"
 
-#: js/files.js:761 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "Rozmiar"
 
-#: js/files.js:762 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "Czas modyfikacji"
 
-#: js/files.js:789
-msgid "folder"
-msgstr "folder"
-
 #: js/files.js:791
-msgid "folders"
-msgstr "foldery"
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:799
-msgid "file"
-msgstr "plik"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
 #: js/files.js:801
-msgid "files"
-msgstr "pliki"
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:845
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
+
+#: js/files.js:847
 msgid "seconds ago"
 msgstr "sekund temu"
 
-#: js/files.js:846
+#: js/files.js:848
 msgid "minute ago"
 msgstr "minutÄ™ temu"
 
-#: js/files.js:847
+#: js/files.js:849
 msgid "minutes ago"
 msgstr "minut temu"
 
-#: js/files.js:850
+#: js/files.js:852
 msgid "today"
 msgstr "dziÅ›"
 
-#: js/files.js:851
+#: js/files.js:853
 msgid "yesterday"
 msgstr "wczoraj"
 
-#: js/files.js:852
+#: js/files.js:854
 msgid "days ago"
 msgstr "dni temu"
 
-#: js/files.js:853
+#: js/files.js:855
 msgid "last month"
 msgstr "ostani miesiÄ…c"
 
-#: js/files.js:855
+#: js/files.js:857
 msgid "months ago"
 msgstr "miesięcy temu"
 
-#: js/files.js:856
+#: js/files.js:858
 msgid "last year"
 msgstr "ostatni rok"
 
-#: js/files.js:857
+#: js/files.js:859
 msgid "years ago"
 msgstr "lat temu"
 
diff --git a/l10n/pl_PL/core.po b/l10n/pl_PL/core.po
index 8cf58274487..3817e94bdfe 100644
--- a/l10n/pl_PL/core.po
+++ b/l10n/pl_PL/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
@@ -123,15 +123,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -172,11 +168,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/pl_PL/files.po b/l10n/pl_PL/files.po
index cbd95ad6ef7..142f241693f 100644
--- a/l10n/pl_PL/files.po
+++ b/l10n/pl_PL/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
@@ -63,152 +63,152 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:241
-msgid "with"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:273
-msgid "unshared"
+#: js/filelist.js:275
+msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:275
-msgid "deleted"
+#: js/filelist.js:277
+msgid "deleted {files}"
 msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:667
-msgid "files scanned"
+#: js/files.js:681
+msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:675
+#: js/files.js:689
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr ""
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr ""
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:777
-msgid "folder"
+#: js/files.js:791
+msgid "1 folder"
 msgstr ""
 
-#: js/files.js:779
-msgid "folders"
+#: js/files.js:793
+msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:787
-msgid "file"
+#: js/files.js:801
+msgid "1 file"
 msgstr ""
 
-#: js/files.js:789
-msgid "files"
+#: js/files.js:803
+msgid "{count} files"
 msgstr ""
 
-#: js/files.js:833
+#: js/files.js:847
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:834
+#: js/files.js:848
 msgid "minute ago"
 msgstr ""
 
-#: js/files.js:835
+#: js/files.js:849
 msgid "minutes ago"
 msgstr ""
 
-#: js/files.js:838
+#: js/files.js:852
 msgid "today"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:853
 msgid "yesterday"
 msgstr ""
 
-#: js/files.js:840
+#: js/files.js:854
 msgid "days ago"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:855
 msgid "last month"
 msgstr ""
 
-#: js/files.js:843
+#: js/files.js:857
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:844
+#: js/files.js:858
 msgid "last year"
 msgstr ""
 
-#: js/files.js:845
+#: js/files.js:859
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 990a977673d..3a509e82657 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -130,16 +130,12 @@ msgid "Error while changing permissions"
 msgstr "Erro ao mudar permissões"
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr "Compartilhado com você e o grupo"
-
-#: js/share.js:130
-msgid "by"
-msgstr "por"
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
-msgstr "Compartilhado com você por"
+msgid "Shared with you by {owner}"
+msgstr ""
 
 #: js/share.js:137
 msgid "Share with"
@@ -179,12 +175,8 @@ msgid "Resharing is not allowed"
 msgstr "Não é permitido re-compartilhar"
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr "Compartilhado em"
-
-#: js/share.js:250
-msgid "with"
-msgstr "com"
+msgid "Shared in {item} with {user}"
+msgstr ""
 
 #: js/share.js:271
 msgid "Unshare"
@@ -397,7 +389,7 @@ msgstr ""
 
 #: templates/login.php:10
 msgid "Please change your password to secure your account again."
-msgstr ""
+msgstr "Por favor troque sua senha para tornar sua conta segura novamente."
 
 #: templates/login.php:15
 msgid "Lost your password?"
@@ -425,7 +417,7 @@ msgstr "próximo"
 
 #: templates/verify.php:5
 msgid "Security Warning!"
-msgstr ""
+msgstr "Aviso de Segurança!"
 
 #: templates/verify.php:6
 msgid ""
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index a262359b9cf..0466a7d6641 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-27 02:01+0200\n"
-"PO-Revision-Date: 2012-09-26 12:31+0000\n"
-"Last-Translator: sedir <philippi.sedir@gmail.com>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -69,152 +69,152 @@ msgstr "Excluir"
 msgid "Rename"
 msgstr "Renomear"
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
-msgstr "já existe"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
+msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr "substituir"
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr "sugerir nome"
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
-msgstr "substituido "
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "desfazer"
 
-#: js/filelist.js:241
-msgid "with"
-msgstr "com"
-
-#: js/filelist.js:273
-msgid "unshared"
-msgstr "descompartilhado"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
 
 #: js/filelist.js:275
-msgid "deleted"
-msgstr "deletado"
+msgid "unshared {files}"
+msgstr ""
+
+#: js/filelist.js:277
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "gerando arquivo ZIP, isso pode levar um tempo."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Impossível enviar seus arquivo como diretório ou ele tem 0 bytes."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "Erro de envio"
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr "Pendente"
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr "enviando 1 arquivo"
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
-msgstr "enviando arquivos"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
+msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "Envio cancelado."
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Upload em andamento. Sair da página agora resultará no cancelamento do envio."
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nome inválido, '/' não é permitido."
 
-#: js/files.js:668
-msgid "files scanned"
-msgstr "arquivos verificados"
+#: js/files.js:681
+msgid "{count} files scanned"
+msgstr ""
 
-#: js/files.js:676
+#: js/files.js:689
 msgid "error while scanning"
 msgstr "erro durante verificação"
 
-#: js/files.js:749 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:750 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:751 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:778
-msgid "folder"
-msgstr "pasta"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:780
-msgid "folders"
-msgstr "pastas"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:788
-msgid "file"
-msgstr "arquivo"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:790
-msgid "files"
-msgstr "arquivos"
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
 
-#: js/files.js:834
+#: js/files.js:847
 msgid "seconds ago"
 msgstr "segundos atrás"
 
-#: js/files.js:835
+#: js/files.js:848
 msgid "minute ago"
 msgstr "minuto atrás"
 
-#: js/files.js:836
+#: js/files.js:849
 msgid "minutes ago"
 msgstr "minutos atrás"
 
-#: js/files.js:839
+#: js/files.js:852
 msgid "today"
 msgstr "hoje"
 
-#: js/files.js:840
+#: js/files.js:853
 msgid "yesterday"
 msgstr "ontem"
 
-#: js/files.js:841
+#: js/files.js:854
 msgid "days ago"
 msgstr "dias atrás"
 
-#: js/files.js:842
+#: js/files.js:855
 msgid "last month"
 msgstr "último mês"
 
-#: js/files.js:844
+#: js/files.js:857
 msgid "months ago"
 msgstr "meses atrás"
 
-#: js/files.js:845
+#: js/files.js:858
 msgid "last year"
 msgstr "último ano"
 
-#: js/files.js:846
+#: js/files.js:859
 msgid "years ago"
 msgstr "anos atrás"
 
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 000d5c3ff38..5fe509b21a2 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -127,16 +127,12 @@ msgid "Error while changing permissions"
 msgstr "Erro ao mudar permissões"
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr "Partilhado consigo e o grupo"
-
-#: js/share.js:130
-msgid "by"
-msgstr "por"
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
-msgstr "Partilhado consigo por"
+msgid "Shared with you by {owner}"
+msgstr ""
 
 #: js/share.js:137
 msgid "Share with"
@@ -176,12 +172,8 @@ msgid "Resharing is not allowed"
 msgstr "Não é permitido partilhar de novo"
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr "Partilhado em"
-
-#: js/share.js:250
-msgid "with"
-msgstr "com"
+msgid "Shared in {item} with {user}"
+msgstr ""
 
 #: js/share.js:271
 msgid "Unshare"
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index a6c43b21b31..e473c8ffd07 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-10 02:04+0200\n"
-"PO-Revision-Date: 2012-10-09 15:25+0000\n"
-"Last-Translator: Duarte Velez Grilo <duartegrilo@gmail.com>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -68,8 +68,8 @@ msgid "Rename"
 msgstr "Renomear"
 
 #: js/filelist.js:192 js/filelist.js:194
-msgid "already exists"
-msgstr "já existe"
+msgid "{new_name} already exists"
+msgstr ""
 
 #: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
@@ -83,25 +83,25 @@ msgstr "Sugira um nome"
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:241 js/filelist.js:243
-msgid "replaced"
-msgstr "substituído"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
 #: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "desfazer"
 
 #: js/filelist.js:243
-msgid "with"
-msgstr "com"
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
 
 #: js/filelist.js:275
-msgid "unshared"
-msgstr "não partilhado"
+msgid "unshared {files}"
+msgstr ""
 
 #: js/filelist.js:277
-msgid "deleted"
-msgstr "apagado"
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
@@ -124,8 +124,8 @@ msgid "1 file uploading"
 msgstr "A enviar 1 ficheiro"
 
 #: js/files.js:265 js/files.js:310 js/files.js:325
-msgid "files uploading"
-msgstr "ficheiros a serem enviados"
+msgid "{count} files uploading"
+msgstr ""
 
 #: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
@@ -141,8 +141,8 @@ msgid "Invalid name, '/' is not allowed."
 msgstr "Nome inválido, '/' não permitido."
 
 #: js/files.js:681
-msgid "files scanned"
-msgstr "ficheiros analisados"
+msgid "{count} files scanned"
+msgstr ""
 
 #: js/files.js:689
 msgid "error while scanning"
@@ -161,20 +161,20 @@ msgid "Modified"
 msgstr "Modificado"
 
 #: js/files.js:791
-msgid "folder"
-msgstr "pasta"
+msgid "1 folder"
+msgstr ""
 
 #: js/files.js:793
-msgid "folders"
-msgstr "pastas"
+msgid "{count} folders"
+msgstr ""
 
 #: js/files.js:801
-msgid "file"
-msgstr "ficheiro"
+msgid "1 file"
+msgstr ""
 
 #: js/files.js:803
-msgid "files"
-msgstr "ficheiros"
+msgid "{count} files"
+msgstr ""
 
 #: js/files.js:847
 msgid "seconds ago"
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 27279e061fd..c82f12b6baa 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -127,15 +127,11 @@ msgid "Error while changing permissions"
 msgstr "Eroare la modificarea permisiunilor"
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -176,11 +172,7 @@ msgid "Resharing is not allowed"
 msgstr "Repartajarea nu este permisă"
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index ebc77fb07be..3cf1e5e902a 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-27 02:01+0200\n"
-"PO-Revision-Date: 2012-09-26 13:07+0000\n"
-"Last-Translator: g.ciprian <g.ciprian@osn.ro>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -67,152 +67,152 @@ msgstr "Șterge"
 msgid "Rename"
 msgstr "Redenumire"
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
-msgstr "deja există"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
+msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr "înlocuire"
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr "sugerează nume"
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr "anulare"
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
-msgstr "înlocuit"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "Anulează ultima acțiune"
 
-#: js/filelist.js:241
-msgid "with"
-msgstr "cu"
-
-#: js/filelist.js:273
-msgid "unshared"
-msgstr "nepartajat"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
 
 #: js/filelist.js:275
-msgid "deleted"
-msgstr "șters"
+msgid "unshared {files}"
+msgstr ""
+
+#: js/filelist.js:277
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "se generază fișierul ZIP, va dura ceva timp."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Nu s-a putut încărca fișierul tău deoarece pare să fie un director sau are 0 bytes."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "Eroare la încărcare"
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr "În așteptare"
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr "un fișier se încarcă"
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
-msgstr "fișiere se încarcă"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
+msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "Încărcare anulată."
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea."
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nume invalid, '/' nu este permis."
 
-#: js/files.js:668
-msgid "files scanned"
-msgstr "fișiere scanate"
+#: js/files.js:681
+msgid "{count} files scanned"
+msgstr ""
 
-#: js/files.js:676
+#: js/files.js:689
 msgid "error while scanning"
 msgstr "eroare la scanarea"
 
-#: js/files.js:749 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "Nume"
 
-#: js/files.js:750 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "Dimensiune"
 
-#: js/files.js:751 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:778
-msgid "folder"
-msgstr "director"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:780
-msgid "folders"
-msgstr "directoare"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:788
-msgid "file"
-msgstr "fișier"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:790
-msgid "files"
-msgstr "fișiere"
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
 
-#: js/files.js:834
+#: js/files.js:847
 msgid "seconds ago"
 msgstr "secunde în urmă"
 
-#: js/files.js:835
+#: js/files.js:848
 msgid "minute ago"
 msgstr "minut în urmă"
 
-#: js/files.js:836
+#: js/files.js:849
 msgid "minutes ago"
 msgstr "minute în urmă"
 
-#: js/files.js:839
+#: js/files.js:852
 msgid "today"
 msgstr "astăzi"
 
-#: js/files.js:840
+#: js/files.js:853
 msgid "yesterday"
 msgstr "ieri"
 
-#: js/files.js:841
+#: js/files.js:854
 msgid "days ago"
 msgstr "zile în urmă"
 
-#: js/files.js:842
+#: js/files.js:855
 msgid "last month"
 msgstr "ultima lună"
 
-#: js/files.js:844
+#: js/files.js:857
 msgid "months ago"
 msgstr "luni în urmă"
 
-#: js/files.js:845
+#: js/files.js:858
 msgid "last year"
 msgstr "ultimul an"
 
-#: js/files.js:846
+#: js/files.js:859
 msgid "years ago"
 msgstr "ani în urmă"
 
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index fe949c2e2b4..27322d80764 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -128,15 +128,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -177,11 +173,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index a9137068dd7..3a6137137f6 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 23:37+0200\n"
-"PO-Revision-Date: 2012-10-16 12:08+0000\n"
-"Last-Translator: skoptev <skoptev@ukr.net>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -72,8 +72,8 @@ msgid "Rename"
 msgstr "Переименовать"
 
 #: js/filelist.js:192 js/filelist.js:194
-msgid "already exists"
-msgstr "уже существует"
+msgid "{new_name} already exists"
+msgstr ""
 
 #: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
@@ -87,25 +87,25 @@ msgstr "предложить название"
 msgid "cancel"
 msgstr "отмена"
 
-#: js/filelist.js:241 js/filelist.js:243
-msgid "replaced"
-msgstr "заменён"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
 #: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "отмена"
 
 #: js/filelist.js:243
-msgid "with"
-msgstr "с"
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
 
 #: js/filelist.js:275
-msgid "unshared"
-msgstr "публикация отменена"
+msgid "unshared {files}"
+msgstr ""
 
 #: js/filelist.js:277
-msgid "deleted"
-msgstr "удален"
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
@@ -128,8 +128,8 @@ msgid "1 file uploading"
 msgstr "загружается 1 файл"
 
 #: js/files.js:265 js/files.js:310 js/files.js:325
-msgid "files uploading"
-msgstr "загружаются файлы"
+msgid "{count} files uploading"
+msgstr ""
 
 #: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
@@ -145,7 +145,7 @@ msgid "Invalid name, '/' is not allowed."
 msgstr "Неверное имя, '/' не допускается."
 
 #: js/files.js:681
-msgid "files scanned"
+msgid "{count} files scanned"
 msgstr ""
 
 #: js/files.js:689
@@ -165,20 +165,20 @@ msgid "Modified"
 msgstr "Изменён"
 
 #: js/files.js:791
-msgid "folder"
-msgstr "папка"
+msgid "1 folder"
+msgstr ""
 
 #: js/files.js:793
-msgid "folders"
-msgstr "папки"
+msgid "{count} folders"
+msgstr ""
 
 #: js/files.js:801
-msgid "file"
-msgstr "файл"
+msgid "1 file"
+msgstr ""
 
 #: js/files.js:803
-msgid "files"
-msgstr "файлы"
+msgid "{count} files"
+msgstr ""
 
 #: js/files.js:847
 msgid "seconds ago"
diff --git a/l10n/ru_RU/core.po b/l10n/ru_RU/core.po
index 145223b5c6e..18e346b04cb 100644
--- a/l10n/ru_RU/core.po
+++ b/l10n/ru_RU/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 23:38+0200\n"
-"PO-Revision-Date: 2012-10-16 13:26+0000\n"
-"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -124,15 +124,11 @@ msgid "Error while changing permissions"
 msgstr "Ошибка при изменении прав доступа"
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -141,7 +137,7 @@ msgstr "Сделать общим с"
 
 #: js/share.js:142
 msgid "Share with link"
-msgstr ""
+msgstr "Опубликовать с ссылкой"
 
 #: js/share.js:143
 msgid "Password protect"
@@ -173,13 +169,9 @@ msgid "Resharing is not allowed"
 msgstr "Рекурсивный общий доступ не разрешен"
 
 #: js/share.js:250
-msgid "Shared in"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:250
-msgid "with"
-msgstr "с"
-
 #: js/share.js:271
 msgid "Unshare"
 msgstr "Отключить общий доступ"
@@ -309,13 +301,13 @@ msgstr "Предупреждение системы безопасности"
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr ""
+msgstr "Нет доступного защищенного генератора случайных чисел, пожалуйста, включите расширение PHP OpenSSL."
 
 #: templates/installation.php:26
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
-msgstr ""
+msgstr "Без защищенного генератора случайных чисел злоумышленник может спрогнозировать пароль, сбросить учетные данные и завладеть Вашим аккаунтом."
 
 #: templates/installation.php:32
 msgid ""
diff --git a/l10n/ru_RU/files.po b/l10n/ru_RU/files.po
index 4951fe271a7..89e8a1a488f 100644
--- a/l10n/ru_RU/files.po
+++ b/l10n/ru_RU/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-11 02:04+0200\n"
-"PO-Revision-Date: 2012-10-10 13:26+0000\n"
-"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -65,8 +65,8 @@ msgid "Rename"
 msgstr "Переименовать"
 
 #: js/filelist.js:192 js/filelist.js:194
-msgid "already exists"
-msgstr "уже существует"
+msgid "{new_name} already exists"
+msgstr ""
 
 #: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
@@ -80,25 +80,25 @@ msgstr "подобрать название"
 msgid "cancel"
 msgstr "отменить"
 
-#: js/filelist.js:241 js/filelist.js:243
-msgid "replaced"
-msgstr "заменено"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
 #: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "отменить действие"
 
 #: js/filelist.js:243
-msgid "with"
-msgstr "с"
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
 
 #: js/filelist.js:275
-msgid "unshared"
-msgstr "скрытый"
+msgid "unshared {files}"
+msgstr ""
 
 #: js/filelist.js:277
-msgid "deleted"
-msgstr "удалено"
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
@@ -121,8 +121,8 @@ msgid "1 file uploading"
 msgstr "загрузка 1 файла"
 
 #: js/files.js:265 js/files.js:310 js/files.js:325
-msgid "files uploading"
-msgstr "загрузка файлов"
+msgid "{count} files uploading"
+msgstr ""
 
 #: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
@@ -138,8 +138,8 @@ msgid "Invalid name, '/' is not allowed."
 msgstr "Неправильное имя, '/' не допускается."
 
 #: js/files.js:681
-msgid "files scanned"
-msgstr "файлы отсканированы"
+msgid "{count} files scanned"
+msgstr ""
 
 #: js/files.js:689
 msgid "error while scanning"
@@ -158,20 +158,20 @@ msgid "Modified"
 msgstr "Изменен"
 
 #: js/files.js:791
-msgid "folder"
-msgstr "папка"
+msgid "1 folder"
+msgstr ""
 
 #: js/files.js:793
-msgid "folders"
-msgstr "папки"
+msgid "{count} folders"
+msgstr ""
 
 #: js/files.js:801
-msgid "file"
-msgstr "файл"
+msgid "1 file"
+msgstr ""
 
 #: js/files.js:803
-msgid "files"
-msgstr "файлы"
+msgid "{count} files"
+msgstr ""
 
 #: js/files.js:847
 msgid "seconds ago"
diff --git a/l10n/ru_RU/settings.po b/l10n/ru_RU/settings.po
index 8da29bcbfef..fc274a6f640 100644
--- a/l10n/ru_RU/settings.po
+++ b/l10n/ru_RU/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-12 02:04+0200\n"
-"PO-Revision-Date: 2012-10-11 08:13+0000\n"
+"POT-Creation-Date: 2012-10-18 02:04+0200\n"
+"PO-Revision-Date: 2012-10-17 13:42+0000\n"
 "Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
@@ -22,16 +22,11 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Невозможно загрузить список из App Store"
 
-#: ajax/creategroup.php:9 ajax/removeuser.php:18 ajax/setquota.php:18
-#: ajax/togglegroups.php:15
-msgid "Authentication error"
-msgstr "Ошибка авторизации"
-
-#: ajax/creategroup.php:19
+#: ajax/creategroup.php:12
 msgid "Group already exists"
 msgstr "Группа уже существует"
 
-#: ajax/creategroup.php:28
+#: ajax/creategroup.php:21
 msgid "Unable to add group"
 msgstr "Невозможно добавить группу"
 
@@ -59,6 +54,10 @@ msgstr "Неверный запрос"
 msgid "Unable to delete group"
 msgstr "Невозможно удалить группу"
 
+#: ajax/removeuser.php:18 ajax/setquota.php:18 ajax/togglegroups.php:15
+msgid "Authentication error"
+msgstr "Ошибка авторизации"
+
 #: ajax/removeuser.php:27
 msgid "Unable to delete user"
 msgstr "Невозможно удалить пользователя"
@@ -89,7 +88,7 @@ msgstr "Включить"
 msgid "Saving..."
 msgstr "Сохранение"
 
-#: personal.php:47 personal.php:48
+#: personal.php:42 personal.php:43
 msgid "__language_name__"
 msgstr "__язык_имя__"
 
@@ -152,7 +151,7 @@ msgstr "Разрешить повторное совместное исполь
 
 #: templates/admin.php:74
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Позволить пользователям публиковать доступные им объекты других пользователей."
 
 #: templates/admin.php:79
 msgid "Allow users to share with anyone"
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index ff4b345ed83..b1afa73176a 100644
--- a/l10n/si_LK/core.po
+++ b/l10n/si_LK/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -124,15 +124,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -173,11 +169,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
index 0b5e050f8c0..04b3a5ff33e 100644
--- a/l10n/si_LK/files.po
+++ b/l10n/si_LK/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:03+0200\n"
-"PO-Revision-Date: 2012-10-15 10:48+0000\n"
-"Last-Translator: Chamara Disanayake <chamara@nic.lk>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -65,7 +65,7 @@ msgid "Rename"
 msgstr ""
 
 #: js/filelist.js:192 js/filelist.js:194
-msgid "already exists"
+msgid "{new_name} already exists"
 msgstr ""
 
 #: js/filelist.js:192 js/filelist.js:194
@@ -80,8 +80,8 @@ msgstr ""
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:241 js/filelist.js:243
-msgid "replaced"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
 msgstr ""
 
 #: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
@@ -89,15 +89,15 @@ msgid "undo"
 msgstr ""
 
 #: js/filelist.js:243
-msgid "with"
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
 #: js/filelist.js:275
-msgid "unshared"
+msgid "unshared {files}"
 msgstr ""
 
 #: js/filelist.js:277
-msgid "deleted"
+msgid "deleted {files}"
 msgstr ""
 
 #: js/files.js:179
@@ -121,7 +121,7 @@ msgid "1 file uploading"
 msgstr ""
 
 #: js/files.js:265 js/files.js:310 js/files.js:325
-msgid "files uploading"
+msgid "{count} files uploading"
 msgstr ""
 
 #: js/files.js:328 js/files.js:361
@@ -138,7 +138,7 @@ msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
 #: js/files.js:681
-msgid "files scanned"
+msgid "{count} files scanned"
 msgstr ""
 
 #: js/files.js:689
@@ -158,20 +158,20 @@ msgid "Modified"
 msgstr ""
 
 #: js/files.js:791
-msgid "folder"
-msgstr "ෆෝල්ඩරය"
+msgid "1 folder"
+msgstr ""
 
 #: js/files.js:793
-msgid "folders"
-msgstr "ෆෝල්ඩර"
+msgid "{count} folders"
+msgstr ""
 
 #: js/files.js:801
-msgid "file"
-msgstr "ගොනුව"
+msgid "1 file"
+msgstr ""
 
 #: js/files.js:803
-msgid "files"
-msgstr "ගොනු"
+msgid "{count} files"
+msgstr ""
 
 #: js/files.js:847
 msgid "seconds ago"
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index 9b9f32fcde8..9936ea995b9 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 23:38+0200\n"
-"PO-Revision-Date: 2012-10-16 18:51+0000\n"
-"Last-Translator: martinb <martin.babik@gmail.com>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -126,16 +126,12 @@ msgid "Error while changing permissions"
 msgstr "Chyba počas zmeny oprávnení"
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr "Zdieľané s vami a so skupinou"
-
-#: js/share.js:130
-msgid "by"
-msgstr "od"
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
-msgstr "Zdieľané s vami od"
+msgid "Shared with you by {owner}"
+msgstr ""
 
 #: js/share.js:137
 msgid "Share with"
@@ -175,13 +171,9 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:250
-msgid "with"
-msgstr "s"
-
 #: js/share.js:271
 msgid "Unshare"
 msgstr "Zrušiť zdieľanie"
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index 3891cc5d508..d189ceeb294 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 23:37+0200\n"
-"PO-Revision-Date: 2012-10-16 18:54+0000\n"
-"Last-Translator: martinb <martin.babik@gmail.com>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -67,8 +67,8 @@ msgid "Rename"
 msgstr "Premenovať"
 
 #: js/filelist.js:192 js/filelist.js:194
-msgid "already exists"
-msgstr "už existuje"
+msgid "{new_name} already exists"
+msgstr ""
 
 #: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
@@ -82,25 +82,25 @@ msgstr "pomôcť s menom"
 msgid "cancel"
 msgstr "zrušiť"
 
-#: js/filelist.js:241 js/filelist.js:243
-msgid "replaced"
-msgstr "zmenené"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
 #: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "vrátiť"
 
 #: js/filelist.js:243
-msgid "with"
-msgstr "s"
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
 
 #: js/filelist.js:275
-msgid "unshared"
-msgstr "zdielané"
+msgid "unshared {files}"
+msgstr ""
 
 #: js/filelist.js:277
-msgid "deleted"
-msgstr "zmazané"
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
@@ -123,8 +123,8 @@ msgid "1 file uploading"
 msgstr "1 súbor sa posiela "
 
 #: js/files.js:265 js/files.js:310 js/files.js:325
-msgid "files uploading"
-msgstr "súbory sa posielajú"
+msgid "{count} files uploading"
+msgstr ""
 
 #: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
@@ -140,8 +140,8 @@ msgid "Invalid name, '/' is not allowed."
 msgstr "Chybný názov, \"/\" nie je povolené"
 
 #: js/files.js:681
-msgid "files scanned"
-msgstr "skontrolovaných súborov"
+msgid "{count} files scanned"
+msgstr ""
 
 #: js/files.js:689
 msgid "error while scanning"
@@ -160,20 +160,20 @@ msgid "Modified"
 msgstr "Upravené"
 
 #: js/files.js:791
-msgid "folder"
-msgstr "priečinok"
+msgid "1 folder"
+msgstr ""
 
 #: js/files.js:793
-msgid "folders"
-msgstr "priečinky"
+msgid "{count} folders"
+msgstr ""
 
 #: js/files.js:801
-msgid "file"
-msgstr "súbor"
+msgid "1 file"
+msgstr ""
 
 #: js/files.js:803
-msgid "files"
-msgstr "súbory"
+msgid "{count} files"
+msgstr ""
 
 #: js/files.js:847
 msgid "seconds ago"
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 1a771160cf2..61f792944d0 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -126,15 +126,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -175,11 +171,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 5332d836f24..57cade0e968 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -66,152 +66,152 @@ msgstr "Izbriši"
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
-msgstr "že obstaja"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
+msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr "nadomesti"
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr "predlagaj ime"
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr "ekliči"
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
-msgstr "nadomeščen"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "razveljavi"
 
-#: js/filelist.js:241
-msgid "with"
-msgstr "z"
-
-#: js/filelist.js:273
-msgid "unshared"
-msgstr "odstranjeno iz souporabe"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
 
 #: js/filelist.js:275
-msgid "deleted"
-msgstr "izbrisano"
+msgid "unshared {files}"
+msgstr ""
+
+#: js/filelist.js:277
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "Ustvarjam ZIP datoteko. To lahko traja nekaj časa."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Nalaganje ni mogoče, saj gre za mapo, ali pa ima datoteka velikost 0 bajtov."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "Napaka pri nalaganju"
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr "Na čakanju"
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "Nalaganje je bilo preklicano."
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Nalaganje datoteke je v teku. ÄŒe zapustite to stran zdaj, boste nalaganje preklicali."
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "Neveljavno ime. Znak '/' ni dovoljen."
 
-#: js/files.js:667
-msgid "files scanned"
-msgstr "pregledanih datotek"
+#: js/files.js:681
+msgid "{count} files scanned"
+msgstr ""
 
-#: js/files.js:675
+#: js/files.js:689
 msgid "error while scanning"
 msgstr "napaka med pregledovanjem datotek"
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "Spremenjeno"
 
-#: js/files.js:777
-msgid "folder"
-msgstr "mapa"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:779
-msgid "folders"
-msgstr "mape"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:787
-msgid "file"
-msgstr "datoteka"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:789
-msgid "files"
-msgstr "datoteke"
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
 
-#: js/files.js:833
+#: js/files.js:847
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:834
+#: js/files.js:848
 msgid "minute ago"
 msgstr ""
 
-#: js/files.js:835
+#: js/files.js:849
 msgid "minutes ago"
 msgstr ""
 
-#: js/files.js:838
+#: js/files.js:852
 msgid "today"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:853
 msgid "yesterday"
 msgstr ""
 
-#: js/files.js:840
+#: js/files.js:854
 msgid "days ago"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:855
 msgid "last month"
 msgstr ""
 
-#: js/files.js:843
+#: js/files.js:857
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:844
+#: js/files.js:858
 msgid "last year"
 msgstr ""
 
-#: js/files.js:845
+#: js/files.js:859
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/so/core.po b/l10n/so/core.po
index b7723cd0820..9522acda286 100644
--- a/l10n/so/core.po
+++ b/l10n/so/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -123,15 +123,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -172,11 +168,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/so/files.po b/l10n/so/files.po
index 31ef83859aa..f6e11b8b5b0 100644
--- a/l10n/so/files.po
+++ b/l10n/so/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -63,152 +63,152 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:241
-msgid "with"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:273
-msgid "unshared"
+#: js/filelist.js:275
+msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:275
-msgid "deleted"
+#: js/filelist.js:277
+msgid "deleted {files}"
 msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:667
-msgid "files scanned"
+#: js/files.js:681
+msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:675
+#: js/files.js:689
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr ""
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr ""
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:777
-msgid "folder"
+#: js/files.js:791
+msgid "1 folder"
 msgstr ""
 
-#: js/files.js:779
-msgid "folders"
+#: js/files.js:793
+msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:787
-msgid "file"
+#: js/files.js:801
+msgid "1 file"
 msgstr ""
 
-#: js/files.js:789
-msgid "files"
+#: js/files.js:803
+msgid "{count} files"
 msgstr ""
 
-#: js/files.js:833
+#: js/files.js:847
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:834
+#: js/files.js:848
 msgid "minute ago"
 msgstr ""
 
-#: js/files.js:835
+#: js/files.js:849
 msgid "minutes ago"
 msgstr ""
 
-#: js/files.js:838
+#: js/files.js:852
 msgid "today"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:853
 msgid "yesterday"
 msgstr ""
 
-#: js/files.js:840
+#: js/files.js:854
 msgid "days ago"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:855
 msgid "last month"
 msgstr ""
 
-#: js/files.js:843
+#: js/files.js:857
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:844
+#: js/files.js:858
 msgid "last year"
 msgstr ""
 
-#: js/files.js:845
+#: js/files.js:859
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index 79b292785c8..b20b0af47ee 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -124,15 +124,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -173,11 +169,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 5d5d14a2109..39f728be096 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -64,152 +64,152 @@ msgstr "Обриши"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:241
-msgid "with"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:273
-msgid "unshared"
+#: js/filelist.js:275
+msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:275
-msgid "deleted"
+#: js/filelist.js:277
+msgid "deleted {files}"
 msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:667
-msgid "files scanned"
+#: js/files.js:681
+msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:675
+#: js/files.js:689
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "Величина"
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "Задња измена"
 
-#: js/files.js:777
-msgid "folder"
+#: js/files.js:791
+msgid "1 folder"
 msgstr ""
 
-#: js/files.js:779
-msgid "folders"
+#: js/files.js:793
+msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:787
-msgid "file"
+#: js/files.js:801
+msgid "1 file"
 msgstr ""
 
-#: js/files.js:789
-msgid "files"
+#: js/files.js:803
+msgid "{count} files"
 msgstr ""
 
-#: js/files.js:833
+#: js/files.js:847
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:834
+#: js/files.js:848
 msgid "minute ago"
 msgstr ""
 
-#: js/files.js:835
+#: js/files.js:849
 msgid "minutes ago"
 msgstr ""
 
-#: js/files.js:838
+#: js/files.js:852
 msgid "today"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:853
 msgid "yesterday"
 msgstr ""
 
-#: js/files.js:840
+#: js/files.js:854
 msgid "days ago"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:855
 msgid "last month"
 msgstr ""
 
-#: js/files.js:843
+#: js/files.js:857
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:844
+#: js/files.js:858
 msgid "last year"
 msgstr ""
 
-#: js/files.js:845
+#: js/files.js:859
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index 760ce1d3314..261e9a9a215 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -124,15 +124,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -173,11 +169,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index fdca9ade631..9e42b70c428 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -64,152 +64,152 @@ msgstr "Obriši"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:241
-msgid "with"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:273
-msgid "unshared"
+#: js/filelist.js:275
+msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:275
-msgid "deleted"
+#: js/filelist.js:277
+msgid "deleted {files}"
 msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:667
-msgid "files scanned"
+#: js/files.js:681
+msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:675
+#: js/files.js:689
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "Zadnja izmena"
 
-#: js/files.js:777
-msgid "folder"
+#: js/files.js:791
+msgid "1 folder"
 msgstr ""
 
-#: js/files.js:779
-msgid "folders"
+#: js/files.js:793
+msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:787
-msgid "file"
+#: js/files.js:801
+msgid "1 file"
 msgstr ""
 
-#: js/files.js:789
-msgid "files"
+#: js/files.js:803
+msgid "{count} files"
 msgstr ""
 
-#: js/files.js:833
+#: js/files.js:847
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:834
+#: js/files.js:848
 msgid "minute ago"
 msgstr ""
 
-#: js/files.js:835
+#: js/files.js:849
 msgid "minutes ago"
 msgstr ""
 
-#: js/files.js:838
+#: js/files.js:852
 msgid "today"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:853
 msgid "yesterday"
 msgstr ""
 
-#: js/files.js:840
+#: js/files.js:854
 msgid "days ago"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:855
 msgid "last month"
 msgstr ""
 
-#: js/files.js:843
+#: js/files.js:857
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:844
+#: js/files.js:858
 msgid "last year"
 msgstr ""
 
-#: js/files.js:845
+#: js/files.js:859
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 6c2844d6453..1390409211e 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -129,16 +129,12 @@ msgid "Error while changing permissions"
 msgstr "Fel vid ändring av rättigheter"
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr "Delas med dig och gruppen"
-
-#: js/share.js:130
-msgid "by"
-msgstr "av"
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
-msgstr "Delas med dig av"
+msgid "Shared with you by {owner}"
+msgstr ""
 
 #: js/share.js:137
 msgid "Share with"
@@ -178,12 +174,8 @@ msgid "Resharing is not allowed"
 msgstr "Dela vidare är inte tillåtet"
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr "Delas i"
-
-#: js/share.js:250
-msgid "with"
-msgstr "med"
+msgid "Shared in {item} with {user}"
+msgstr ""
 
 #: js/share.js:271
 msgid "Unshare"
@@ -424,7 +416,7 @@ msgstr "nästa"
 
 #: templates/verify.php:5
 msgid "Security Warning!"
-msgstr ""
+msgstr "Säkerhetsvarning!"
 
 #: templates/verify.php:6
 msgid ""
@@ -434,4 +426,4 @@ msgstr ""
 
 #: templates/verify.php:16
 msgid "Verify"
-msgstr ""
+msgstr "Verifiera"
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index 4154c1118ee..0d204165739 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-27 02:01+0200\n"
-"PO-Revision-Date: 2012-09-26 14:51+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -69,152 +69,152 @@ msgstr "Radera"
 msgid "Rename"
 msgstr "Byt namn"
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
-msgstr "finns redan"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
+msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr "ersätt"
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr "föreslå namn"
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr "avbryt"
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
-msgstr "ersatt"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "Ã¥ngra"
 
-#: js/filelist.js:241
-msgid "with"
-msgstr "med"
-
-#: js/filelist.js:273
-msgid "unshared"
-msgstr "Ej delad"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
 
 #: js/filelist.js:275
-msgid "deleted"
-msgstr "raderad"
+msgid "unshared {files}"
+msgstr ""
+
+#: js/filelist.js:277
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "genererar ZIP-fil, det kan ta lite tid."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Kunde inte ladda upp dina filer eftersom det antingen är en mapp eller har 0 bytes."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "Uppladdningsfel"
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr "Väntar"
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr "1 filuppladdning"
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
-msgstr "filer laddas upp"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
+msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "Uppladdning avbruten."
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen."
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "Ogiltigt namn, '/' är inte tillåten."
 
-#: js/files.js:668
-msgid "files scanned"
-msgstr "filer skannade"
+#: js/files.js:681
+msgid "{count} files scanned"
+msgstr ""
 
-#: js/files.js:676
+#: js/files.js:689
 msgid "error while scanning"
 msgstr "fel vid skanning"
 
-#: js/files.js:749 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "Namn"
 
-#: js/files.js:750 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "Storlek"
 
-#: js/files.js:751 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "Ändrad"
 
-#: js/files.js:778
-msgid "folder"
-msgstr "mapp"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:780
-msgid "folders"
-msgstr "mappar"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:788
-msgid "file"
-msgstr "fil"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:790
-msgid "files"
-msgstr "filer"
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
 
-#: js/files.js:834
+#: js/files.js:847
 msgid "seconds ago"
 msgstr "sekunder sedan"
 
-#: js/files.js:835
+#: js/files.js:848
 msgid "minute ago"
 msgstr "minut sedan"
 
-#: js/files.js:836
+#: js/files.js:849
 msgid "minutes ago"
 msgstr "minuter sedan"
 
-#: js/files.js:839
+#: js/files.js:852
 msgid "today"
 msgstr "i dag"
 
-#: js/files.js:840
+#: js/files.js:853
 msgid "yesterday"
 msgstr "i går"
 
-#: js/files.js:841
+#: js/files.js:854
 msgid "days ago"
 msgstr "dagar sedan"
 
-#: js/files.js:842
+#: js/files.js:855
 msgid "last month"
 msgstr "förra månaden"
 
-#: js/files.js:844
+#: js/files.js:857
 msgid "months ago"
 msgstr "månader sedan"
 
-#: js/files.js:845
+#: js/files.js:858
 msgid "last year"
 msgstr "förra året"
 
-#: js/files.js:846
+#: js/files.js:859
 msgid "years ago"
 msgstr "Ã¥r sedan"
 
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index 1686955bd99..3dae350c787 100644
--- a/l10n/ta_LK/core.po
+++ b/l10n/ta_LK/core.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <suganthi@nic.lk>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -31,43 +32,43 @@ msgstr ""
 
 #: js/js.js:238 templates/layout.user.php:49 templates/layout.user.php:50
 msgid "Settings"
-msgstr ""
+msgstr "அமைப்புகள்"
 
 #: js/js.js:670
 msgid "January"
-msgstr ""
+msgstr "தை"
 
 #: js/js.js:670
 msgid "February"
-msgstr ""
+msgstr "மாசி"
 
 #: js/js.js:670
 msgid "March"
-msgstr ""
+msgstr "பங்குனி"
 
 #: js/js.js:670
 msgid "April"
-msgstr ""
+msgstr "சித்திரை"
 
 #: js/js.js:670
 msgid "May"
-msgstr ""
+msgstr "வைகாசி"
 
 #: js/js.js:670
 msgid "June"
-msgstr ""
+msgstr "ஆனி"
 
 #: js/js.js:671
 msgid "July"
-msgstr ""
+msgstr "ஆடி"
 
 #: js/js.js:671
 msgid "August"
-msgstr ""
+msgstr "ஆவணி"
 
 #: js/js.js:671
 msgid "September"
-msgstr ""
+msgstr "புரட்டாசி"
 
 #: js/js.js:671
 msgid "October"
@@ -123,15 +124,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -149,7 +146,7 @@ msgstr ""
 #: js/share.js:147 templates/installation.php:42 templates/login.php:24
 #: templates/verify.php:13
 msgid "Password"
-msgstr ""
+msgstr "கடவுச்சொல்"
 
 #: js/share.js:152
 msgid "Set expiration date"
@@ -172,11 +169,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
@@ -193,15 +186,15 @@ msgstr ""
 
 #: js/share.js:288
 msgid "create"
-msgstr ""
+msgstr "படைத்தல்"
 
 #: js/share.js:291
 msgid "update"
-msgstr ""
+msgstr "இற்றைப்படுத்தல்"
 
 #: js/share.js:294
 msgid "delete"
-msgstr ""
+msgstr "நீக்குக"
 
 #: js/share.js:297
 msgid "share"
@@ -242,7 +235,7 @@ msgstr ""
 #: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
 #: templates/login.php:20
 msgid "Username"
-msgstr ""
+msgstr "பயனாளர் பெயர்"
 
 #: lostpassword/templates/lostpassword.php:14
 msgid "Request reset"
@@ -282,7 +275,7 @@ msgstr ""
 
 #: strings.php:9
 msgid "Help"
-msgstr ""
+msgstr "உதவி"
 
 #: templates/403.php:12
 msgid "Access forbidden"
@@ -331,11 +324,11 @@ msgstr ""
 
 #: templates/installation.php:48
 msgid "Advanced"
-msgstr ""
+msgstr "மேம்பட்ட"
 
 #: templates/installation.php:50
 msgid "Data folder"
-msgstr ""
+msgstr "தரவு கோப்புறை"
 
 #: templates/installation.php:57
 msgid "Configure the database"
@@ -348,15 +341,15 @@ msgstr ""
 
 #: templates/installation.php:105
 msgid "Database user"
-msgstr ""
+msgstr "தரவுத்தள பயனாளர்"
 
 #: templates/installation.php:109
 msgid "Database password"
-msgstr ""
+msgstr "தரவுத்தள கடவுச்சொல்"
 
 #: templates/installation.php:113
 msgid "Database name"
-msgstr ""
+msgstr "தரவுத்தள பெயர்"
 
 #: templates/installation.php:121
 msgid "Database tablespace"
@@ -368,7 +361,7 @@ msgstr ""
 
 #: templates/installation.php:132
 msgid "Finish setup"
-msgstr ""
+msgstr "அமைப்பை முடிக்க"
 
 #: templates/layout.guest.php:38
 msgid "web services under your control"
@@ -406,15 +399,15 @@ msgstr ""
 
 #: templates/logout.php:1
 msgid "You are logged out."
-msgstr ""
+msgstr "நீங்கள் விடுபதிகை செய்துவிட்டீர்கள்."
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
-msgstr ""
+msgstr "முந்தைய"
 
 #: templates/part.pagenavi.php:20
 msgid "next"
-msgstr ""
+msgstr "அடுத்து"
 
 #: templates/verify.php:5
 msgid "Security Warning!"
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index 942737c0f60..8781be06ec6 100644
--- a/l10n/ta_LK/files.po
+++ b/l10n/ta_LK/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:03+0200\n"
-"PO-Revision-Date: 2011-08-13 02:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -64,7 +64,7 @@ msgid "Rename"
 msgstr ""
 
 #: js/filelist.js:192 js/filelist.js:194
-msgid "already exists"
+msgid "{new_name} already exists"
 msgstr ""
 
 #: js/filelist.js:192 js/filelist.js:194
@@ -79,8 +79,8 @@ msgstr ""
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:241 js/filelist.js:243
-msgid "replaced"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
 msgstr ""
 
 #: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
@@ -88,15 +88,15 @@ msgid "undo"
 msgstr ""
 
 #: js/filelist.js:243
-msgid "with"
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
 #: js/filelist.js:275
-msgid "unshared"
+msgid "unshared {files}"
 msgstr ""
 
 #: js/filelist.js:277
-msgid "deleted"
+msgid "deleted {files}"
 msgstr ""
 
 #: js/files.js:179
@@ -120,7 +120,7 @@ msgid "1 file uploading"
 msgstr ""
 
 #: js/files.js:265 js/files.js:310 js/files.js:325
-msgid "files uploading"
+msgid "{count} files uploading"
 msgstr ""
 
 #: js/files.js:328 js/files.js:361
@@ -137,7 +137,7 @@ msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
 #: js/files.js:681
-msgid "files scanned"
+msgid "{count} files scanned"
 msgstr ""
 
 #: js/files.js:689
@@ -157,19 +157,19 @@ msgid "Modified"
 msgstr ""
 
 #: js/files.js:791
-msgid "folder"
+msgid "1 folder"
 msgstr ""
 
 #: js/files.js:793
-msgid "folders"
+msgid "{count} folders"
 msgstr ""
 
 #: js/files.js:801
-msgid "file"
+msgid "1 file"
 msgstr ""
 
 #: js/files.js:803
-msgid "files"
+msgid "{count} files"
 msgstr ""
 
 #: js/files.js:847
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index ffa37038804..102bc32573d 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-17 02:02+0200\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -123,15 +123,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -172,11 +168,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index ae1687dd197..8705938609d 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-17 02:02+0200\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -64,7 +64,7 @@ msgid "Rename"
 msgstr ""
 
 #: js/filelist.js:192 js/filelist.js:194
-msgid "already exists"
+msgid "{new_name} already exists"
 msgstr ""
 
 #: js/filelist.js:192 js/filelist.js:194
@@ -79,8 +79,8 @@ msgstr ""
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:241 js/filelist.js:243
-msgid "replaced"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
 msgstr ""
 
 #: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
@@ -88,15 +88,15 @@ msgid "undo"
 msgstr ""
 
 #: js/filelist.js:243
-msgid "with"
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
 #: js/filelist.js:275
-msgid "unshared"
+msgid "unshared {files}"
 msgstr ""
 
 #: js/filelist.js:277
-msgid "deleted"
+msgid "deleted {files}"
 msgstr ""
 
 #: js/files.js:179
@@ -120,7 +120,7 @@ msgid "1 file uploading"
 msgstr ""
 
 #: js/files.js:265 js/files.js:310 js/files.js:325
-msgid "files uploading"
+msgid "{count} files uploading"
 msgstr ""
 
 #: js/files.js:328 js/files.js:361
@@ -137,7 +137,7 @@ msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
 #: js/files.js:681
-msgid "files scanned"
+msgid "{count} files scanned"
 msgstr ""
 
 #: js/files.js:689
@@ -157,19 +157,19 @@ msgid "Modified"
 msgstr ""
 
 #: js/files.js:791
-msgid "folder"
+msgid "1 folder"
 msgstr ""
 
 #: js/files.js:793
-msgid "folders"
+msgid "{count} folders"
 msgstr ""
 
 #: js/files.js:801
-msgid "file"
+msgid "1 file"
 msgstr ""
 
 #: js/files.js:803
-msgid "files"
+msgid "{count} files"
 msgstr ""
 
 #: js/files.js:847
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 89b267e31ed..719cc179051 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-17 02:02+0200\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index a2dff7eed8b..546ea1dfe7f 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-17 02:02+0200\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 4e770b2da8b..e08d0de9a08 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-17 02:02+0200\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 4097400b272..05f81feb4b2 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-17 02:02+0200\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 71f1c60fb56..45ee376e522 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-17 02:02+0200\n"
+"POT-Creation-Date: 2012-10-18 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index de8f6beed56..9da29c68005 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-17 02:02+0200\n"
+"POT-Creation-Date: 2012-10-18 02:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 3e84a573339..e4531de22c8 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-17 02:02+0200\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po
index 7c760142837..571710d4cac 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -125,16 +125,12 @@ msgid "Error while changing permissions"
 msgstr "เกิดข้อผิดพลาดในการเปลี่ยนสิทธิ์การเข้าใช้งาน"
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr "แชร์ให้คุณและกลุ่ม"
-
-#: js/share.js:130
-msgid "by"
-msgstr "โดย"
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
-msgstr "แชร์ให้คุณโดย"
+msgid "Shared with you by {owner}"
+msgstr ""
 
 #: js/share.js:137
 msgid "Share with"
@@ -174,12 +170,8 @@ msgid "Resharing is not allowed"
 msgstr "ไม่อนุญาตให้แชร์ข้อมูลซ้ำได้"
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr "แชร์ไว้ใน"
-
-#: js/share.js:250
-msgid "with"
-msgstr "ด้วย"
+msgid "Shared in {item} with {user}"
+msgstr ""
 
 #: js/share.js:271
 msgid "Unshare"
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index 51624d8fc18..ba6564a25a3 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-27 02:01+0200\n"
-"PO-Revision-Date: 2012-09-26 11:27+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -65,152 +65,152 @@ msgstr "ลบ"
 msgid "Rename"
 msgstr "เปลี่ยนชื่อ"
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
-msgstr "มีอยู่แล้ว"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
+msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr "แทนที่"
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr "แนะนำชื่อ"
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr "ยกเลิก"
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
-msgstr "แทนที่แล้ว"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "เลิกทำ"
 
-#: js/filelist.js:241
-msgid "with"
-msgstr "กับ"
-
-#: js/filelist.js:273
-msgid "unshared"
-msgstr "ยกเลิกการแชร์ข้อมูลแล้ว"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
 
 #: js/filelist.js:275
-msgid "deleted"
-msgstr "ลบแล้ว"
+msgid "unshared {files}"
+msgstr ""
+
+#: js/filelist.js:277
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "กำลังสร้างไฟล์บีบอัด ZIP อาจใช้เวลาสักครู่"
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่หรือมีขนาด 0 ไบต์"
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "เกิดข้อผิดพลาดในการอัพโหลด"
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr "อยู่ระหว่างดำเนินการ"
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr "กำลังอัพโหลดไฟล์ 1 ไฟล์"
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
-msgstr "การอัพโหลดไฟล์"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
+msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "การอัพโหลดถูกยกเลิก"
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก"
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "ชื่อที่ใช้ไม่ถูกต้อง '/' ไม่อนุญาตให้ใช้งาน"
 
-#: js/files.js:668
-msgid "files scanned"
-msgstr "ไฟล์ต่างๆได้รับการสแกนแล้ว"
+#: js/files.js:681
+msgid "{count} files scanned"
+msgstr ""
 
-#: js/files.js:676
+#: js/files.js:689
 msgid "error while scanning"
 msgstr "พบข้อผิดพลาดในระหว่างการสแกนไฟล์"
 
-#: js/files.js:749 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "ชื่อ"
 
-#: js/files.js:750 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "ขนาด"
 
-#: js/files.js:751 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "ปรับปรุงล่าสุด"
 
-#: js/files.js:778
-msgid "folder"
-msgstr "โฟลเดอร์"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:780
-msgid "folders"
-msgstr "โฟลเดอร์"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:788
-msgid "file"
-msgstr "ไฟล์"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:790
-msgid "files"
-msgstr "ไฟล์"
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
 
-#: js/files.js:834
+#: js/files.js:847
 msgid "seconds ago"
 msgstr "วินาที ก่อนหน้านี้"
 
-#: js/files.js:835
+#: js/files.js:848
 msgid "minute ago"
 msgstr "นาที ที่ผ่านมา"
 
-#: js/files.js:836
+#: js/files.js:849
 msgid "minutes ago"
 msgstr "นาที ที่ผ่านมา"
 
-#: js/files.js:839
+#: js/files.js:852
 msgid "today"
 msgstr "วันนี้"
 
-#: js/files.js:840
+#: js/files.js:853
 msgid "yesterday"
 msgstr "เมื่อวานนี้"
 
-#: js/files.js:841
+#: js/files.js:854
 msgid "days ago"
 msgstr "วัน ที่ผ่านมา"
 
-#: js/files.js:842
+#: js/files.js:855
 msgid "last month"
 msgstr "เดือนที่แล้ว"
 
-#: js/files.js:844
+#: js/files.js:857
 msgid "months ago"
 msgstr "เดือน ที่ผ่านมา"
 
-#: js/files.js:845
+#: js/files.js:858
 msgid "last year"
 msgstr "ปีที่แล้ว"
 
-#: js/files.js:846
+#: js/files.js:859
 msgid "years ago"
 msgstr "ปี ที่ผ่านมา"
 
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 17d229d0355..54048d17d96 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -126,15 +126,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -175,11 +171,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 89562bcb1f3..7b2362c1346 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -67,152 +67,152 @@ msgstr "Sil"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
-msgstr "zaten mevcut"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
+msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr "deÄŸiÅŸtir"
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr "iptal"
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
-msgstr "deÄŸiÅŸtirildi"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "geri al"
 
-#: js/filelist.js:241
-msgid "with"
-msgstr "ile"
-
-#: js/filelist.js:273
-msgid "unshared"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
 #: js/filelist.js:275
-msgid "deleted"
-msgstr "silindi"
+msgid "unshared {files}"
+msgstr ""
+
+#: js/filelist.js:277
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "ZIP dosyası oluşturuluyor, biraz sürebilir."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Dosyanızın boyutu 0 byte olduğundan veya bir dizin olduğundan yüklenemedi"
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "Yükleme hatası"
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr "Bekliyor"
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "Yükleme iptal edildi."
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur."
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "Geçersiz isim, '/' işaretine izin verilmiyor."
 
-#: js/files.js:667
-msgid "files scanned"
+#: js/files.js:681
+msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:675
+#: js/files.js:689
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "Ad"
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "Boyut"
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "DeÄŸiÅŸtirilme"
 
-#: js/files.js:777
-msgid "folder"
-msgstr "dizin"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:779
-msgid "folders"
-msgstr "dizinler"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:787
-msgid "file"
-msgstr "dosya"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:789
-msgid "files"
-msgstr "dosyalar"
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
 
-#: js/files.js:833
+#: js/files.js:847
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:834
+#: js/files.js:848
 msgid "minute ago"
 msgstr ""
 
-#: js/files.js:835
+#: js/files.js:849
 msgid "minutes ago"
 msgstr ""
 
-#: js/files.js:838
+#: js/files.js:852
 msgid "today"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:853
 msgid "yesterday"
 msgstr ""
 
-#: js/files.js:840
+#: js/files.js:854
 msgid "days ago"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:855
 msgid "last month"
 msgstr ""
 
-#: js/files.js:843
+#: js/files.js:857
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:844
+#: js/files.js:858
 msgid "last year"
 msgstr ""
 
-#: js/files.js:845
+#: js/files.js:859
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 8657d0895cd..7d8cdd712ab 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -126,15 +126,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -175,11 +171,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index 500381e7cb3..83677502547 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -65,152 +65,152 @@ msgstr "Видалити"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "відмінити"
 
-#: js/filelist.js:241
-msgid "with"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:273
-msgid "unshared"
+#: js/filelist.js:275
+msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:275
-msgid "deleted"
-msgstr "видалені"
+#: js/filelist.js:277
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "Створення ZIP-файлу, це може зайняти певний час."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Неможливо завантажити ваш файл тому, що він тека або файл розміром 0 байт"
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "Помилка завантаження"
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr "Очікування"
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "Завантаження перервано."
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "Некоректне ім'я, '/' не дозволено."
 
-#: js/files.js:667
-msgid "files scanned"
+#: js/files.js:681
+msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:675
+#: js/files.js:689
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "Ім'я"
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "Розмір"
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "Змінено"
 
-#: js/files.js:777
-msgid "folder"
-msgstr "тека"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:779
-msgid "folders"
-msgstr "теки"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:787
-msgid "file"
-msgstr "файл"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:789
-msgid "files"
-msgstr "файли"
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
 
-#: js/files.js:833
+#: js/files.js:847
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:834
+#: js/files.js:848
 msgid "minute ago"
 msgstr ""
 
-#: js/files.js:835
+#: js/files.js:849
 msgid "minutes ago"
 msgstr ""
 
-#: js/files.js:838
+#: js/files.js:852
 msgid "today"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:853
 msgid "yesterday"
 msgstr ""
 
-#: js/files.js:840
+#: js/files.js:854
 msgid "days ago"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:855
 msgid "last month"
 msgstr ""
 
-#: js/files.js:843
+#: js/files.js:857
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:844
+#: js/files.js:858
 msgid "last year"
 msgstr ""
 
-#: js/files.js:845
+#: js/files.js:859
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index ec687896956..97ed5951e9c 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 23:38+0200\n"
-"PO-Revision-Date: 2012-10-16 06:30+0000\n"
-"Last-Translator: khanhnd <khanhnd@kenhgiaiphap.vn>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -125,16 +125,12 @@ msgid "Error while changing permissions"
 msgstr "Lỗi trong quá trình phân quyền"
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr "Được chia sẻ với bạn và Nhóm"
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
-msgstr "Được chia sẻ với bạn qua"
+msgid "Shared with you by {owner}"
+msgstr ""
 
 #: js/share.js:137
 msgid "Share with"
@@ -174,12 +170,8 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr "Chi sẻ trong"
-
-#: js/share.js:250
-msgid "with"
-msgstr "vá»›i"
+msgid "Shared in {item} with {user}"
+msgstr ""
 
 #: js/share.js:271
 msgid "Unshare"
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index 45ec476b3a4..1d7b3be4ce5 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 23:37+0200\n"
-"PO-Revision-Date: 2012-10-16 07:20+0000\n"
-"Last-Translator: khanhnd <khanhnd@kenhgiaiphap.vn>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -67,8 +67,8 @@ msgid "Rename"
 msgstr "Sửa tên"
 
 #: js/filelist.js:192 js/filelist.js:194
-msgid "already exists"
-msgstr "đã tồn tại"
+msgid "{new_name} already exists"
+msgstr ""
 
 #: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
@@ -82,25 +82,25 @@ msgstr "tên gợi ý"
 msgid "cancel"
 msgstr "hủy"
 
-#: js/filelist.js:241 js/filelist.js:243
-msgid "replaced"
-msgstr "đã được thay thế"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
 #: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "lùi lại"
 
 #: js/filelist.js:243
-msgid "with"
-msgstr "vá»›i"
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
 
 #: js/filelist.js:275
-msgid "unshared"
-msgstr "gỡ chia sẻ"
+msgid "unshared {files}"
+msgstr ""
 
 #: js/filelist.js:277
-msgid "deleted"
-msgstr "đã xóa"
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
@@ -123,8 +123,8 @@ msgid "1 file uploading"
 msgstr "1 tệp tin đang được tải lên"
 
 #: js/files.js:265 js/files.js:310 js/files.js:325
-msgid "files uploading"
-msgstr "tệp tin đang được tải lên"
+msgid "{count} files uploading"
+msgstr ""
 
 #: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
@@ -140,8 +140,8 @@ msgid "Invalid name, '/' is not allowed."
 msgstr "Tên không hợp lệ ,không được phép dùng '/'"
 
 #: js/files.js:681
-msgid "files scanned"
-msgstr "tệp tin đã quét"
+msgid "{count} files scanned"
+msgstr ""
 
 #: js/files.js:689
 msgid "error while scanning"
@@ -160,20 +160,20 @@ msgid "Modified"
 msgstr "Thay đổi"
 
 #: js/files.js:791
-msgid "folder"
-msgstr "folder"
+msgid "1 folder"
+msgstr ""
 
 #: js/files.js:793
-msgid "folders"
-msgstr "folders"
+msgid "{count} folders"
+msgstr ""
 
 #: js/files.js:801
-msgid "file"
-msgstr "file"
+msgid "1 file"
+msgstr ""
 
 #: js/files.js:803
-msgid "files"
-msgstr "files"
+msgid "{count} files"
+msgstr ""
 
 #: js/files.js:847
 msgid "seconds ago"
diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index a1beb02db9b..abdd326f5c1 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 23:38+0200\n"
-"PO-Revision-Date: 2012-10-16 11:59+0000\n"
-"Last-Translator: marguerite su <i@marguerite.su>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -125,16 +125,12 @@ msgid "Error while changing permissions"
 msgstr "变更权限出错"
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr "与您和小组成员分享"
-
-#: js/share.js:130
-msgid "by"
-msgstr "ç”±"
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
-msgstr "与您的分享，由"
+msgid "Shared with you by {owner}"
+msgstr ""
 
 #: js/share.js:137
 msgid "Share with"
@@ -174,12 +170,8 @@ msgid "Resharing is not allowed"
 msgstr "不允许重复分享"
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr "分享在"
-
-#: js/share.js:250
-msgid "with"
-msgstr "与"
+msgid "Shared in {item} with {user}"
+msgstr ""
 
 #: js/share.js:271
 msgid "Unshare"
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
index 25c2fb24003..54a41183afc 100644
--- a/l10n/zh_CN.GB2312/files.po
+++ b/l10n/zh_CN.GB2312/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-12 02:03+0200\n"
-"PO-Revision-Date: 2012-10-11 23:48+0000\n"
-"Last-Translator: marguerite su <i@marguerite.su>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -66,8 +66,8 @@ msgid "Rename"
 msgstr "重命名"
 
 #: js/filelist.js:192 js/filelist.js:194
-msgid "already exists"
-msgstr "已经存在了"
+msgid "{new_name} already exists"
+msgstr ""
 
 #: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
@@ -81,25 +81,25 @@ msgstr "推荐名称"
 msgid "cancel"
 msgstr "取消"
 
-#: js/filelist.js:241 js/filelist.js:243
-msgid "replaced"
-msgstr "替换过了"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
 #: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "撤销"
 
 #: js/filelist.js:243
-msgid "with"
-msgstr "随着"
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
 
 #: js/filelist.js:275
-msgid "unshared"
-msgstr "已取消共享"
+msgid "unshared {files}"
+msgstr ""
 
 #: js/filelist.js:277
-msgid "deleted"
-msgstr "删除"
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
@@ -122,8 +122,8 @@ msgid "1 file uploading"
 msgstr "1 个文件正在上传"
 
 #: js/files.js:265 js/files.js:310 js/files.js:325
-msgid "files uploading"
-msgstr "个文件正在上传"
+msgid "{count} files uploading"
+msgstr ""
 
 #: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
@@ -139,8 +139,8 @@ msgid "Invalid name, '/' is not allowed."
 msgstr "非法文件名,\"/\"是不被许可的"
 
 #: js/files.js:681
-msgid "files scanned"
-msgstr "文件已扫描"
+msgid "{count} files scanned"
+msgstr ""
 
 #: js/files.js:689
 msgid "error while scanning"
@@ -159,20 +159,20 @@ msgid "Modified"
 msgstr "修改日期"
 
 #: js/files.js:791
-msgid "folder"
-msgstr "文件夹"
+msgid "1 folder"
+msgstr ""
 
 #: js/files.js:793
-msgid "folders"
-msgstr "文件夹"
+msgid "{count} folders"
+msgstr ""
 
 #: js/files.js:801
-msgid "file"
-msgstr "文件"
+msgid "1 file"
+msgstr ""
 
 #: js/files.js:803
-msgid "files"
-msgstr "文件"
+msgid "{count} files"
+msgstr ""
 
 #: js/files.js:847
 msgid "seconds ago"
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index bab36633e1a..e752b8b4b4c 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -127,15 +127,11 @@ msgid "Error while changing permissions"
 msgstr "修改权限时出错"
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -176,11 +172,7 @@ msgid "Resharing is not allowed"
 msgstr "不允许二次共享"
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index f6d9aa43f8e..5f52ffeb588 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-28 02:02+0200\n"
-"PO-Revision-Date: 2012-09-27 14:26+0000\n"
-"Last-Translator: waterone <suiy02@gmail.com>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -67,152 +67,152 @@ msgstr "删除"
 msgid "Rename"
 msgstr "重命名"
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
-msgstr "已经存在"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
+msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr "替换"
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr "建议名称"
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr "取消"
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
-msgstr "已经替换"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
+msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr "撤销"
 
-#: js/filelist.js:241
-msgid "with"
-msgstr "随着"
-
-#: js/filelist.js:273
-msgid "unshared"
-msgstr "已取消分享"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
 
 #: js/filelist.js:275
-msgid "deleted"
-msgstr "已经删除"
+msgid "unshared {files}"
+msgstr ""
+
+#: js/filelist.js:277
+msgid "deleted {files}"
+msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "正在生成 ZIP 文件，可能需要一些时间"
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "无法上传文件，因为它是一个目录或者大小为 0 字节"
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "上传错误"
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr "操作等待中"
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr "1个文件上传中"
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
-msgstr "文件上传中"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
+msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "上传已取消"
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "文件正在上传中。现在离开此页会导致上传动作被取消。"
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "非法的名称，不允许使用‘/’。"
 
-#: js/files.js:668
-msgid "files scanned"
-msgstr "已扫描文件"
+#: js/files.js:681
+msgid "{count} files scanned"
+msgstr ""
 
-#: js/files.js:676
+#: js/files.js:689
 msgid "error while scanning"
 msgstr "扫描时出错"
 
-#: js/files.js:749 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "名称"
 
-#: js/files.js:750 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:751 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/files.js:778
-msgid "folder"
-msgstr "文件夹"
+#: js/files.js:791
+msgid "1 folder"
+msgstr ""
 
-#: js/files.js:780
-msgid "folders"
-msgstr "文件夹"
+#: js/files.js:793
+msgid "{count} folders"
+msgstr ""
 
-#: js/files.js:788
-msgid "file"
-msgstr "文件"
+#: js/files.js:801
+msgid "1 file"
+msgstr ""
 
-#: js/files.js:790
-msgid "files"
-msgstr "文件"
+#: js/files.js:803
+msgid "{count} files"
+msgstr ""
 
-#: js/files.js:834
+#: js/files.js:847
 msgid "seconds ago"
 msgstr "几秒前"
 
-#: js/files.js:835
+#: js/files.js:848
 msgid "minute ago"
 msgstr "1分钟前"
 
-#: js/files.js:836
+#: js/files.js:849
 msgid "minutes ago"
 msgstr "分钟前"
 
-#: js/files.js:839
+#: js/files.js:852
 msgid "today"
 msgstr "今天"
 
-#: js/files.js:840
+#: js/files.js:853
 msgid "yesterday"
 msgstr "昨天"
 
-#: js/files.js:841
+#: js/files.js:854
 msgid "days ago"
 msgstr "%d 天前"
 
-#: js/files.js:842
+#: js/files.js:855
 msgid "last month"
 msgstr "上月"
 
-#: js/files.js:844
+#: js/files.js:857
 msgid "months ago"
 msgstr "月前"
 
-#: js/files.js:845
+#: js/files.js:858
 msgid "last year"
 msgstr "上年"
 
-#: js/files.js:846
+#: js/files.js:859
 msgid "years ago"
 msgstr "几年前"
 
diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po
index 949d1adc2f3..571f4f7680c 100644
--- a/l10n/zh_CN/files_external.po
+++ b/l10n/zh_CN/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <appweb.cn@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 21:17+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-17 05:17+0000\n"
+"Last-Translator: hanfeng <appweb.cn@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,31 +36,31 @@ msgstr ""
 
 #: js/dropbox.js:85
 msgid "Please provide a valid Dropbox app key and secret."
-msgstr ""
+msgstr "请提供有效的Dropbox应用key和secret"
 
 #: js/google.js:26 js/google.js:73 js/google.js:78
 msgid "Error configuring Google Drive storage"
-msgstr ""
+msgstr "配置Google Drive存储时出错"
 
 #: templates/settings.php:3
 msgid "External Storage"
-msgstr ""
+msgstr "外部存储"
 
 #: templates/settings.php:7 templates/settings.php:19
 msgid "Mount point"
-msgstr ""
+msgstr "挂载点"
 
 #: templates/settings.php:8
 msgid "Backend"
-msgstr ""
+msgstr "后端"
 
 #: templates/settings.php:9
 msgid "Configuration"
-msgstr ""
+msgstr "配置"
 
 #: templates/settings.php:10
 msgid "Options"
-msgstr ""
+msgstr "选项"
 
 #: templates/settings.php:11
 msgid "Applicable"
@@ -67,7 +68,7 @@ msgstr ""
 
 #: templates/settings.php:23
 msgid "Add mount point"
-msgstr ""
+msgstr "增加挂载点"
 
 #: templates/settings.php:54 templates/settings.php:62
 msgid "None set"
@@ -75,32 +76,32 @@ msgstr ""
 
 #: templates/settings.php:63
 msgid "All Users"
-msgstr ""
+msgstr "所有用户"
 
 #: templates/settings.php:64
 msgid "Groups"
-msgstr ""
+msgstr "组"
 
 #: templates/settings.php:69
 msgid "Users"
-msgstr ""
+msgstr "用户"
 
 #: templates/settings.php:77 templates/settings.php:107
 msgid "Delete"
-msgstr ""
+msgstr "删除"
 
 #: templates/settings.php:87
 msgid "Enable User External Storage"
-msgstr ""
+msgstr "启用用户外部存储"
 
 #: templates/settings.php:88
 msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "允许用户挂载自有外部存储"
 
 #: templates/settings.php:99
 msgid "SSL root certificates"
-msgstr ""
+msgstr "SSL根证书"
 
 #: templates/settings.php:113
 msgid "Import Root Certificate"
-msgstr ""
+msgstr "导入根证书"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 417b3cca4da..47e315d2a4b 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-09 02:03+0200\n"
-"PO-Revision-Date: 2012-10-09 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-10-18 02:04+0200\n"
+"PO-Revision-Date: 2012-10-17 05:07+0000\n"
+"Last-Translator: hanfeng <appweb.cn@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,16 +26,11 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "无法从应用商店载入列表"
 
-#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:15
-msgid "Authentication error"
-msgstr "认证错误"
-
-#: ajax/creategroup.php:19
+#: ajax/creategroup.php:12
 msgid "Group already exists"
 msgstr "已存在该组"
 
-#: ajax/creategroup.php:28
+#: ajax/creategroup.php:21
 msgid "Unable to add group"
 msgstr "无法添加组"
 
@@ -63,7 +58,11 @@ msgstr "非法请求"
 msgid "Unable to delete group"
 msgstr "无法删除组"
 
-#: ajax/removeuser.php:22
+#: ajax/removeuser.php:18 ajax/setquota.php:18 ajax/togglegroups.php:15
+msgid "Authentication error"
+msgstr "认证错误"
+
+#: ajax/removeuser.php:27
 msgid "Unable to delete user"
 msgstr "无法删除用户"
 
@@ -93,7 +92,7 @@ msgstr "启用"
 msgid "Saving..."
 msgstr "正在保存"
 
-#: personal.php:47 personal.php:48
+#: personal.php:42 personal.php:43
 msgid "__language_name__"
 msgstr "简体中文"
 
@@ -190,7 +189,7 @@ msgstr "添加应用"
 
 #: templates/apps.php:11
 msgid "More Apps"
-msgstr ""
+msgstr "更多应用"
 
 #: templates/apps.php:27
 msgid "Select an App"
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 9bb44a04f17..0211727da2a 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-16 00:05+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -125,15 +125,11 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-msgid "Shared with you and the group"
-msgstr ""
-
-#: js/share.js:130
-msgid "by"
+msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
 #: js/share.js:132
-msgid "Shared with you by"
+msgid "Shared with you by {owner}"
 msgstr ""
 
 #: js/share.js:137
@@ -174,11 +170,7 @@ msgid "Resharing is not allowed"
 msgstr ""
 
 #: js/share.js:250
-msgid "Shared in"
-msgstr ""
-
-#: js/share.js:250
-msgid "with"
+msgid "Shared in {item} with {user}"
 msgstr ""
 
 #: js/share.js:271
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index edeaac3f470..8e1731214d5 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 11:20+0000\n"
+"POT-Creation-Date: 2012-10-18 02:03+0200\n"
+"PO-Revision-Date: 2012-10-18 00:05+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -66,152 +66,152 @@ msgstr "刪除"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
-msgid "already exists"
-msgstr "已經存在"
+#: js/filelist.js:192 js/filelist.js:194
+msgid "{new_name} already exists"
+msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "replace"
 msgstr "取代"
 
-#: js/filelist.js:190
+#: js/filelist.js:192
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:190 js/filelist.js:192
+#: js/filelist.js:192 js/filelist.js:194
 msgid "cancel"
 msgstr "取消"
 
-#: js/filelist.js:239 js/filelist.js:241
-msgid "replaced"
+#: js/filelist.js:241
+msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
+#: js/filelist.js:241 js/filelist.js:243 js/filelist.js:275 js/filelist.js:277
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:241
-msgid "with"
+#: js/filelist.js:243
+msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:273
-msgid "unshared"
+#: js/filelist.js:275
+msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:275
-msgid "deleted"
+#: js/filelist.js:277
+msgid "deleted {files}"
 msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "產生壓縮檔, 它可能需要一段時間."
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "無法上傳您的檔案因為它可能是一個目錄或檔案大小為0"
 
-#: js/files.js:208
+#: js/files.js:214
 msgid "Upload Error"
 msgstr "上傳發生錯誤"
 
-#: js/files.js:236 js/files.js:341 js/files.js:371
+#: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:256
+#: js/files.js:262
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:259 js/files.js:304 js/files.js:319
-msgid "files uploading"
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:322 js/files.js:355
+#: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
 msgstr "上傳取消"
 
-#: js/files.js:424
+#: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "檔案上傳中. 離開此頁面將會取消上傳."
 
-#: js/files.js:494
+#: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
 msgstr "無效的名稱, '/'是不被允許的"
 
-#: js/files.js:667
-msgid "files scanned"
+#: js/files.js:681
+msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:675
+#: js/files.js:689
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:748 templates/index.php:48
+#: js/files.js:762 templates/index.php:48
 msgid "Name"
 msgstr "名稱"
 
-#: js/files.js:749 templates/index.php:56
+#: js/files.js:763 templates/index.php:56
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:750 templates/index.php:58
+#: js/files.js:764 templates/index.php:58
 msgid "Modified"
 msgstr "修改"
 
-#: js/files.js:777
-msgid "folder"
+#: js/files.js:791
+msgid "1 folder"
 msgstr ""
 
-#: js/files.js:779
-msgid "folders"
+#: js/files.js:793
+msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:787
-msgid "file"
+#: js/files.js:801
+msgid "1 file"
 msgstr ""
 
-#: js/files.js:789
-msgid "files"
+#: js/files.js:803
+msgid "{count} files"
 msgstr ""
 
-#: js/files.js:833
+#: js/files.js:847
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:834
+#: js/files.js:848
 msgid "minute ago"
 msgstr ""
 
-#: js/files.js:835
+#: js/files.js:849
 msgid "minutes ago"
 msgstr ""
 
-#: js/files.js:838
+#: js/files.js:852
 msgid "today"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:853
 msgid "yesterday"
 msgstr ""
 
-#: js/files.js:840
+#: js/files.js:854
 msgid "days ago"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:855
 msgid "last month"
 msgstr ""
 
-#: js/files.js:843
+#: js/files.js:857
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:844
+#: js/files.js:858
 msgid "last year"
 msgstr ""
 
-#: js/files.js:845
+#: js/files.js:859
 msgid "years ago"
 msgstr ""
 
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index 0b103406fab..ee6ecceb139 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Imposible cargar la lista desde el App Store",
-"Authentication error" => "Error al autenticar",
 "Group already exists" => "El grupo ya existe",
 "Unable to add group" => "No fue posible añadir el grupo",
 "Could not enable app. " => "No se puede  habilitar la aplicación.",
@@ -9,6 +8,7 @@
 "OpenID Changed" => "OpenID cambiado",
 "Invalid request" => "Solicitud no válida",
 "Unable to delete group" => "No fue posible eliminar el grupo",
+"Authentication error" => "Error al autenticar",
 "Unable to delete user" => "No fue posible eliminar el usuario",
 "Language changed" => "Idioma cambiado",
 "Unable to add user to group %s" => "No fue posible añadir el usuario al grupo %s",
@@ -21,8 +21,8 @@
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "El directorio de datos -data- y los archivos que contiene, probablemente son accesibles desde internet. El archivo .htaccess que provee ownCloud no está funcionando. Recomendamos fuertemente que configures su servidor web de forma que el directorio de datos ya no sea accesible o que muevas el directorio de datos fuera de la raíz de documentos del servidor web.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Ejecutar una tarea con cada página cargada",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php está registrado como un servicio del webcron. Llamá a la página de cron.php en la raíz de ownCloud cada minuto sobre http.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Usar el servicio de cron del sistema. Llamá al archivo cron.php en la carpeta de ownCloud via servidor cronjob cada minuto.",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php está registrado como un servicio del webcron. Esto carga la página de cron.php en la raíz de ownCloud cada minuto sobre http.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Usar el servicio de cron del sistema. Esto carga  el archivo cron.php en la carpeta de ownCloud via servidor cronjob cada minuto.",
 "Sharing" => "Compartir",
 "Enable Share API" => "Activar API de compartición",
 "Allow apps to use the Share API" => "Permitir a las aplicaciones usar la API de compartición",
diff --git a/settings/l10n/ru_RU.php b/settings/l10n/ru_RU.php
index e94c371fe4c..48190a68455 100644
--- a/settings/l10n/ru_RU.php
+++ b/settings/l10n/ru_RU.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Невозможно загрузить список из App Store",
-"Authentication error" => "Ошибка авторизации",
 "Group already exists" => "Группа уже существует",
 "Unable to add group" => "Невозможно добавить группу",
 "Could not enable app. " => "Не удалось запустить приложение",
@@ -9,6 +8,7 @@
 "OpenID Changed" => "OpenID изменен",
 "Invalid request" => "Неверный запрос",
 "Unable to delete group" => "Невозможно удалить группу",
+"Authentication error" => "Ошибка авторизации",
 "Unable to delete user" => "Невозможно удалить пользователя",
 "Language changed" => "Язык изменен",
 "Unable to add user to group %s" => "Невозможно добавить пользователя в группу %s",
@@ -29,6 +29,7 @@
 "Allow links" => "Предоставить ссылки",
 "Allow users to share items to the public with links" => "Позволяет пользователям добавлять объекты в общий доступ по ссылке",
 "Allow resharing" => "Разрешить повторное совместное использование",
+"Allow users to share items shared with them again" => "Позволить пользователям публиковать доступные им объекты других пользователей.",
 "Allow users to share with anyone" => "Разрешить пользователям разделение с кем-либо",
 "Allow users to only share with users in their groups" => "Разрешить пользователям разделение только с пользователями в их группах",
 "Log" => "Вход",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 31063d3a01b..4bfdff345c0 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "无法从应用商店载入列表",
-"Authentication error" => "认证错误",
 "Group already exists" => "已存在该组",
 "Unable to add group" => "无法添加组",
 "Could not enable app. " => "无法开启App",
@@ -9,6 +8,7 @@
 "OpenID Changed" => "OpenID 已修改",
 "Invalid request" => "非法请求",
 "Unable to delete group" => "无法删除组",
+"Authentication error" => "认证错误",
 "Unable to delete user" => "无法删除用户",
 "Language changed" => "语言已修改",
 "Unable to add user to group %s" => "无法把用户添加到组 %s",
@@ -36,6 +36,7 @@
 "More" => "更多",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "由<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud社区</a>开发，  <a href=\"https://github.com/owncloud\" target=\"_blank\">源代码</a>在<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>许可证下发布。",
 "Add your App" => "添加应用",
+"More Apps" => "更多应用",
 "Select an App" => "选择一个应用",
 "See application page at apps.owncloud.com" => "查看在 app.owncloud.com 的应用程序页面",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-核准： <span class=\"author\"></span>",
-- 
GitLab