diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-23 11:18:00 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-23 11:18:00 +0200 |
| commit | fc76a13c520d1d5345c721e0616d770e1fd344ea (patch) | |
| tree | 1dc8e108588a52182e0c8c346423aab171e66944 /core/l10n/hr.php | |
| parent | 534d93d2d3d549039db2661cdc4b9e939a0abe0d (diff) | |
| parent | 9851f0f4f2a97dc6ac1382bcd533eb23feffa4e0 (diff) | |
| download | nextcloud-server-fc76a13c520d1d5345c721e0616d770e1fd344ea.tar.gz nextcloud-server-fc76a13c520d1d5345c721e0616d770e1fd344ea.zip | |
Merge branch 'master' into sharing_mail_notification_master
Conflicts:
lib/public/share.php
Diffstat (limited to 'core/l10n/hr.php')
| -rw-r--r-- | core/l10n/hr.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/l10n/hr.php b/core/l10n/hr.php index 97fbfb8b97f..7fa81db8a21 100644 --- a/core/l10n/hr.php +++ b/core/l10n/hr.php @@ -37,6 +37,8 @@ $TRANSLATIONS = array( "Yes" => "Da", "No" => "Ne", "Ok" => "U redu", +"_{count} file conflict_::_{count} file conflicts_" => array("","",""), +"Cancel" => "Odustani", "Error" => "Greška", "Share" => "Podijeli", "Error while sharing" => "Greška prilikom djeljenja", |