Merge remote-tracking branch 'upstream/pull/2257'

[rails.git] / config / locales / bs.yml

diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 8bdb52a249fb7abca01bac9e433ec327776fab91..9a1082b27b929f85a32534ea0420f7c25d89b3c8 100644 (file)
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -1,6 +1,7 @@
 # Messages for Bosnian (bosanski)
 # Exported from translatewiki.net
 # Export driver: phpyaml
+# Author: Abijeet Patro
 # Author: Alenmahovic
 # Author: CERminator
 # Author: DzWiki
@@ -17,6 +18,10 @@ bs:
   time:
     formats:
       friendly: '%e %B %Y u %H:%M'
+  helpers:
+    submit:
+      diary_entry:
+        create: Objavi
   activerecord:
     models:
       acl: Kontrole pristupa
@@ -219,7 +224,14 @@ bs:
   diary_entries:
     new:
       title: Novi unos u dnevnik
-      publish_button: Objavi
+    form:
+      subject: 'Predmet:'
+      body: 'Tijelo:'
+      language: 'Jezik:'
+      location: 'Lokacija:'
+      latitude: Geografska širina (Latitude)
+      longitude: Geografska dužina (Longitude)
+      use_map_link: korisititi kartu
     index:
       title: Dnevnici korisnika
       title_friends: Dnevnici prijatelja
@@ -234,14 +246,6 @@ bs:
       newer_entries: Noviji unosi
     edit:
       title: Uredi unos u dnevniku
-      subject: 'Predmet:'
-      body: 'Tijelo:'
-      language: 'Jezik:'
-      location: 'Lokacija:'
-      latitude: Geografska širina (Latitude)
-      longitude: Geografska dužina (Longitude)
-      use_map_link: korisititi kartu
-      save_button: Spremiti
       marker_text: Lokacija unosa u dnevnik
     show:
       title: Dnevnik korisnika %{user} | %{title}
@@ -1789,13 +1793,14 @@ bs:
       confirm: Jeste li sgurni da želite opozvati ovu blokadu?
       revoke: Opozvati!
       flash: Ova blokada je opozvana.
-    period:
-      one: 1 sat
-      other: '%{count} sata/i'
     helper:
       time_future: Završava u %{time}.
       until_login: Aktivno dok se korsnik ne prijavi.
       time_past: Završeno prije %{time}.
+      block_duration:
+        hours:
+          one: 1 sat
+          other: '%{count} sata/i'
     blocks_on:
       title: Blokade na %{name}
       heading: Lista blokada na %{name}