diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-25 09:52:12 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-25 09:52:12 +0200 |
| commit | db39fede97dc4d6b9a5caf739cb2c03b4dbdd21d (patch) | |
| tree | 0d8c9f25deb067ce23e901c72f2af842e9002341 /apps/files/l10n/hr.php | |
| parent | 843f15f3489856b518a30de4c803740844232209 (diff) | |
| parent | 2d12e52769a30ba37d5760b1194f613bcc71035b (diff) | |
| download | nextcloud-server-db39fede97dc4d6b9a5caf739cb2c03b4dbdd21d.tar.gz nextcloud-server-db39fede97dc4d6b9a5caf739cb2c03b4dbdd21d.zip | |
Merge branch 'master' into appframework-master
Conflicts:
apps/files/lib/helper.php
apps/files_trashbin/lib/helper.php
Diffstat (limited to 'apps/files/l10n/hr.php')
| -rw-r--r-- | apps/files/l10n/hr.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/apps/files/l10n/hr.php b/apps/files/l10n/hr.php index 57f1ad9700b..60f1da84409 100644 --- a/apps/files/l10n/hr.php +++ b/apps/files/l10n/hr.php @@ -7,7 +7,6 @@ $TRANSLATIONS = array( "Missing a temporary folder" => "Nedostaje privremeni direktorij", "Failed to write to disk" => "Neuspjelo pisanje na disk", "Files" => "Datoteke", -"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 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.", "Error" => "Greška", @@ -21,7 +20,6 @@ $TRANSLATIONS = array( "_%n folder_::_%n folders_" => array("","",""), "_%n file_::_%n files_" => array("","",""), "_Uploading %n file_::_Uploading %n files_" => array("","",""), -"files uploading" => "datoteke se učitavaju", "Name" => "Ime", "Size" => "Veličina", "Modified" => "Zadnja promjena", |