Merge branch 'master' into saravea

Conflicts:
	.gitmodules
	mod/admins
	mod/assemblies
	mod/audio_html5
	mod/beechat
	mod/crud
	mod/elgg-activitystreams
	mod/elggman
	mod/elggpg
	mod/favorites
	mod/federated-objects
	mod/friendly_time
	mod/group_alias
	mod/group_operators
	mod/languages
	mod/lightpics
	mod/openid_client
	mod/spotlight
	mod/suicide
	mod/tasks
	mod/videolist

1 files changed, 31 insertions, 0 deletions

diff --git a/mod/friendrequest/languages/sr.php b/mod/friendrequest/languages/sr.php
new file mode 100644
index 000000000..d7d693a09
--- /dev/null
+++ b/mod/friendrequest/languages/sr.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * ElggFriendRequest Serbian language file.
+ *
+ */
+
+$serbian = array(
+	'friendrequest' => 'Dodaj u prijatelje',
+	
+	'friendrequest:add:successful' => 'Zahtevao si da postanes prijatelj sa %s. Moras sacekati da odobri tvoj zahtev pre nego sto se pojave u tvojoj listi prijatelja.',
+	'friendrequest:add:failure' => 'Izvini, zbog sistemske greske nismo u mogucnosti da izvrsimo zahtev. Molim pokusaj ponovo.',
+	'friendrequest:add:exists' => 'Vec si pozvao %s  da budete prijatelji.',
+	
+	'friendrequest:decline:success' => 'Uspesno uklonjen zahtev za prijateljstvo.',
+	'friendrequest:decline:fail' => 'Nemogu da uklonim zahtev za prijateljstvo.',
+	
+//	'friendrequest:remove:check' => 'Are you sure you want to decline the friend request?',
+//	'friendrequest:none' => 'No pending friend requests.',
+	
+	'friendrequest:new:subject' => '%s zeli da bude tvoj prijatelj!',
+	'friendrequest:new:body' => '%s zeli da bude tvoj prijatelj! Ali ceka da odobris zahtev...uloguj se sada i odobri zahtev!
+
+Mozes pogledati cekajuce zahteve na:
+
+%s
+
+(Ne mozes odgovoriti na ovaj email.)',
+	
+);
+
+add_translation('sr', $serbian);