Commit 1dd76d7c authored Jul 20, 2015 by Jonne Haß

Merge branch 'release/0.5.2.0' into stable

parents 53c3ef1d c0a0f5e0

Gemfile.lock

+0 −1

Original line number	Diff line number	Diff line
		@@ -816,7 +816,6 @@ DEPENDENCIES
		rack-rewrite (= 1.5.1)
		rack-ssl (= 1.4.1)
		rails (= 4.2.3)
		rails-assets-autosize (= 3.0.6)!
		rails-assets-diaspora_jsxc (~> 0.1.1)!
		rails-assets-highlightjs (= 8.6.0)!
		rails-assets-jakobmattsson--jquery-elastic (= 1.6.11)!

config/locales/diaspora/br.yml

+111 −24

File changed.

Preview size limit exceeded, changes collapsed.

config/locales/diaspora/cs.yml

+2 −0

Original line number	Diff line number	Diff line
		@@ -323,6 +323,7 @@ cs:
		send: "Poslat"
		sending: "Posílám..."
		subject: "předmět"
		subject_default: "Žádný předmět"
		to: "pro"
		new_conversation:
		fail: "Neplatná zpráva"
		@@ -612,6 +613,7 @@ cs:
		powered_by: "BĚŽÍ NA SÍTI diaspora*"
		public_feed: "Veřejný proud Diaspory pro %{name}"
		source_package: "Stáhnout balík se zdrojovým kódem"
		statistics_link: "Statistiky podu"
		toggle: "Přepnout mobilní / plnou verzi"
		whats_new: "Co je nového?"
		your_aspects: "vaše aspekty"

config/locales/diaspora/da.yml

+1 −0

Original line number	Diff line number	Diff line
		@@ -1377,6 +1377,7 @@ da:
		started_sharing: "... nogen er begyndt at dele med dig."
		stream_preferences: "Opsætning af din Strøm"
		your_email: "Din e-mail"
		your_email_private: "Din e-mail vil aldrig blive set af andre brugere"
		your_handle: "Dit Diaspora-ID"
		getting_started:
		awesome_take_me_to_diaspora: "Fantastisk! Tag mig til Diaspora"

config/locales/diaspora/de.yml

+54 −46

File changed.

Preview size limit exceeded, changes collapsed.