summaryrefslogtreecommitdiffstats
path: root/core/l10n/hr.php
diff options
context:
space:
mode:
authorThomas Tanghus <thomas@tanghus.net>2012-10-24 21:55:25 +0200
committerThomas Tanghus <thomas@tanghus.net>2012-10-24 21:55:25 +0200
commit675a56c5ed798afae6bc9e56616f948a2c4496c2 (patch)
tree53f8b9688d4ace289d8b5438e22fa3d857e3aa5b /core/l10n/hr.php
parentbefdd6b63b1f64625bd26d50b18ebef5b8f82db4 (diff)
parent515e1b467e58337067ee3a4a8945f449d3c2ef3a (diff)
downloadnextcloud-server-675a56c5ed798afae6bc9e56616f948a2c4496c2.tar.gz
nextcloud-server-675a56c5ed798afae6bc9e56616f948a2c4496c2.zip
Merge branch 'master' of github.com:owncloud/core into vcategories_db
Conflicts: lib/vcategories.php
Diffstat (limited to 'core/l10n/hr.php')
-rw-r--r--core/l10n/hr.php24
1 files changed, 12 insertions, 12 deletions
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index dfc834a88cb..30030196b72 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -3,18 +3,6 @@
"No category to add?" => "Nemate kategorija koje možete dodati?",
"This category already exists: " => "Ova kategorija već postoji: ",
"Settings" => "Postavke",
-"January" => "Siječanj",
-"February" => "Veljača",
-"March" => "Ožujak",
-"April" => "Travanj",
-"May" => "Svibanj",
-"June" => "Lipanj",
-"July" => "Srpanj",
-"August" => "Kolovoz",
-"September" => "Rujan",
-"October" => "Listopad",
-"November" => "Studeni",
-"December" => "Prosinac",
"Choose" => "Izaberi",
"Cancel" => "Odustani",
"No" => "Ne",
@@ -76,6 +64,18 @@
"Database host" => "Poslužitelj baze podataka",
"Finish setup" => "Završi postavljanje",
"web services under your control" => "web usluge pod vašom kontrolom",
+"January" => "Siječanj",
+"February" => "Veljača",
+"March" => "Ožujak",
+"April" => "Travanj",
+"May" => "Svibanj",
+"June" => "Lipanj",
+"July" => "Srpanj",
+"August" => "Kolovoz",
+"September" => "Rujan",
+"October" => "Listopad",
+"November" => "Studeni",
+"December" => "Prosinac",
"Log out" => "Odjava",
"Lost your password?" => "Izgubili ste lozinku?",
"remember" => "zapamtiti",