From a1b07d84e11f867d7581315a6fe6ffcfa41fb676 Mon Sep 17 00:00:00 2001
From: Ritchie Wilson <ritchie@rawscripts.com>
Date: Mon, 28 Mar 2011 16:04:29 -0400
Subject: [PATCH 01/17] Next and Previous arrows for mobile photos

---
 app/views/photos/show.mobile.haml   |  9 +++++++++
 public/stylesheets/sass/mobile.sass | 16 ++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 app/views/photos/show.mobile.haml
 mode change 100644 => 100755 public/stylesheets/sass/mobile.sass

diff --git a/app/views/photos/show.mobile.haml b/app/views/photos/show.mobile.haml
old mode 100644
new mode 100755
index c373911c9..4aebfea69
--- a/app/views/photos/show.mobile.haml
+++ b/app/views/photos/show.mobile.haml
@@ -6,3 +6,12 @@
 #show_content.photo
   = image_tag @photo.url(:scaled_full)
 
+  -if @additional_photos && @additional_photos.length > 1
+    #photo_controls
+    %table
+      %tr
+        %td
+          =link_to "←", @prev_photo, :rel => 'prefetch', :class => 'arrow'
+        %td{:width => '100%'}
+        %td
+          =link_to "→", @next_photo, :rel => 'prefetch', :class => 'arrow'
diff --git a/public/stylesheets/sass/mobile.sass b/public/stylesheets/sass/mobile.sass
old mode 100644
new mode 100755
index 06e94078a..fd133abbf
--- a/public/stylesheets/sass/mobile.sass
+++ b/public/stylesheets/sass/mobile.sass
@@ -7,7 +7,7 @@
 
 $blue: #3F8FBA
 
-a:not([role='button'])
+a:not([role='button']):not(.arrow)
   :text
     :decoration none
   :font
@@ -170,6 +170,19 @@ a
     :background
       :color #000
 
+#photo_controls
+  :margin
+    :bottom -42px
+
+.arrow
+  :color white !important
+  :font
+    :size 26pt
+  :text
+    :shadow 0 1px 2px #333
+    :decoration none
+  :padding 0
+
 ul
   :margin 0
   :padding 0
@@ -340,4 +353,3 @@ ul
   :background
     :color #333
   :color #ccc
-

From 7216c8d5cbd7b53dfca4c460adc1dc9315c06d84 Mon Sep 17 00:00:00 2001
From: Dan Hansen <mokker1234@gmail.com>
Date: Fri, 15 Apr 2011 23:37:17 -0500
Subject: [PATCH 02/17] DRY up timeago.js, add license to i18n.js & timeago.js

---
 public/javascripts/widgets/i18n.js    | 14 +++------
 public/javascripts/widgets/timeago.js | 45 +++++++++------------------
 2 files changed, 20 insertions(+), 39 deletions(-)

diff --git a/public/javascripts/widgets/i18n.js b/public/javascripts/widgets/i18n.js
index ade4fccba..eac849a5e 100644
--- a/public/javascripts/widgets/i18n.js
+++ b/public/javascripts/widgets/i18n.js
@@ -1,15 +1,11 @@
-/**
- * Created by .
- * User: dan
- * Date: Jan 25, 2011
- * Time: 5:18:32 PM
- * To change this template use File | Settings | File Templates.
+/*   Copyright (c) 2010, Diaspora Inc.  This file is
+ *   licensed under the Affero General Public License version 3 or later.  See
+ *   the COPYRIGHT file.
  */
-Diaspora.widgets.add("i18n", function() {
-  this.start = $.noop;
 
+Diaspora.widgets.add("i18n", function() {
   this.language = "en";
-  this.locale = {};
+  this.locale = { };
 
   this.loadLocale = function(locale, language) {
     this.language = language;
diff --git a/public/javascripts/widgets/timeago.js b/public/javascripts/widgets/timeago.js
index cd5ffca65..cc3c4e0d8 100644
--- a/public/javascripts/widgets/timeago.js
+++ b/public/javascripts/widgets/timeago.js
@@ -1,41 +1,26 @@
-/**
- * Created by .
- * User: dan
- * Date: Jan 25, 2011
- * Time: 8:49:02 PM
- * To change this template use File | Settings | File Templates.
+/*   Copyright (c) 2010, Diaspora Inc.  This file is
+ *   licensed under the Affero General Public License version 3 or later.  See
+ *   the COPYRIGHT file.
  */
+
 Diaspora.widgets.add("timeago", function() {
   this.selector = "abbr.timeago";
 
   this.start = function() {
-      InfiniteScroll.postScroll(function(){
-            Diaspora.widgets.timeago.updateTimeAgo();
-      });
-      if(Diaspora.widgets.i18n.language === "en") {
-        return;
-      }
+    InfiniteScroll.postScroll(function(){
+      Diaspora.widgets.timeago.updateTimeAgo();
+    });
 
-      jQuery.timeago.settings.strings = {
-        prefixAgo: Diaspora.widgets.i18n.t("timeago.prefixAgo"),
-        prefixFromNow: Diaspora.widgets.i18n.t("timeago.prefixFromNow"),
-        suffixAgo: Diaspora.widgets.i18n.t("timeago.suffixAgo"),
-        suffixFromNow: Diaspora.widgets.i18n.t("timeago.suffixFromNow"),
-        seconds: Diaspora.widgets.i18n.t("timeago.seconds"),
-        minute: Diaspora.widgets.i18n.t("timeago.minute"),
-        minutes: Diaspora.widgets.i18n.t("timeago.minutes"),
-        hour: Diaspora.widgets.i18n.t("timeago.hour"),
-        hours: Diaspora.widgets.i18n.t("timeago.hours"),
-        day: Diaspora.widgets.i18n.t("timeago.day"),
-        days: Diaspora.widgets.i18n.t("timeago.days"),
-        month: Diaspora.widgets.i18n.t("timeago.month"),
-        months: Diaspora.widgets.i18n.t("timeago.months"),
-        year: Diaspora.widgets.i18n.t("timeago.year"),
-        years: Diaspora.widgets.i18n.t("timeago.years")
-      };
+    if(Diaspora.widgets.i18n.language === "en") {
+      return;
+    }
 
-      Diaspora.widgets.timeago.updateTimeAgo("abbr");
+    $.each($.timeago.settings.strings, function(index, element) {
+      $.timeago.settings.strings[index] = Diaspora.widgets.i18n.t("timeago." + element);
+    });
 
+
+    Diaspora.widgets.timeago.updateTimeAgo("abbr");
   };
 
   this.updateTimeAgo = function(selector) {

From 981d39d220b1479e20abcad0e9e9d7771c31c012 Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Sat, 16 Apr 2011 14:03:24 +0200
Subject: [PATCH 03/17] Revert "touched up notifications page" because it
 completly breaks the page (in matter of style and localization [dates!])

This reverts commit a16e83df9ed6e9477e390f7ef08f9d4de476cd30.
---
 app/views/notifications/index.html.haml  | 32 ++++++++---------
 public/stylesheets/sass/application.sass | 45 ++----------------------
 2 files changed, 17 insertions(+), 60 deletions(-)

diff --git a/app/views/notifications/index.html.haml b/app/views/notifications/index.html.haml
index f867b9b7a..bc4de8fae 100644
--- a/app/views/notifications/index.html.haml
+++ b/app/views/notifications/index.html.haml
@@ -1,28 +1,24 @@
 - content_for :head do
   = include_javascripts :notifications
-.span-13
+.span-1
+  = image_tag 'icons/mail_big.png', :height => 30, :width => 30, :style=>"margin-top:3px;"
+.span-10
   %h2
-    %span.notification_count{:class => ('unread' if @notification_count > 0)}
-      = @notification_count
     = t('.notifications')
-.span-8.last.left
+.span-13.last.left
   = link_to t('.mark_all_as_read'), read_all_notifications_path, :class => 'button'
 
 .span-24.last
-  .stream.notifications
+  %ul.stream.notifications
     - @group_days.each do |day, notes|
-      .span-3
-        .date
-          .day= day.split(' ').last
-          .month= day.split(' ').first
+      %li
+        %h4= day
+        %ul.notifications_for_day
+          - notes.each do |note|
+            .stream_element{:data=>{:guid => note.id}, :class => "#{note.unread ? 'unread' : ''}"}
+              %span.from
+                = notification_people_link(note)
+                = object_link(note)
 
-      .span-8.notifications_for_day
-        - notes.each do |note|
-          .stream_element{:data=>{:guid => note.id}, :class => "#{note.unread ? 'unread' : ''}"}
-            %span.from
-              = notification_people_link(note)
-              = object_link(note)
-
-            %br
-            %time= timeago(note.created_at)
+              %span.time= timeago(note.created_at)
     = will_paginate @notifications
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index e5b061869..61a4dd9ba 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -236,10 +236,7 @@ header
       :display block
 
 .unread
-  :font-weight bold
-  :color #333 !important
-  time
-    :color #333 !important
+  :background-color #eee
 
 .diaspora_header_logo
   :position relative
@@ -270,6 +267,8 @@ header
       :font
         :weight normal
         :size smaller
+      :position absolute
+      :right 20px
 
 .from
   a
@@ -2822,41 +2821,3 @@ h1.tag
       :bottom 4px
   .see_all
     :text-align center
-
-.date
-  :background
-    :color #e6e6e6
-  :border-radius 8px
-  :padding 5px
-  :color #999
-
-  :text-align center
-  .day
-    :font-size 50px
-    :font-weight 200
-    :margin-bottom -15px
-    :margin-top -10px
-
-  .month
-    :font-size 14px
-
-.notification_count
-  :background
-    :color #f0f0f0
-  :color #999
-  :font
-    :weight normal
-
-  :padding 0 5px
-    :left 11px
-  :margin
-    :right 5px
-  :border
-    :radius 5px
-
-  &.unread
-    :background
-      :color lighten(#A40802, 5%)
-    :color #eee !important
-    :font
-      :weight bold

From 9df8f832769974a1a058cd5eb4627decc594a541 Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Sun, 17 Apr 2011 21:28:09 +0200
Subject: [PATCH 04/17] fixed specs for me and serveral others (thanks
 @jrichardlai); fixed cucumber

---
 lib/diaspora/user/querying.rb   | 2 +-
 public/javascripts/publisher.js | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/diaspora/user/querying.rb b/lib/diaspora/user/querying.rb
index 377a4d193..d3e1cd99c 100644
--- a/lib/diaspora/user/querying.rb
+++ b/lib/diaspora/user/querying.rb
@@ -20,7 +20,7 @@ module Diaspora
         order_field = opts[:order].split.first.to_sym
         opts[:hidden] ||= false
         order_with_table = 'posts.' + opts[:order]
-        opts[:max_time] = Time.at(opts[:max_time]) if opts[:max_time].instance_of?(Fixnum)
+        opts[:max_time] = Time.at(opts[:max_time]) if opts[:max_time].is_a?(Integer)
         opts[:max_time] ||= Time.now + 1
         select_clause ='DISTINCT posts.id, posts.updated_at AS updated_at, posts.created_at AS created_at'
 
diff --git a/public/javascripts/publisher.js b/public/javascripts/publisher.js
index ec0b816c5..680b9cbf3 100644
--- a/public/javascripts/publisher.js
+++ b/public/javascripts/publisher.js
@@ -346,8 +346,9 @@ var Publisher = {
     });
   },
   initialize: function() {
-    Diaspora.widgets.subscribe("stream/reloaded", Publisher.initialize);
-
+    Publisher.cachedForm = Publisher.cachedSubmit = 
+      Publisher.cachedInput = Publisher.cachedHiddenInput = false;
+    
     Publisher.bindServiceIcons();
     Publisher.bindPublicIcon();
     Publisher.bindAspectToggles();
@@ -368,4 +369,5 @@ var Publisher = {
 
 $(document).ready(function() {
   Publisher.initialize();
+  Diaspora.widgets.subscribe("stream/reloaded", Publisher.initialize);
 });

From e12c7a0eb0baf1a5569cbb27b8b0ee3a13d9d3cd Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Sun, 17 Apr 2011 22:22:56 +0200
Subject: [PATCH 05/17] updated locales

---
 config/locales/devise/devise.pl.yml         |   2 +-
 config/locales/diaspora/es.yml              |   6 +-
 config/locales/diaspora/fr.yml              |   6 +-
 config/locales/diaspora/hu.yml              |   4 +-
 config/locales/diaspora/nl.yml              |   6 +-
 config/locales/diaspora/pl.yml              | 352 ++++++++++----------
 config/locales/javascript/javascript.pl.yml |   2 +-
 7 files changed, 189 insertions(+), 189 deletions(-)

diff --git a/config/locales/devise/devise.pl.yml b/config/locales/devise/devise.pl.yml
index 33d61ed08..21776eb18 100644
--- a/config/locales/devise/devise.pl.yml
+++ b/config/locales/devise/devise.pl.yml
@@ -54,7 +54,7 @@ pl:
         change_password: "Zmień hasło"
       new: 
         forgot_password: "Nie pamiętasz hasła?"
-        no_account: "No account with this email exsists.  If you are waiting for an invite, we are rolling them out as soon as possible"
+        no_account: "Konto o takim emailu nie istnieje. Jeżeli czekasz na nowe zaproszenia, wydajemy je tak szybko, jak to tylko możliwe."
         send_password_instructions: "Wyślij mi instrukcje resetowania hasła"
       send_instructions: "W ciągu kilku minut otrzymasz e-maila zawierającego instrukcjie dotyczące zresetowania hasła."
       updated: "Twoje hasło zostało zmienione. Zalogowano pomyślnie."
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 6c05d4866..49c204a7d 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -69,7 +69,7 @@ es:
       aspect_list_is_visible: "la lista de contactos del aspecto es visible"
       confirm_remove_aspect: "¿Seguro que quieres eliminar este aspecto?"
       done: "Listo"
-      make_aspect_list_visible: "Lista de contactos del aspecto visible."
+      make_aspect_list_visible: "Lista de contactos visible."
       remove_aspect: "Eliminar este aspecto"
       rename: "renombrar"
       update: "Actualizar"
@@ -314,7 +314,7 @@ es:
     add_contact_small: 
       add_contact_from_tag: "añadir contacto desde una etiqueta"
     aspect_list: 
-      edit_membership: "cambiar aspecto asociado"
+      edit_membership: "editar aspectos asociados"
     few: "%{count} personas"
     helper: 
       people_on_pod_are_aware_of: "La gente que está en POD son conscientes de"
@@ -561,7 +561,7 @@ es:
       people_tagged_with: "Personas etiquetadas en %{tag}"
       posts_tagged_with: "Publicaciones etiquetadas con #%{tag}"
   the_world: "el mundo"
-  undo: "Deshacer?"
+  undo: "¿Deshacer?"
   username: "Nombre de usuario"
   users: 
     destroy: "Cuenta cerrada con éxito."
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 5b75bfbd1..9aa4e309c 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -113,7 +113,7 @@ fr:
     zero: "aucun aspect"
   back: "Retour"
   bookmarklet: 
-    explanation: "%{link} depuis n'importe où ajoutant ce bookmarklet à vos marque-pages/favoris."
+    explanation: "%{link} depuis n'importe où en ajoutant ce bookmarklet à vos marque-pages ou favoris."
     explanation_link_text: "Publier sur Diaspora"
     post_something: "Publier quelque chose sur Diaspora"
     post_success: "Publié ! Fermeture !"
@@ -266,7 +266,7 @@ fr:
       and_others: "et %{number} autres"
       mark_all_as_read: "Tout marquer comme lu"
       notifications: "Notifications"
-    mentioned: "vous a mentionné(e) dans son"
+    mentioned: "vous a mentionné(e) dans une publication"
     new_request: "a proposé de partager avec vous."
     post: "message"
     private_message: "vous a envoyé un message."
@@ -354,7 +354,7 @@ fr:
       recent_posts: "Messages récents"
       recent_public_posts: "Messages publics récents"
       return_to_aspects: "Retourner à votre page des aspects"
-      see_all: "See all"
+      see_all: "Tout afficher"
       start_sharing: "commencer à partager"
       to_accept_or_ignore: "pour l'accepter ou l'ignorer."
       you_have_no_tags: "vous n'avez aucun tag !"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 7b35bca42..25e19716d 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -266,7 +266,7 @@ hu:
       and_others: "és %{number} másik"
       mark_all_as_read: "Mind megjelölése olvasottként"
       notifications: "Értesítések"
-    mentioned: "megemlítettek téged a"
+    mentioned: "megemlített téged egy bejegyzésben"
     new_request: "megosztást ajánlott neked."
     post: "bejegyzés"
     private_message: "üzenetet küldött neked."
@@ -354,7 +354,7 @@ hu:
       recent_posts: "Legutóbbi bejegyzések"
       recent_public_posts: "Legutóbbi nyilvános bejegyzések"
       return_to_aspects: "Menj vissza a csoportokhoz"
-      see_all: "See all"
+      see_all: "Összes"
       start_sharing: "Megosztás indítása"
       to_accept_or_ignore: "hogy elfogadd vagy elutasítsd."
       you_have_no_tags: "nincs címkéd!"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index dca81eb16..efd75e466 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -266,7 +266,7 @@ nl:
       and_others: "en %{number} anderen"
       mark_all_as_read: "Markeer alles gelezen"
       notifications: "Notificaties"
-    mentioned: "heeft je genoemd in zijn/haar"
+    mentioned: "heeft je genoemd in een post"
     new_request: "bood aan om met jou te delen."
     post: "post"
     private_message: "heeft je een bericht gestuurd."
@@ -346,7 +346,7 @@ nl:
       add_some: "Voeg toe"
       does_not_exist: "Die persoon bestaat niet!"
       edit: "bewerk"
-      incoming_request: "% {name} wil met je delen"
+      incoming_request: "%{name} wil met je delen"
       mention: "Noemen"
       message: "Bericht"
       no_posts: "geen berichten om weer te geven!"
@@ -354,7 +354,7 @@ nl:
       recent_posts: "Recente Berichten"
       recent_public_posts: "Recente Openbare Berichten"
       return_to_aspects: "Ga terug naar je aspecten pagina"
-      see_all: "See all"
+      see_all: "Zie alles"
       start_sharing: "start met delen"
       to_accept_or_ignore: "om te accepteren of te negeren."
       you_have_no_tags: "je hebt geen tags!"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index f190e3ee2..6068bc24b 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -27,13 +27,13 @@ pl:
         user: 
           attributes: 
             email: 
-              taken: "is already taken."
+              taken: "jest już używany."
             person: 
               invalid: "is invalid."
             username: 
-              taken: "is already taken."
+              taken: "jest już zajęta."
   ago: "%{time} temu"
-  all_aspects: "All aspects"
+  all_aspects: "Wszystkie aspekty"
   application: 
     helper: 
       unknown_person: "nieznana osoba"
@@ -42,9 +42,9 @@ pl:
   are_you_sure: "Na pewno?"
   aspect_memberships: 
     destroy: 
-      failure: "Failed to remove person from aspect"
-      no_membership: "Could not find the selected person in that aspect"
-      success: "Successfully removed person from aspect"
+      failure: "Nie udało się usunąć osoby z aspektu"
+      no_membership: "Nie udało się odnaleźć wskazanej osoby w tym aspekcie"
+      success: "Osoba pomyślnie usunięta z aspektu"
   aspects: 
     add_to_aspect: 
       failure: "Nie udało się dodać kontaktu do aspektu."
@@ -52,29 +52,29 @@ pl:
     aspect_contacts: 
       done_editing: "edycja zakończona"
     aspect_stream: 
-      activity: "activity"
-      post_time: "post time"
-      sort_by: "sort by:"
+      activity: "aktywność"
+      post_time: "data wpisu"
+      sort_by: "sortuj po:"
     contacts_not_visible: "Kontakty z tego aspektu nie będą dla siebie widoczne."
     contacts_visible: "Kontakty z tego aspektu będą widziały się nawzajem."
     create: 
       failure: "Nie udało się utworzyć aspektu."
       success: "Twój nowy aspekt, on nazwie %{name}, został utworzony"
     destroy: 
-      failure: "%{name} is not empty and could not be removed."
+      failure: "%{name} nie jest pusty i nie może być usunięty."
       success: "%{name} został usunięty."
     edit: 
       add_existing: "Dodaj istniejący kontakt"
-      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
-      aspect_list_is_visible: "aspect list is visible to others in aspect"
+      aspect_list_is_not_visible: "lista aspektów jest ukryta przed innymi z tego aspektu"
+      aspect_list_is_visible: "lista aspektów jest widoczna dla innych z tego aspektu"
       confirm_remove_aspect: "@{m,f:Jesteś|n:Czy na}{ pew}{m:ien|f:na|n:no}{m,f:, że } chcesz usunąć ten aspekt?"
-      done: "Done"
-      make_aspect_list_visible: "make aspect list visible?"
+      done: "Zrobione"
+      make_aspect_list_visible: "uczyń listę aspektów widoczną?"
       remove_aspect: "Usuń ten aspekt"
       rename: "zmień nazwę"
-      update: "update"
+      update: "aktualizuj"
       updating: "updating"
-    few: "%{count} aspects"
+    few: "%{count} aspekty"
     helper: 
       are_you_sure: "@{m,f:Jesteś|n:Czy na}{ pew}{m:ien|f:na|n:no}{m,f:, że } chcesz usunąć ten aspekt?"
       aspect_not_empty: "Aspekt nie jest pusty"
@@ -82,7 +82,7 @@ pl:
     index: 
       handle_explanation: "To jest Twój identyfikator w Diasporze. Podobnie jak adresu e-mailowy, możesz podawać go innym, aby mogli się z Tobą skontaktować."
       no_contacts: "Brak kontaktów"
-      post_a_message: "post a message >>"
+      post_a_message: "napisz wiadomość >>"
     manage: 
       add_a_new_aspect: "Dodaj nowy aspekt"
       add_a_new_contact: "Dodaj nowy kontakt"
@@ -90,7 +90,7 @@ pl:
       manage_aspects: "Zarządzanie aspektami"
       no_requests: "Brak nowych zaproszeń"
       requests: "Zaproszenia"
-    many: "%{count} aspects"
+    many: "%{count} aspektów"
     move_contact: 
       error: "Błąd przy przenoszeniu kontaktu: %{inspect}"
       failure: "nie zadziałało %{inspect}"
@@ -100,74 +100,74 @@ pl:
       name: "Nazwa"
     no_posts_message: 
       start_talking: "Nikt jeszcze nic nie powiedział. Rozkręć rozmowę!"
-    one: "1 aspect"
-    other: "%{count} aspects"
+    one: "1 aspekt"
+    other: "%{count} aspektów"
     seed: 
       family: "Rodzina"
       work: "Praca"
     show: 
       edit_aspect: "edytuj aspekt"
     update: 
-      failure: "Your aspect, %{name}, had too long name to be saved."
+      failure: "Twój aspekt %{name} nie mógł zostać zapisany z powodu zbyt długiej nazwy."
       success: "Twój aspekt '%{name}' został pomyślnie zmieniony."
-    zero: "no aspects"
+    zero: "brak aspektów"
   back: "Wróć"
   bookmarklet: 
-    explanation: "%{link} from anywhere by bookmarking this link."
-    explanation_link_text: "Post to Diaspora"
-    post_something: "Post something to Diaspora"
+    explanation: "%{link} z każdego miejsca dodając ten link do zakładek."
+    explanation_link_text: "Publikuj w serwisie Diaspora"
+    post_something: "Napisz coś na Diasporze"
     post_success: "Posted! Closing!"
   cancel: "Anuluj"
   comments: 
-    few: "%{count} comments"
-    many: "%{count} comments"
+    few: "%{count} komentarze"
+    many: "%{count} komentarzy"
     new_comment: 
       comment: "Skomentuj…"
       commenting: "Komentowanie…"
-    one: "1 comment"
-    other: "%{count} comments"
-    zero: "no comments"
+    one: "1 komentarz"
+    other: "%{count} komentarzy"
+    zero: "brak komentarzy"
   contacts: 
     create: 
-      failure: "Failed to create contact"
+      failure: "Nie udało się utworzyć kontaktu"
     destroy: 
-      failure: "Failed to disconnect from %{name}"
-      success: "Successfully disconnected from %{name}"
+      failure: "Nie udało się odłączyć od %{name}"
+      success: "Pomyślnie odłączono od %{name}"
     few: "%{count} kontakty"
-    many: "%{count} contacts"
+    many: "%{count} kontaktów"
     one: "1 kontakt"
     other: "%{count} kontaktów"
     share_with_pane: 
-      accepts: "Once %{name} accepts, you'll start seeing each other's posts on Diaspora"
-      add_new_aspect: "add to new aspect"
-      share_with: "Start sharing with %{name}"
+      accepts: "Kiedy %{name} zaakceptuje zaproszenie, zaczniecie widzieć nawzajem swoje wpisy w serwisie Diaspora"
+      add_new_aspect: "dodaj do nowego aspektu"
+      share_with: "Zacznij współdzielić z %{name}"
     zero: "brak kontaktów"
   conversations: 
     create: 
-      sent: "Message sent"
+      sent: "Wiadomość została wysłana"
     destroy: 
-      success: "Conversation successfully removed"
+      success: "Pomyślnie usunięto rozmowę"
     helper: 
       new_messages: 
-        few: "%{count} new messages"
-        many: "%{count} new messages"
-        one: "1 new messages"
-        other: "%{count} new messages"
-        zero: "no new messages"
+        few: "%{count} nowe wiadomości"
+        many: "%{count} nowych wiadomości"
+        one: "1 nowa wiadomość"
+        other: "%{count} nowych wiadomości"
+        zero: "brak nowych wiadomości"
     index: 
-      create_a_new_message: "create a new message"
-      inbox: "Inbox"
-      message_inbox: "Message Inbox"
-      new_message: "New Message"
-      no_conversation_selected: "no conversation selected"
-      no_messages: "no messages"
+      create_a_new_message: "stwórz nową wiadomość"
+      inbox: "Skrzynka odbiorcza"
+      message_inbox: "Skrzynka odbiorcza"
+      new_message: "Nowa wiadomość"
+      no_conversation_selected: "nie wybrano wątku"
+      no_messages: "brak wiadomości"
     new: 
-      send: "Send"
-      subject: "subject"
-      to: "to"
+      send: "Wyślij"
+      subject: "temat"
+      to: "do"
     show: 
-      delete: "delete and block conversation"
-      reply: "reply"
+      delete: "usuń i zablokuj rozmowę"
+      reply: "odpowiedz"
   date: 
     formats: 
       birthday: "%d %B"
@@ -180,7 +180,7 @@ pl:
       correct_the_following_errors_and_try_again: "Popraw poniższe błędy i spróbuj ponownie."
       invalid_fields: "Pola z błędami"
   fill_me_out: "Wypełnij to pole"
-  hide: "Hide"
+  hide: "Ukryj"
   home: 
     show: 
       already_account: "masz już konto?"
@@ -207,13 +207,13 @@ pl:
     edit: 
       sign_up: "rejestracja"
     new: 
-      already_invited: "Already invited"
+      already_invited: "Już zaproszony"
       aspect: "Aspekt"
       comma_seperated_plz: "Możesz podać kilka adresów e-mailowych, oddzielając je przecinkami."
       if_they_accept_info: "Jeśli wybrana osoba przyjmie zaproszenie, zostanie dodana do aspektów, do których ją zapros@{m:iłeś|f:iłaś|n:zono}."
       invite_someone_to_join: "Zaproś kogoś do Diaspory!"
       personal_message: "Dodatkowa wiadomość"
-      resend: "Resend"
+      resend: "Wyślij ponownie"
       send_an_invitation: "Wyślij zaproszenie"
       send_invitation: "Wyślij zaproszenie"
       to: "Do"
@@ -221,17 +221,17 @@ pl:
     application: 
       have_a_problem: "Masz problem? Tu znajdziesz rozwiązanie"
       powered_by: "POWERED BY DIASPORA*"
-      public_feed: "Public Diaspora Feed for %{name}"
+      public_feed: "Publiczny kanał Diaspory użytkownika %{name}"
       toggle: "przełącz widok mobilny"
-      whats_new: "what's new?"
-      your_aspects: "your aspects"
+      whats_new: "co nowego?"
+      your_aspects: "twoje aspekty"
     header: 
       blog: "blog"
       code: "kod"
       login: "logowanie"
       logout: "wyloguj"
-      profile: "profile"
-      settings: "settings"
+      profile: "profil"
+      settings: "ustawienia"
   likes: 
     likes: 
       people_dislike_this: 
@@ -241,65 +241,65 @@ pl:
         other: "%{count} people disliked this"
         zero: "no people disliked this"
       people_like_this: 
-        few: "%{count} people liked this"
-        many: "%{count} people liked this"
-        one: "1 person liked this"
-        other: "%{count} people liked this"
-        zero: "no people liked this"
-  more: "More"
-  next: "next"
+        few: "%{count} osoby polubiły to"
+        many: "%{count} osób polubiło to"
+        one: "1 osoba to polubiła"
+        other: "%{count} osób polubiło to"
+        zero: "nikt tego nie polubił"
+  more: "Więcej"
+  next: "następny"
   no_results: "No Results Found"
   notifications: 
-    also_commented: "also commented on"
+    also_commented: "skomentował również użytkownika %{post_author}"
     also_commented_deleted: "commented on a deleted post"
     comment_on_post: "komentuje twój"
     deleted: "usunięte"
     helper: 
       new_notifications: 
-        few: "%{count} new notifications"
-        many: "%{count} new notifications"
-        one: "1 new notifications"
-        other: "%{count} new notifications"
-        zero: "no new notifications"
+        few: "%{count} nowe powiadomienia"
+        many: "%{count} nowych powiadomień"
+        one: "1 nowe powiadomienie"
+        other: "%{count} nowych powiadomień"
+        zero: "brak nowych powiadomień"
     index: 
-      and: "and"
-      and_others: "and %{number} others"
-      mark_all_as_read: "Mark All as Read"
+      and: "i"
+      and_others: "i %{number} innych"
+      mark_all_as_read: "Oznacz wszystkie jako przeczytane"
       notifications: "Powiadomienia"
-    mentioned: "has mentioned you in their"
-    new_request: "wysłał Ci zaproszenie do współdzielenia."
-    post: "post"
-    private_message: "sent you a message."
+    mentioned: "wspomniał o tobie we wpisie"
+    new_request: "chce zostać twoim znajomym."
+    post: "wpis"
+    private_message: "wysłał(a) ci wiadomość."
     request_accepted: "zaakceptował Twoje zaproszenie."
   notifier: 
     also_commented: 
       commented: "skomentował też wpis użytkownika %{post_author}:"
       sign_in: "Zaloguj się, aby je obejrzeć."
-      subject: "%{name} has also commented."
+      subject: "%{name} skomentował również wpis użytkownika %{post_author}."
     comment_on_post: 
-      commented: "has commented on your post!"
+      commented: "skomentował twój wpis:"
       sign_in: "Zaloguj się, aby go obejrzeć."
       subject: "Użytkownik %{name} skomentował Twój wpis."
     diaspora: "robot e-mailowy diaspory"
     hello: "Cześć %{name}!"
     love: "uściski,"
-    manage_your_email_settings: "manage your email settings"
+    manage_your_email_settings: "zarządzaj ustawieniami emaila"
     mentioned: 
-      mentioned: "mentioned you in a post:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has mentioned you on Diaspora*"
+      mentioned: "wspomniał(a) o tobie we wpisie:"
+      sign_in: "Zaloguj się, aby uzyskać dostęp."
+      subject: "%{name} wspomniał o tobie w serwisie Diaspora*"
     new_request: 
       just_sent_you: "właśnie wysłał(-a) Ci zaproszenie do Diaspory*"
       sign_in: "zaloguj się"
       subject: "nowe zaproszenie do znajomych w Diasporze* od %{from}"
       try_it_out: "Przemyśl to, naprawdę warto spróbować."
     private_message: 
-      message_subject: "Subject: %{subject}"
-      private_message: "has sent you a private message:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has sent you a private message yon Diaspora*"
+      message_subject: "Temat: %{subject}"
+      private_message: "wysłał ci wiadomość prywatną:"
+      sign_in: "Zarejestruj się, aby zobaczyć."
+      subject: "%{name} wysłał ci prywatną wiadomość w serwisie Diaspora*"
     request_accepted: 
-      accepted: "zaakceptował(-a) Twoje zaproszenie. Jest w aspekcie"
+      accepted: "zaakceptował Twoje zaproszenie!"
       sign_in: "Zaloguj się"
       subject: "%{name} zaakceptował(-a) twoje zaproszenie do znajomych w Diasporze*"
     single_admin: 
@@ -314,24 +314,24 @@ pl:
     add_contact_small: 
       add_contact_from_tag: "add contact from tag"
     aspect_list: 
-      edit_membership: "edit aspect membership"
-    few: "%{count} people"
+      edit_membership: "edytuj przynależność do aspektów"
+    few: "%{count} osoby"
     helper: 
       people_on_pod_are_aware_of: " osoby na podzie wiedzą, że"
       results_for: " wyniki dla %{params}"
     index: 
-      couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
+      couldnt_find_them_send_invite: "Nie znalazłeś ich? Wyślij im zaproszenie!"
       no_one_found: "...and no one was found."
       no_results: "Hey! You need to search for something."
       results_for: "wyniki wyszukiwania dla"
-    many: "%{count} people"
-    one: "1 person"
-    other: "%{count} people"
+    many: "%{count} osób"
+    one: "1 osoba"
+    other: "%{count} ludzi"
     person: 
       add_contact: "dodaj kontakt"
       already_connected: "Już podłączono"
       pending_request: "zaproszenie oczekujące"
-      thats_you: "to przecież Ty!"
+      thats_you: "To przecież Ty!"
     profile_sidebar: 
       bio: "notka biograficzna"
       born: "urodziny"
@@ -339,28 +339,28 @@ pl:
       edit_my_profile: "Edycja mojego profilu"
       gender: "płeć"
       in_aspects: "w aspektach"
-      location: "location"
+      location: "położenie"
       remove_contact: "usuwanie kontaktu"
       remove_from: "Usunąć %{name} z aspektu %{aspect}?"
     show: 
       add_some: "add some"
       does_not_exist: "Osoba nie istnieje!"
-      edit: "edit"
-      incoming_request: "Masz nowe zaproszenie od tej osoby."
-      mention: "Mention"
-      message: "Message"
+      edit: "edytuj"
+      incoming_request: "%{name} chce być twoim znajomym"
+      mention: "Wspomnij"
+      message: "Wiadomość"
       no_posts: "brak wpisów!"
-      not_connected: "You are not connected with this person"
+      not_connected: "Ta osoba nie jest twoim znajomym"
       recent_posts: "Ostatnie wpisy"
-      recent_public_posts: "Recent Public Posts"
+      recent_public_posts: "Ostatnie wpisy publiczne"
       return_to_aspects: "Wróć do strony aspektów"
-      see_all: "See all"
+      see_all: "Zobacz wszystkich"
       start_sharing: "współdziel"
       to_accept_or_ignore: "by je przyjąć lub zignorować."
       you_have_no_tags: "you have no tags!"
     webfinger: 
       fail: "Wybacz, nie można było znaleźć %{handle}."
-    zero: "no people"
+    zero: "nikt"
   photos: 
     create: 
       integrity_error: "Nie udało się przesłać zdjęcia. Czy @{m,f:jesteś pew}{m:ien|f:na|n:to na pewno}{m,f: że to} był obraz?"
@@ -379,8 +379,8 @@ pl:
       invalid_ext: "Plik {file} ma niewłaściwe rozszerzenie. Akceptowane rozszerzenia: {extensions}"
       size_error: "Plik {file} jest zbyt duży, maksymalny rozmiar to {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "or select one from your already existing"
-      upload: "Upload a new profile photo!"
+      or_select_one: "lub wybierz jeden z już istniejących"
+      upload: "Załaduj nowe zdjęcie profilowe!"
     photo: 
       view_all: "pokaż wszystkie zdjęcia należące do: %{name}"
     show: 
@@ -389,7 +389,7 @@ pl:
       edit: "edytuj"
       edit_delete_photo: "Edytuj opis zdjęcia / usuń zdjęcie"
       make_profile_photo: "zrób zdjęcie profilowe"
-      original_post: "Original Post"
+      original_post: "Pierwotny wpis"
       permalink: "permalink"
       update_photo: "Aktualizuj zdjęcie"
       view: "podgląd"
@@ -398,31 +398,31 @@ pl:
       notice: "Pomyślnie zaktualizowano zdjęcie."
   post_visibilites: 
     update: 
-      post_hidden: "%{name}'s post has been hidden."
+      post_hidden: "wpis użytkownika %{name} został ukryty."
   posts: 
-    doesnt_exist: "that post does not exist!"
-  previous: "previous"
+    doesnt_exist: "ten wpis nie istnieje!"
+  previous: "poprzedni"
   profile: "Profil"
   profiles: 
     edit: 
-      allow_search: "Allow for people to search for you within Diaspora"
-      edit_profile: "Edit profile"
-      first_name: "First name"
-      last_name: "Last name"
-      update_profile: "Update Profile"
-      your_bio: "Your bio"
-      your_birthday: "Your birthday"
-      your_gender: "Your gender"
-      your_location: "Your location"
-      your_name: "Your name"
-      your_photo: "Your photo"
-      your_private_profile: "Your private profile"
-      your_public_profile: "Your public profile"
-      your_tags: "You: in 5 #tags"
-      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
+      allow_search: "Pozwól ludziom na wyszukiwanie cię w serwisie Diaspora"
+      edit_profile: "Edytuj profil"
+      first_name: "Imię"
+      last_name: "Nazwisko"
+      update_profile: "Aktualizuj profil"
+      your_bio: "O tobie"
+      your_birthday: "Twoje urodziny"
+      your_gender: "Twoja płeć"
+      your_location: "Twoje położenie"
+      your_name: "Imię"
+      your_photo: "Twoje zdjęcie"
+      your_private_profile: "Twój profil prywatny"
+      your_public_profile: "Twój profil publiczny"
+      your_tags: "Ty: w 5 #tagach"
+      your_tags_placeholder: "np. #diaspora #prasowanie #kotki #muzyka"
     update: 
-      failed: "Failed to update profile"
-      updated: "Profile updated"
+      failed: "Nie udało się zaktualizować profilu"
+      updated: "Profil został pomyślnie zaktualizowany"
   registrations: 
     closed: "Na tym podzie Diaspory rejestracja jest zamknięta"
     create: 
@@ -451,11 +451,11 @@ pl:
       success: "Jesteście teraz znajomymi."
     helper: 
       new_requests: 
-        few: "%{count} new requests!"
-        many: "%{count} new requests!"
-        one: "new request!"
-        other: "%{count} new requests!"
-        zero: "no new requests"
+        few: "%{count} nowe zaproszenia!"
+        many: "%{count} nowych zaproszeń!"
+        one: "nowe zaproszenie!"
+        other: "%{count} nowych zaproszeń!"
+        zero: "brak nowych zaproszeń"
     manage_aspect_contacts: 
       existing: "Istniejące kontakty"
       manage_within: "Zarządzanie kontaktami w"
@@ -471,23 +471,23 @@ pl:
       error: "wystąpił błąd podczas łączenia z tą usługą"
     finder: 
       friends: 
-        few: "%{count} friends"
-        many: "%{count} friends"
-        one: "1 friend"
-        other: "%{count} friends"
-        zero: "no friends"
-      invite_your_friends_from: "Invite your friends from %{service}"
+        few: "%{count} znajomych"
+        many: "%{count} znajomych"
+        one: "1 znajomy"
+        other: "%{count} znajomych"
+        zero: "żadnych znajomych"
+      invite_your_friends_from: "Zaproś swoich znajomych z serwisu %{service}"
       not_connected: "not connected"
     index: 
       connect_to_facebook: "Połącz z Facebookiem"
       connect_to_twitter: "Połącz z Twitterem"
       disconnect: "rozłącz"
-      edit_services: "Edit services"
+      edit_services: "Edytuj usługi"
       logged_in_as: "zalogowano jako"
       really_disconnect: "rozłączyć %{service}?"
     inviter: 
-      click_link_to_accept_invitation: "Click this link to accept your invitation"
-      join_me_on_diaspora: "Join me on DIASPORA*"
+      click_link_to_accept_invitation: "Kliknij w ten link, aby przyjąć zaproszenie"
+      join_me_on_diaspora: "Dołącz do mnie w serwisie DIASPORA*"
     remote_friend: 
       invite: "zaproś"
       resend: "wyślij ponownie"
@@ -503,16 +503,16 @@ pl:
       all_contacts: "Wszystkie kontakty"
       cannot_remove: "Nie można usunąć osoby z jedynego pozostałego aspektu. (Jeśli chcesz się rozłączyć z tą osobą musisz ją usunąć ze znajomych.)"
     footer: 
-      logged_in_as: "logged in as %{name}"
-      your_aspects: "your aspects"
+      logged_in_as: "zalogowany jako %{name}"
+      your_aspects: "twoje aspekty"
     invitations: 
       by_email: "by Email"
       dont_have_now: "Nie masz wolnych zaproszeń, ale niebawem się pojawią!"
-      from_facebook: "From Facebook"
+      from_facebook: "z serwisu Facebook"
       invitations_left: "(pozostało %{count} zaproszeń)"
       invite_someone: "Zaproś kogoś"
-      invite_your_friends: "Invite your friends"
-      invites: "Invites"
+      invite_your_friends: "Znajdź znajomych"
+      invites: "Zaproszenia"
       invites_closed: "Wysyłanie zaproszeń jest obecnie wyłączony na tym podzie Diaspora"
     notification: 
       new: "Nowy(-a,-e) %{type} od %{from}"
@@ -525,7 +525,7 @@ pl:
       add_photos: "dodaj zdjęcia"
       all: "wszyscy"
       all_contacts: "wszyscy znajomi"
-      click_to_share_with: "Click to share with: "
+      click_to_share_with: "Kliknij, aby podzielić się z:"
       make_public: "upublicznij"
       post_a_message_to: "Wyślij wiadomość do %{aspect}"
       posting: "Wysyłanie…"
@@ -537,11 +537,11 @@ pl:
     reshare: 
       reshare: "Podziel się ponownie"
     stream_element: 
-      dislike: "I dislike this"
-      like: "I like this"
+      dislike: "Nie lubię tego"
+      like: "Lubię to"
   status_messages: 
     create: 
-      success: "Successfully mentioned: %{names}"
+      success: "Pomyślnie wspomniano o: %{names}"
     destroy: 
       failure: "Błąd podczas usuwania wpisu"
     helper: 
@@ -550,39 +550,39 @@ pl:
       mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Usuń"
-      not_found: "Sorry, we couldn't find that post."
+      not_found: "Niestety, nie udało się nam znaleźć tego wpisu."
       permalink: "permalink"
   stream_helper: 
     hide_comments: "ukryj komentarze"
     show_comments: "pokaż komentarze"
   tags: 
     show: 
-      nobody_talking: "Nobody is talking about %{tag} yet."
-      people_tagged_with: "People tagged with %{tag}"
-      posts_tagged_with: "Posts tagged with #%{tag}"
+      nobody_talking: "Nikt jeszcze nie rozmawia o %{tag}."
+      people_tagged_with: "Osoby opisane poprzez %{tag}"
+      posts_tagged_with: "Wpisy oznaczone jako #%{tag}"
   the_world: "świat"
-  undo: "Undo?"
+  undo: "Cofnąć?"
   username: "Nazwa użytkownika"
   users: 
     destroy: "Konto zostało pomyślnie zamknięte."
     edit: 
-      also_commented: "...someone also comments on your contact's post?"
-      change: "Change"
+      also_commented: "...ktoś także skomentuje wpis jednego z twoich kontaktów?"
+      change: "Zmień"
       change_language: "Zmień język"
       change_password: "Zmiana hasła"
       close_account: "Zamknij konto"
-      comment_on_post: "...someone comments on your post?"
-      current_password: "Current password"
+      comment_on_post: "...ktoś skomentuje twój wpis?"
+      current_password: "Obecne hasło"
       download_photos: "pobierz moje zdjęcia"
       download_xml: "pobierz mój xml"
-      edit_account: "Edit account"
+      edit_account: "Edytuj konto"
       export_data: "Eksportowanie danych"
-      mentioned: "...you are mentioned in a post?"
+      mentioned: "...zostałeś wspomniany(a) we wpisie?"
       new_password: "Nowe hasło"
-      private_message: "...you receive a private message?"
-      receive_email_notifications: "Receive email notificaions?"
-      request_acceptence: "...your share request is accepted?"
-      request_received: "...you receive a new share request?"
+      private_message: "...otrzymasz prywatną wiadomość?"
+      receive_email_notifications: "Otrzymywanie powiadomień emailowych kiedy..."
+      request_acceptence: "...twoje zaproszenie do współdzielenia zostanie zaakceptowane?"
+      request_received: "...otrzymasz nowe zaproszenie do współdzielenia?"
       your_email: "Twój e-mail"
       your_handle: "Twój identyfikator w Diasporze"
     getting_started: 
@@ -595,16 +595,16 @@ pl:
       signup_steps: "Dokończ rejestrację w trzech krokach:"
       skip: "pomiń wprowadzenie"
       step_2: 
-        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
-        skip: "Skip"
+        find_your_friends_on_diaspora: "Czy chciałbyś znaleźć swoich znajomych z serwisu Facebook w Diasporze?"
+        skip: "Pomiń"
       step_3: 
-        finish: "Finish"
-        people_already_on_diaspora: "People already on Diaspora"
+        finish: "Zakończ"
+        people_already_on_diaspora: "Już używający Diaspory"
       welcome: "Witaj w Diasporze!"
     public: 
       does_not_exist: "Użytkownik %{username} nie istnieje!"
     update: 
-      email_notifications_changed: "Language Change Failed"
+      email_notifications_changed: "Zmieniono ustawienia powiadomień email"
       language_changed: "Zmieniono język"
       language_not_changed: "Nie udało się zmienić języka"
       password_changed: "Zmieniono hasło"
diff --git a/config/locales/javascript/javascript.pl.yml b/config/locales/javascript/javascript.pl.yml
index 3707e31a0..4bad05226 100644
--- a/config/locales/javascript/javascript.pl.yml
+++ b/config/locales/javascript/javascript.pl.yml
@@ -7,7 +7,7 @@ pl:
   javascripts: 
     confirm_dialog: "Czy @{m,f:jesteś|n:na}{ pew}{m:ien|f:na|n:no}?"
     publisher: 
-      at_least_one_aspect: "You must publish to at least one aspect"
+      at_least_one_aspect: "Musisz udostępnić dla co najmniej jednego aspektu"
     search_for: "Szukaj: {{name}}"
     shared: 
       contact_list: 

From 7a48d7accf247c429479c17d37a6952a996660b9 Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Mon, 18 Apr 2011 22:37:24 +0200
Subject: [PATCH 06/17] added readme for inflection definitions

---
 config/locales/inflections/README.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 config/locales/inflections/README.md

diff --git a/config/locales/inflections/README.md b/config/locales/inflections/README.md
new file mode 100644
index 000000000..1760b806f
--- /dev/null
+++ b/config/locales/inflections/README.md
@@ -0,0 +1,3 @@
+This directory contains the definitions for the [i18n-inflector gem](https://github.com/siefca/i18n-inflector).
+Look at the documentation there and our [contributing translations](https://github.com/diaspora/diaspora/wiki/How-to-contribute-translations) wiki page for more informations
+and how to contribute.

From 5050307179f77920038903d9c26e0442f4baf5d7 Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Mon, 18 Apr 2011 11:14:08 -0700
Subject: [PATCH 07/17] Revert "Revert "touched up notifications page" because
 it completly breaks the page (in matter of style and localization [dates!])"

This reverts commit 981d39d220b1479e20abcad0e9e9d7771c31c012.
---
 app/views/notifications/index.html.haml  | 32 +++++++++--------
 public/stylesheets/sass/application.sass | 45 ++++++++++++++++++++++--
 2 files changed, 60 insertions(+), 17 deletions(-)

diff --git a/app/views/notifications/index.html.haml b/app/views/notifications/index.html.haml
index bc4de8fae..f867b9b7a 100644
--- a/app/views/notifications/index.html.haml
+++ b/app/views/notifications/index.html.haml
@@ -1,24 +1,28 @@
 - content_for :head do
   = include_javascripts :notifications
-.span-1
-  = image_tag 'icons/mail_big.png', :height => 30, :width => 30, :style=>"margin-top:3px;"
-.span-10
+.span-13
   %h2
+    %span.notification_count{:class => ('unread' if @notification_count > 0)}
+      = @notification_count
     = t('.notifications')
-.span-13.last.left
+.span-8.last.left
   = link_to t('.mark_all_as_read'), read_all_notifications_path, :class => 'button'
 
 .span-24.last
-  %ul.stream.notifications
+  .stream.notifications
     - @group_days.each do |day, notes|
-      %li
-        %h4= day
-        %ul.notifications_for_day
-          - notes.each do |note|
-            .stream_element{:data=>{:guid => note.id}, :class => "#{note.unread ? 'unread' : ''}"}
-              %span.from
-                = notification_people_link(note)
-                = object_link(note)
+      .span-3
+        .date
+          .day= day.split(' ').last
+          .month= day.split(' ').first
 
-              %span.time= timeago(note.created_at)
+      .span-8.notifications_for_day
+        - notes.each do |note|
+          .stream_element{:data=>{:guid => note.id}, :class => "#{note.unread ? 'unread' : ''}"}
+            %span.from
+              = notification_people_link(note)
+              = object_link(note)
+
+            %br
+            %time= timeago(note.created_at)
     = will_paginate @notifications
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 61a4dd9ba..e5b061869 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -236,7 +236,10 @@ header
       :display block
 
 .unread
-  :background-color #eee
+  :font-weight bold
+  :color #333 !important
+  time
+    :color #333 !important
 
 .diaspora_header_logo
   :position relative
@@ -267,8 +270,6 @@ header
       :font
         :weight normal
         :size smaller
-      :position absolute
-      :right 20px
 
 .from
   a
@@ -2821,3 +2822,41 @@ h1.tag
       :bottom 4px
   .see_all
     :text-align center
+
+.date
+  :background
+    :color #e6e6e6
+  :border-radius 8px
+  :padding 5px
+  :color #999
+
+  :text-align center
+  .day
+    :font-size 50px
+    :font-weight 200
+    :margin-bottom -15px
+    :margin-top -10px
+
+  .month
+    :font-size 14px
+
+.notification_count
+  :background
+    :color #f0f0f0
+  :color #999
+  :font
+    :weight normal
+
+  :padding 0 5px
+    :left 11px
+  :margin
+    :right 5px
+  :border
+    :radius 5px
+
+  &.unread
+    :background
+      :color lighten(#A40802, 5%)
+    :color #eee !important
+    :font
+      :weight bold

From 2223c562c027f9faa8ea3cad712cdf0a80f5bf9d Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Mon, 18 Apr 2011 11:55:11 -0700
Subject: [PATCH 08/17] first fix of notification page

---
 Gemfile.lock                             | 10 ++++-----
 app/views/notifications/index.html.haml  | 26 +++++++++++++-----------
 public/stylesheets/sass/application.sass |  1 +
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index be65289a9..dd9337d64 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -131,14 +131,14 @@ GEM
       erubis
       extlib
       highline
-      json (>= 1.4.4, <= 1.4.6)
+      json (<= 1.4.6, >= 1.4.4)
       mixlib-authentication (>= 1.1.0)
       mixlib-cli (>= 1.1.0)
       mixlib-config (>= 1.1.2)
       mixlib-log (>= 1.2.0)
       moneta
       ohai (>= 0.5.7)
-      rest-client (>= 1.0.4, < 1.7.0)
+      rest-client (< 1.7.0, >= 1.0.4)
       uuidtools
     childprocess (0.1.7)
       ffi (~> 0.6.3)
@@ -175,7 +175,7 @@ GEM
     faraday (0.5.4)
       addressable (~> 2.2.2)
       multipart-post (~> 1.1.0)
-      rack (>= 1.1.0, < 2)
+      rack (< 2, >= 1.1.0)
     faraday_middleware (0.3.2)
       faraday (~> 0.5.4)
     fastercsv (1.5.4)
@@ -282,7 +282,7 @@ GEM
       multi_json (~> 0.0.4)
     ohai (0.5.8)
       extlib
-      json (>= 1.4.4, <= 1.4.6)
+      json (<= 1.4.6, >= 1.4.4)
       mixlib-cli
       mixlib-config
       mixlib-log
@@ -365,7 +365,7 @@ GEM
     simple_oauth (0.1.4)
     sinatra (1.2.3)
       rack (~> 1.1)
-      tilt (>= 1.2.2, < 2.0)
+      tilt (< 2.0, >= 1.2.2)
     subexec (0.0.4)
     systemu (2.2.0)
     term-ansicolor (1.0.5)
diff --git a/app/views/notifications/index.html.haml b/app/views/notifications/index.html.haml
index f867b9b7a..3e439e086 100644
--- a/app/views/notifications/index.html.haml
+++ b/app/views/notifications/index.html.haml
@@ -11,18 +11,20 @@
 .span-24.last
   .stream.notifications
     - @group_days.each do |day, notes|
-      .span-3
-        .date
-          .day= day.split(' ').last
-          .month= day.split(' ').first
+      .day.span-24.last
+        .span-3
+          .date
+            .day= day.split(' ').last
+            .month= day.split(' ').first
 
-      .span-8.notifications_for_day
-        - notes.each do |note|
-          .stream_element{:data=>{:guid => note.id}, :class => "#{note.unread ? 'unread' : ''}"}
-            %span.from
-              = notification_people_link(note)
-              = object_link(note)
+        .span-8.notifications_for_day
+          - notes.each do |note|
+            .stream_element{:data=>{:guid => note.id}, :class => "#{note.unread ? 'unread' : ''}"}
+              %span.from
+                = notification_people_link(note)
+                = object_link(note)
 
-            %br
-            %time= timeago(note.created_at)
+              %br
+              %time= timeago(note.created_at)
+        .span-13.last
     = will_paginate @notifications
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index e5b061869..4a53df2a1 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -2252,6 +2252,7 @@ h3,h4
       :bottom 0.3em
     :padding 0.2em 0.5em
     :width 500px
+    :min-height 100px
 
 .stream.notifications
   > li:hover

From 1fc01c398073d6d292e2802ae09293d75f520522 Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Mon, 18 Apr 2011 12:19:42 -0700
Subject: [PATCH 09/17] basically fixed

---
 app/views/notifications/index.html.haml  | 2 +-
 public/stylesheets/sass/application.sass | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/views/notifications/index.html.haml b/app/views/notifications/index.html.haml
index 3e439e086..f87962a93 100644
--- a/app/views/notifications/index.html.haml
+++ b/app/views/notifications/index.html.haml
@@ -11,7 +11,7 @@
 .span-24.last
   .stream.notifications
     - @group_days.each do |day, notes|
-      .day.span-24.last
+      .day_group.span-24.last
         .span-3
           .date
             .day= day.split(' ').last
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 4a53df2a1..0efcbf3bc 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -2252,7 +2252,14 @@ h3,h4
       :bottom 0.3em
     :padding 0.2em 0.5em
     :width 500px
-    :min-height 100px
+
+.day_group
+  :min-height 100px
+  :margin
+    :bottom 10px
+  .stream_element
+    &:last-child
+      :border none
 
 .stream.notifications
   > li:hover

From c06b885aa777c38727bba701dd2d877f97bac4b2 Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Tue, 19 Apr 2011 00:27:16 +0200
Subject: [PATCH 10/17] fixed #1027

---
 app/views/people/_person.html.haml       | 3 ++-
 public/stylesheets/sass/application.sass | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/views/people/_person.html.haml b/app/views/people/_person.html.haml
index 2dc6038f3..362c01935 100644
--- a/app/views/people/_person.html.haml
+++ b/app/views/people/_person.html.haml
@@ -5,7 +5,8 @@
 .stream_element{:id => person.id}
   .right
     = render :partial => 'people/relationship_action',
-             :locals => { :person => person, :contact => contact, :request => request}
+             :locals => { :person => person, :contact => contact,
+                          :request => request, :current_user => current_user }
 
   = person_image_link(person)
 
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 0efcbf3bc..76dd26a5d 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -1775,6 +1775,12 @@ ul#request_result
       :bottom 25px
     input.add
       :color green
+  .stream_element
+    .content
+      :display inline
+      :position relative
+      :bottom 2.5em
+      :padding 0
 
 .contact_list,
 .aspect_list

From b3c3c161cef7f8e198b8dbad9c98f17d1778ef51 Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Mon, 18 Apr 2011 17:06:39 -0700
Subject: [PATCH 11/17] fix deprecation warning in jasmine gem in latest
 rubygems

---
 vendor/gems/jasmine/jasmine.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/gems/jasmine/jasmine.gemspec b/vendor/gems/jasmine/jasmine.gemspec
index 5fad38a8a..1bd94cc1a 100644
--- a/vendor/gems/jasmine/jasmine.gemspec
+++ b/vendor/gems/jasmine/jasmine.gemspec
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rajan Agaskar", "Christian Williams", "Davis Frank"]
   s.date = %q{2010-10-05}
-  s.default_executable = %q{jasmine}
+  #s.default_executable = %q{jasmine}
   s.description = %q{Javascript BDD test framework}
   s.email = %q{jasmine-js@googlegroups.com}
   s.executables = ["jasmine"]

From d70ef863370f5838d83a313ad9232210412b6c70 Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Mon, 18 Apr 2011 17:55:17 -0700
Subject: [PATCH 12/17] make the days the right size in notification page

---
 app/views/notifications/index.html.haml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/notifications/index.html.haml b/app/views/notifications/index.html.haml
index f87962a93..8876264ca 100644
--- a/app/views/notifications/index.html.haml
+++ b/app/views/notifications/index.html.haml
@@ -14,8 +14,8 @@
       .day_group.span-24.last
         .span-3
           .date
-            .day= day.split(' ').last
-            .month= day.split(' ').first
+            .day= day.split(' ').first.chop
+            .month= day.split(' ').last
 
         .span-8.notifications_for_day
           - notes.each do |note|

From 14bfdbd4a9424a7ede8770de0db74c4c2d89dd35 Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Mon, 18 Apr 2011 18:11:03 -0700
Subject: [PATCH 13/17] hack to fix the timeago for other languages. ohaibbq
 can you find why this broke in the first place?

---
 public/javascripts/widgets/i18n.js    |  2 +-
 public/javascripts/widgets/timeago.js | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/public/javascripts/widgets/i18n.js b/public/javascripts/widgets/i18n.js
index eac849a5e..b3a259db5 100644
--- a/public/javascripts/widgets/i18n.js
+++ b/public/javascripts/widgets/i18n.js
@@ -29,4 +29,4 @@ Diaspora.widgets.add("i18n", function() {
     
     return ret;
   };
-});
\ No newline at end of file
+});
diff --git a/public/javascripts/widgets/timeago.js b/public/javascripts/widgets/timeago.js
index cc3c4e0d8..cc19dcd07 100644
--- a/public/javascripts/widgets/timeago.js
+++ b/public/javascripts/widgets/timeago.js
@@ -5,8 +5,10 @@
 
 Diaspora.widgets.add("timeago", function() {
   this.selector = "abbr.timeago";
-
+  this.not_done = true; 
   this.start = function() {
+    
+    this.not_done = false;
     InfiniteScroll.postScroll(function(){
       Diaspora.widgets.timeago.updateTimeAgo();
     });
@@ -16,7 +18,7 @@ Diaspora.widgets.add("timeago", function() {
     }
 
     $.each($.timeago.settings.strings, function(index, element) {
-      $.timeago.settings.strings[index] = Diaspora.widgets.i18n.t("timeago." + element);
+      $.timeago.settings.strings[index] = Diaspora.widgets.i18n.t("timeago." + index);
     });
 
 
@@ -24,6 +26,11 @@ Diaspora.widgets.add("timeago", function() {
   };
 
   this.updateTimeAgo = function(selector) {
+
+    if(this.not_done === true){
+      this.not_done = false;
+      Diaspora.widgets.timeago.start();
+    }
     $(selector || this.selector).timeago();
   };
 });

From 62c164e1a4f7ac27db5f9c832e598eaef3e9c1d3 Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Mon, 18 Apr 2011 18:29:55 -0700
Subject: [PATCH 14/17] fixed displays of the days based on locale

---
 app/helpers/notifications_helper.rb     | 8 ++++++++
 app/views/notifications/index.html.haml | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index b60e9a0b0..a49f1578c 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -58,4 +58,12 @@ module NotificationsHelper
   def peoples_names(note)
     note.actors.map{|p| p.name}.join(", ")
   end
+
+  def the_day(i18n)
+    i18n[0].match(/\d/) ? i18n[0].gsub('.', '') : i18n[1].gsub('.', '')
+  end
+
+  def the_month(i18n)
+    i18n[0].match(/\d/) ? i18n[1] : i18n[0]
+  end
 end
diff --git a/app/views/notifications/index.html.haml b/app/views/notifications/index.html.haml
index 8876264ca..9d5faf6cb 100644
--- a/app/views/notifications/index.html.haml
+++ b/app/views/notifications/index.html.haml
@@ -14,8 +14,8 @@
       .day_group.span-24.last
         .span-3
           .date
-            .day= day.split(' ').first.chop
-            .month= day.split(' ').last
+            .day= the_day(day.split(' ')).gsub('.', '')
+            .month= the_month(day.split(' '))
 
         .span-8.notifications_for_day
           - notes.each do |note|

From 9850a3f1241a2681c3d6a348d298d4aaefa3ab0d Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Mon, 18 Apr 2011 18:36:25 -0700
Subject: [PATCH 15/17] change text on manage services popup

---
 app/views/notifications/index.html.haml | 2 +-
 config/locales/diaspora/en.yml          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/notifications/index.html.haml b/app/views/notifications/index.html.haml
index 9d5faf6cb..67d99a426 100644
--- a/app/views/notifications/index.html.haml
+++ b/app/views/notifications/index.html.haml
@@ -14,7 +14,7 @@
       .day_group.span-24.last
         .span-3
           .date
-            .day= the_day(day.split(' ')).gsub('.', '')
+            .day= the_day(day.split(' '))
             .month= the_month(day.split(' '))
 
         .span-8.notifications_for_day
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 14c85ddd6..f704fef00 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -559,7 +559,7 @@ en:
     reshare:
       reshare: "Reshare"
     public_explain:
-      title: "You are about to post a public message!"
+      title: "Set up connected services"
       outside: "Public messages will be available for others outside of Diaspora to see."
       logged_in: "logged in to %{service}"
       manage: "manage connected services"

From 1813b248c6230847d61494decc14432a33e104c9 Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Wed, 20 Apr 2011 01:04:33 +0200
Subject: [PATCH 16/17] updated locales

---
 config/locales/devise/devise.bg.yml         |   4 +-
 config/locales/diaspora/bg.yml              | 472 ++++++++++----------
 config/locales/diaspora/de.yml              |   2 +-
 config/locales/diaspora/el.yml              |   2 +-
 config/locales/diaspora/es.yml              |   2 +-
 config/locales/diaspora/it.yml              |   2 +-
 config/locales/javascript/javascript.bg.yml |  33 ++
 config/locales/rails-i18n/es-CL.yml         |   2 +-
 config/locales/rails-i18n/es.yml            |   2 +-
 config/locales/rails-i18n/pl.yml            |   5 +-
 10 files changed, 280 insertions(+), 246 deletions(-)
 create mode 100644 config/locales/javascript/javascript.bg.yml

diff --git a/config/locales/devise/devise.bg.yml b/config/locales/devise/devise.bg.yml
index 523bd0ab6..6d43de735 100644
--- a/config/locales/devise/devise.bg.yml
+++ b/config/locales/devise/devise.bg.yml
@@ -41,7 +41,7 @@ bg:
         change: "Промяна на паролата"
         ignore: "Ако не сте заявили промяната, моля игнорирайте писмото."
         someone_requested: "Някой е заявил връзка за промяна на паролата. Можете да я промените чрез връзката по-долу."
-        subject: "Reset password instructions"
+        subject: "Инструкции за възстановяване на паролата"
         wont_change: "Паролата ви няма да бъде променена докато не посетите връзката по-горе и не зададете нова."
       unlock_instructions: 
         account_locked: "Акаунтът ви е заключен поради голям брой неуспешни опити за вписване."
@@ -64,7 +64,7 @@ bg:
       updated: "Обновихте успешно акаунта си."
     sessions: 
       new: 
-        alpha_software: "You are about to use alpha software."
+        alpha_software: "Ще ползвате софтуерен продукт в ранен етап на развитие."
         bugs_and_feedback: "Имайте предвид, че ще се сблъскате със софтуерни грешки.  Препоръчваме ви да ползвате бутона Feedback (в десния край на страницата) за да съобщавате за всеки проблем!  Ще се потрудим да отстраним всеки проблем, за който ни съобщите, възможно най-бързо."
         bugs_and_feedback_mobile: "Имайте предвид, че ще се сблъскате със софтуерни грешки. Препоръчваме ви да съобщавате за всеки проблем! Ще се потрудим да отстраним всеки проблем, за който ни съобщите, възможно най-бързо."
         login: "Вписване"
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index a281d30fe..ab0423c03 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -7,7 +7,7 @@ bg:
   _comments: "Коментари"
   _home: "Home"
   _photos: "снимки"
-  _services: "Services"
+  _services: "Услуги"
   account: "Акаунт"
   activerecord: 
     errors: 
@@ -19,7 +19,7 @@ bg:
         person: 
           attributes: 
             diaspora_handle: 
-              taken: "is already taken."
+              taken: "вече е зает."
         request: 
           attributes: 
             from_id: 
@@ -47,10 +47,10 @@ bg:
       success: "Successfully removed person from aspect"
   aspects: 
     add_to_aspect: 
-      failure: "Failed to add contact to aspect."
-      success: "Successfully added contact to aspect."
+      failure: "Контактът не бе добавен към аспекта."
+      success: "Контактът е добавен към аспекта."
     aspect_contacts: 
-      done_editing: "done editing"
+      done_editing: "готово"
     aspect_stream: 
       activity: "активност"
       post_time: "ред на публикуване"
@@ -69,7 +69,7 @@ bg:
       aspect_list_is_visible: "aspect list is visible to others in aspect"
       confirm_remove_aspect: "Наистина ли желаете да бъде премахнат аспектът?"
       done: "Готово"
-      make_aspect_list_visible: "make aspect list visible?"
+      make_aspect_list_visible: "нека аспектът бъде видим"
       remove_aspect: "Изтриване на аспекта"
       rename: "преименуване"
       update: "update"
@@ -80,13 +80,13 @@ bg:
       aspect_not_empty: "Аспектът не е празен"
       remove: "премахване"
     index: 
-      handle_explanation: "This is your diaspora handle. Like an email address, you can give this to people to reach you."
+      handle_explanation: "Това е вашият адрес в Diaspora. Наподобява адрес на ел. поща - давате го на хора, за да се свържат с вас."
       no_contacts: "Няма контакти"
       post_a_message: "публикуване на съобщение >>"
     manage: 
       add_a_new_aspect: "Добавяне на аспект"
       add_a_new_contact: "Добавяне на контакт"
-      drag_to_add: "Влачете за да довабите хора"
+      drag_to_add: "Влачете за да добавите хора"
       manage_aspects: "Управление на аспектите"
       no_requests: "No new requests"
       requests: "Requests"
@@ -99,25 +99,25 @@ bg:
       create: "Създаване"
       name: "Име"
     no_posts_message: 
-      start_talking: "Nobody has said anything yet.  Get the conversation started!"
+      start_talking: "Няма публикации. Бъдете първи!"
     one: "1 аспект"
     other: "%{count} аспекта"
     seed: 
-      family: "Family"
-      work: "Work"
+      family: "Семейство"
+      work: "Работа"
     show: 
-      edit_aspect: "edit aspect"
+      edit_aspect: "редактиране на аспекта"
     update: 
-      failure: "Your aspect, %{name}, had too long name to be saved."
-      success: "Your aspect, %{name}, has been successfully edited."
-    zero: "no aspects"
-  back: "Back"
+      failure: "Аспектът %{name} има твърде дълго име. Не може да бъде запаметен."
+      success: "Аспектът %{name} е успешно редактиран."
+    zero: "няма аспекти"
+  back: "Назад"
   bookmarklet: 
-    explanation: "%{link} from anywhere by bookmarking this link."
-    explanation_link_text: "Post to Diaspora"
-    post_something: "Post something to Diaspora"
-    post_success: "Posted! Closing!"
-  cancel: "Cancel"
+    explanation: "%{link} от където и да е, запаметявайки връзката като отметка."
+    explanation_link_text: "Публикуване в Diaspora"
+    post_something: "Публикувайте нещо в Diaspora"
+    post_success: "Публикувано!"
+  cancel: "Отказ"
   comments: 
     few: "%{count} коментара"
     many: "%{count} коментара"
@@ -138,49 +138,49 @@ bg:
     one: "1 контакт"
     other: "%{count} контакта"
     share_with_pane: 
-      accepts: "Once %{name} accepts, you'll start seeing each other's posts on Diaspora"
-      add_new_aspect: "add to new aspect"
-      share_with: "Start sharing with %{name}"
-    zero: "no contacts"
+      accepts: "Щом %{name} приеме ще можете да следите публикациите си в Diaspora"
+      add_new_aspect: "добавяне на нов аспект"
+      share_with: "Започнете да споделяте с %{name}"
+    zero: "няма контакти"
   conversations: 
     create: 
-      sent: "Message sent"
+      sent: "Съобщението е изпратено"
     destroy: 
-      success: "Conversation successfully removed"
+      success: "Разговорът е премахнат успешно"
     helper: 
       new_messages: 
-        few: "%{count} new messages"
-        many: "%{count} new messages"
-        one: "1 new messages"
-        other: "%{count} new messages"
-        zero: "no new messages"
+        few: "%{count} нови съобщения"
+        many: "%{count} нови съобщения"
+        one: "1 ново съобщение"
+        other: "%{count} нови съобщения"
+        zero: "няма нови съобщения"
     index: 
-      create_a_new_message: "create a new message"
-      inbox: "Inbox"
-      message_inbox: "Message Inbox"
-      new_message: "New Message"
-      no_conversation_selected: "no conversation selected"
-      no_messages: "no messages"
+      create_a_new_message: "създаване на съобщение"
+      inbox: "Входящи"
+      message_inbox: "Входяща кутия"
+      new_message: "Ново съобщение"
+      no_conversation_selected: "няма избран разговор"
+      no_messages: "няма съобщения"
     new: 
-      send: "Send"
-      subject: "subject"
-      to: "to"
+      send: "Изпращане"
+      subject: "тема"
+      to: "до"
     show: 
-      delete: "delete and block conversation"
-      reply: "reply"
+      delete: "изтриване и блокиране"
+      reply: "отговор"
   date: 
     formats: 
       birthday: "%B %d"
       birthday_with_year: "%B %d %Y"
       fullmonth_day: "%B %d"
-  delete: "Delete"
-  email: "Email"
+  delete: "Изтриване"
+  email: "Ел. поща"
   error_messages: 
     helper: 
-      correct_the_following_errors_and_try_again: "Correct the following errors and try again."
-      invalid_fields: "Invalid Fields"
+      correct_the_following_errors_and_try_again: "Поправете следните грешки и опитайте отново."
+      invalid_fields: "Невалидни полета"
   fill_me_out: "Fill me out"
-  hide: "Hide"
+  hide: "Скриване"
   home: 
     show: 
       already_account: "already have an account?"
@@ -193,45 +193,45 @@ bg:
       share_what_you_want: "Share what you want, with whom you want."
       simplicity: "Simplicity"
       simplicity_explanation: "Diaspora makes sharing clean and easy – and this goes for privacy too. Inherently private, Diaspora doesn’t make you wade through pages of settings and options just to keep your profile secure."
-      tagline_first_half: "Share what you want,"
-      tagline_second_half: "with whom you want."
+      tagline_first_half: "Споделете каквото желаете,"
+      tagline_second_half: "с когото пожелаете."
   invitations: 
     check_token: 
       not_found: "Invitation token not found"
     create: 
       already_contacts: "You are already connected with this person"
       already_sent: "You already invited this person."
-      no_more: "You have no more invitations."
+      no_more: "Не разполагате с повече покани."
       rejected: "The following email addresses had problems: "
-      sent: "Invitations have been sent to: "
+      sent: "Покани са изпратени до: "
     edit: 
       sign_up: "sign_up"
     new: 
-      already_invited: "Already invited"
-      aspect: "Aspect"
-      comma_seperated_plz: "You can enter multiple email addresses separated by commas."
+      already_invited: "Вече е поканен"
+      aspect: "Аспект"
+      comma_seperated_plz: "Можете да въведете повече от една ел. поща като ги разделяте със запетаи."
       if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
-      invite_someone_to_join: "Invite someone to join Diaspora!"
-      personal_message: "Personal message"
-      resend: "Resend"
-      send_an_invitation: "Send an invitation"
+      invite_someone_to_join: "Поканете някой в Diaspora!"
+      personal_message: "Лично съобщение"
+      resend: "Повторно изпращане"
+      send_an_invitation: "Изпращане на поканата"
       send_invitation: "Send invitation"
-      to: "To"
+      to: "До"
   layouts: 
     application: 
-      have_a_problem: "Have a problem? Find an answer here"
+      have_a_problem: "Имате проблем? Открийте решението тук"
       powered_by: "POWERED BY DIASPORA*"
       public_feed: "Public Diaspora Feed for %{name}"
       toggle: "toggle mobile site"
-      whats_new: "what's new?"
-      your_aspects: "your aspects"
+      whats_new: "какво ново?"
+      your_aspects: "вашите аспекти"
     header: 
-      blog: "blog"
-      code: "code"
-      login: "login"
-      logout: "logout"
-      profile: "profile"
-      settings: "settings"
+      blog: "блог"
+      code: "код"
+      login: "вписване"
+      logout: "отписване"
+      profile: "профил"
+      settings: "настройки"
   likes: 
     likes: 
       people_dislike_this: 
@@ -248,7 +248,7 @@ bg:
         zero: "no people liked this"
   more: "More"
   next: "next"
-  no_results: "No Results Found"
+  no_results: "Няма намерени резултати"
   notifications: 
     also_commented: "also commented on %{post_author}'s"
     also_commented_deleted: "commented on a deleted post"
@@ -256,21 +256,21 @@ bg:
     deleted: "deleted"
     helper: 
       new_notifications: 
-        few: "%{count} new notifications"
-        many: "%{count} new notifications"
-        one: "1 new notifications"
-        other: "%{count} new notifications"
-        zero: "no new notifications"
+        few: "%{count} нови известия"
+        many: "%{count} нови известия"
+        one: "1 ново известие"
+        other: "%{count} нови известия"
+        zero: "няма нови известия"
     index: 
-      and: "and"
-      and_others: "and %{number} others"
-      mark_all_as_read: "Mark All as Read"
-      notifications: "Notifications"
-    mentioned: "has mentioned you in a post"
-    new_request: "offered to share with you."
-    post: "post"
-    private_message: "sent you a message."
-    request_accepted: "accepted your share request."
+      and: "и"
+      and_others: "и %{number} други"
+      mark_all_as_read: "Маркиране на всички като прочетени"
+      notifications: "Известия"
+    mentioned: "ви спомена в публикация"
+    new_request: "ви предложи да споделяте."
+    post: "публикация"
+    private_message: "ви изпрати съобщение."
+    request_accepted: "прие поканата ви за споделяне."
   notifier: 
     also_commented: 
       commented: "has also commented on %{post_author}'s post:"
@@ -279,9 +279,9 @@ bg:
     comment_on_post: 
       commented: "has commented on your post:"
       sign_in: "Sign in to view it."
-      subject: "%{name} has commented on your post."
+      subject: "%{name} коментира ваша публикация."
     diaspora: "the diaspora email robot"
-    hello: "Hello %{name}!"
+    hello: "Здравейте %{name}!"
     love: "love,"
     manage_your_email_settings: "manage your email settings"
     mentioned: 
@@ -290,26 +290,26 @@ bg:
       subject: "%{name} has mentioned you on Diaspora*"
     new_request: 
       just_sent_you: "just sent you a contact request on Diaspora*"
-      sign_in: "Sign in here"
+      sign_in: "Впишете се тук"
       subject: "new Diaspora* contact request from %{from}"
       try_it_out: "You should really think about checking it out."
     private_message: 
-      message_subject: "Subject: %{subject}"
-      private_message: "has sent you a private message:"
+      message_subject: "Тема: %{subject}"
+      private_message: "ви изпрати лично съобщение:"
       sign_in: "Sign in to view it."
-      subject: "%{name} has sent you a private message on Diaspora*"
+      subject: "%{name} ви изпрати лично съобщени в Diaspora*"
     request_accepted: 
       accepted: "has accepted your contact request!"
-      sign_in: "Sign in here"
+      sign_in: "Впишете се тук"
       subject: "%{name} has accepted your contact request on Diaspora*"
     single_admin: 
       admin: "Your Diaspora administrator"
-      subject: "A message about your Diaspora account:"
+      subject: "Съобщение относно акаунта ви в Diaspora:"
     thanks: "Thanks,"
-  ok: "OK"
-  or: "or"
-  password: "Password"
-  password_confirmation: "Password confirmation"
+  ok: "Добре"
+  or: "или"
+  password: "Парола"
+  password_confirmation: "Потвърждаване на паролата"
   people: 
     add_contact_small: 
       add_contact_from_tag: "add contact from tag"
@@ -318,48 +318,48 @@ bg:
     few: "%{count} people"
     helper: 
       people_on_pod_are_aware_of: " people on pod are aware of"
-      results_for: " results for %{params}"
+      results_for: " резултата за %{params}"
     index: 
-      couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
-      no_one_found: "...and no one was found."
+      couldnt_find_them_send_invite: "Не можете да ги намерите?  Пратете им покана!"
+      no_one_found: "...и никой не е намерен."
       no_results: "Hey! You need to search for something."
-      results_for: "search results for"
+      results_for: "резултат от търсенето за"
     many: "%{count} people"
     one: "1 person"
     other: "%{count} people"
     person: 
-      add_contact: "add contact"
+      add_contact: "добавяне на контакт"
       already_connected: "Already connected"
       pending_request: "Pending request"
-      thats_you: "That's you!"
+      thats_you: "Това сте вие!"
     profile_sidebar: 
-      bio: "bio"
-      born: "birthday"
+      bio: "биографични данни"
+      born: "рожден ден"
       cannot_remove: "Cannot remove %{name} from last aspect. (If you want to disconnect from this person you must remove contact.)"
-      edit_my_profile: "Edit my profile"
-      gender: "gender"
+      edit_my_profile: "Редактирайте профилът си"
+      gender: "пол"
       in_aspects: "in aspects"
-      location: "location"
-      remove_contact: "remove contact"
-      remove_from: "Remove %{name} from %{aspect}?"
+      location: "местоположние"
+      remove_contact: "премахване на контакт"
+      remove_from: "Премахване на %{name} от %{aspect}?"
     show: 
       add_some: "add some"
       does_not_exist: "Person does not exist!"
       edit: "edit"
       incoming_request: "%{name} wants to share with you"
       mention: "Mention"
-      message: "Message"
-      no_posts: "no posts to display!"
+      message: "Съобщение"
+      no_posts: "няма публикации за изобразяване!"
       not_connected: "You are not sharing with this person"
-      recent_posts: "Recent Posts"
-      recent_public_posts: "Recent Public Posts"
+      recent_posts: "Скорошни публикации"
+      recent_public_posts: "Скорошни публични публикации"
       return_to_aspects: "Return to your aspects page"
-      see_all: "See all"
-      start_sharing: "start sharing"
+      see_all: "Вижте всички"
+      start_sharing: "започнете да споделяте"
       to_accept_or_ignore: "to accept or ignore it."
       you_have_no_tags: "you have no tags!"
     webfinger: 
-      fail: "Sorry, we couldn't find %{handle}."
+      fail: "За съжаление %{handle} не може да бъде намерен."
     zero: "no people"
   photos: 
     create: 
@@ -367,88 +367,88 @@ bg:
       runtime_error: "Photo upload failed.  Are you sure that your seatbelt is fastened?"
       type_error: "Photo upload failed.  Are you sure an image was added?"
     destroy: 
-      notice: "Photo deleted."
+      notice: "Снимката е изтрита."
     edit: 
-      editing: "Editing"
+      editing: "Редактиране"
     new: 
-      back_to_list: "Back to List"
-      new_photo: "New Photo"
+      back_to_list: "Назад към списъка"
+      new_photo: "Нова снимка"
       post_it: "post it!"
     new_photo: 
-      empty: "{file} is empty, please select files again without it."
-      invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
-      size_error: "{file} is too large, maximum file size is {sizeLimit}."
+      empty: "{file} е празен. Моля, изберете наново файловете без празния."
+      invalid_ext: "{file} е с невалидно разширение. Позволени са само: {extensions}."
+      size_error: "{file} е твърде голям. Максималният разрешен размер е {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "or select one from your already existing"
-      upload: "Upload a new profile photo!"
+      or_select_one: "или изберете една от вашите (вече качени)"
+      upload: "Качете нова снимка за профила!"
     photo: 
-      view_all: "view all of %{name}'s photos"
+      view_all: "всички снимки на %{name}"
     show: 
       collection_permalink: "collection permalink"
       delete_photo: "Delete Photo"
-      edit: "edit"
+      edit: "редактиране"
       edit_delete_photo: "Edit photo description / delete photo"
       make_profile_photo: "make profile photo"
-      original_post: "Original Post"
+      original_post: "Оригинална публикация"
       permalink: "permalink"
       update_photo: "Update Photo"
       view: "view"
     update: 
-      error: "Failed to edit photo."
+      error: "Снимката не бе изтрита."
       notice: "Photo successfully updated."
   post_visibilites: 
     update: 
       post_hidden: "%{name}'s post has been hidden."
   posts: 
-    doesnt_exist: "that post does not exist!"
+    doesnt_exist: "публикацията не съществува!"
   previous: "previous"
-  profile: "Profile"
+  profile: "Профил"
   profiles: 
     edit: 
-      allow_search: "Allow for people to search for you within Diaspora"
-      edit_profile: "Edit profile"
-      first_name: "First name"
-      last_name: "Last name"
-      update_profile: "Update Profile"
-      your_bio: "Your bio"
-      your_birthday: "Your birthday"
-      your_gender: "Your gender"
-      your_location: "Your location"
-      your_name: "Your name"
-      your_photo: "Your photo"
-      your_private_profile: "Your private profile"
-      your_public_profile: "Your public profile"
-      your_tags: "You: in 5 #tags"
-      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
+      allow_search: "Разрешете търсенето в Diaspora за вас"
+      edit_profile: "Редактиране на профила"
+      first_name: "Собствено име"
+      last_name: "Фамилно име"
+      update_profile: "Обновяване на профила"
+      your_bio: "Биографични данни"
+      your_birthday: "Дата на раждане"
+      your_gender: "Пол"
+      your_location: "Местоположение"
+      your_name: "Име"
+      your_photo: "Снимка"
+      your_private_profile: "Вашият личен профил"
+      your_public_profile: "Вашият публичен профил"
+      your_tags: "Опишете се с до 5 #марки"
+      your_tags_placeholder: "например: #България #diaspora #фитнес #music"
     update: 
       failed: "Failed to update profile"
       updated: "Profile updated"
   registrations: 
     closed: "Signups are closed on this Diaspora pod."
     create: 
-      success: "You've joined Diaspora!"
+      success: "Вие се присъединихте към Diaspora!"
     edit: 
       cancel_my_account: "Cancel my account"
       edit: "Edit %{name}"
-      leave_blank: "(leave blank if you don't want to change it)"
+      leave_blank: "(оставете празно ако не желаете да го променяте)"
       password_to_confirm: "(we need your current password to confirm your changes)"
       unhappy: "Unhappy?"
       update: "Update"
     new: 
-      enter_email: "Enter an e-mail"
-      enter_password: "Enter a password"
-      enter_password_again: "Enter the same password as before"
-      enter_username: "Pick a username (only letters, numbers, and underscores)"
-      sign_up: "Sign up"
-      sign_up_for_diaspora: "Sign up for Diaspora"
+      enter_email: "Въведете ел. поща"
+      enter_password: "Въведете парола"
+      enter_password_again: "Въведете отново същата парола"
+      enter_username: "Изберете си потребителско име (само букви, цифри и долна черта)"
+      sign_up: "Регистриране"
+      sign_up_for_diaspora: "Регистрирайте се в Diaspora"
   requests: 
     create: 
-      sending: "Sending"
+      sending: "Изпращане"
       sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
     destroy: 
-      error: "Please select an aspect!"
+      error: "Моля, изберете аспект!"
       ignore: "Ignored contact request."
-      success: "You are now sharing."
+      success: "Сега споделяте."
     helper: 
       new_requests: 
         few: "%{count} new requests!"
@@ -457,83 +457,83 @@ bg:
         other: "%{count} new requests!"
         zero: "no new requests"
     manage_aspect_contacts: 
-      existing: "Existing contacts"
+      existing: "Съществуващи контакти"
       manage_within: "Manage contacts within"
     new_request_to_person: 
       sent: "sent!"
-  search: "Search"
+  search: "Търсене"
   services: 
     create: 
-      success: "Authentication successful."
+      success: "Удостоверяването приключи успешно."
     destroy: 
-      success: "Successfully deleted authentication."
+      success: "Удостоверението е изтрито успешно."
     failure: 
-      error: "there was an error connecting that service"
+      error: "възникна грешка при свързването с услугата"
     finder: 
       friends: 
-        few: "%{count} friends"
-        many: "%{count} friends"
-        one: "1 friend"
+        few: "%{count} приятеля"
+        many: "%{count} приятеля"
+        one: "1 приятел"
         other: "%{count} friends"
-        zero: "no friends"
-      invite_your_friends_from: "Invite your friends from %{service}"
+        zero: "няма приятели"
+      invite_your_friends_from: "Поканете приятелите си от %{service}"
       not_connected: "not connected"
     index: 
-      connect_to_facebook: "Connect to facebook"
-      connect_to_twitter: "Connect to twitter"
-      disconnect: "disconnect"
-      edit_services: "Edit services"
-      logged_in_as: "logged in as"
-      really_disconnect: "disconnect %{service}?"
+      connect_to_facebook: "Свързване с facebook"
+      connect_to_twitter: "Свързване с twitter"
+      disconnect: "изключване"
+      edit_services: "Редактиране на услугите"
+      logged_in_as: "вписани сте като"
+      really_disconnect: "изключване на свързаността с %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Click this link to accept your invitation"
       join_me_on_diaspora: "Join me on DIASPORA*"
     remote_friend: 
       invite: "invite"
       resend: "resend"
-  settings: "Settings"
+  settings: "Настройки"
   shared: 
     add_contact: 
-      create_request: "Find by Diaspora handle"
+      create_request: "Търси по Diaspora адрес"
       diaspora_handle: "diaspora@handle.org"
-      enter_a_diaspora_username: "Enter a Diaspora username:"
+      enter_a_diaspora_username: "Въведете потребителско име от Diaspora:"
       know_email: "Know their email address? You should invite them"
-      your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
+      your_diaspora_username_is: "Вашето потребителско име в Diaspora е %{diaspora_handle}"
     contact_list: 
-      all_contacts: "All contacts"
+      all_contacts: "Всички контакти"
       cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
     footer: 
-      logged_in_as: "logged in as %{name}"
-      your_aspects: "your aspects"
+      logged_in_as: "вписани сте като %{name}"
+      your_aspects: "вашите аспекти"
     invitations: 
-      by_email: "by Email"
-      dont_have_now: "You don't have any right now, but more invites are coming soon!"
-      from_facebook: "From Facebook"
-      invitations_left: "(%{count} left)"
-      invite_someone: "Invite someone"
-      invite_your_friends: "Find your friends"
-      invites: "Invites"
+      by_email: "по ел. поща"
+      dont_have_now: "За момента не разполагате с покани, но скоро ще имате!"
+      from_facebook: "От Facebook"
+      invitations_left: "(остават още %{count})"
+      invite_someone: "Поканете някого"
+      invite_your_friends: "Намерете приятелите си"
+      invites: "Покани"
       invites_closed: "Invites are currently closed on this Diaspora pod"
     notification: 
       new: "New %{type} from %{from}"
     public_explain: 
-      logged_in: "logged in to %{service}"
-      manage: "manage connected services"
+      logged_in: "вписани сте в %{service}"
+      manage: "управление на свързаните услуги"
       outside: "Public messages will be available for others outside of Diaspora to see."
-      title: "You are about to post a public message!"
+      title: "Настройте свързване с услуга"
     publisher: 
       add_photos: "add photos"
       all: "all"
-      all_contacts: "all contacts"
-      click_to_share_with: "Click to share with: "
-      make_public: "make public"
-      post_a_message_to: "Post a message to %{aspect}"
-      posting: "Posting..."
+      all_contacts: "всички контакти"
+      click_to_share_with: "Кликнете, за да споделите с: "
+      make_public: "направете публично"
+      post_a_message_to: "Публикувайте публично съобяение в %{aspect}"
+      posting: "Публикуване..."
       public: "Public"
       publishing_to: "publishing to: "
       share: "Share"
       share_with: "share with"
-      whats_on_your_mind: "what's on your mind?"
+      whats_on_your_mind: "какво мислите?"
     reshare: 
       reshare: "Reshare"
     stream_element: 
@@ -543,72 +543,72 @@ bg:
     create: 
       success: "Successfully mentioned: %{names}"
     destroy: 
-      failure: "Failed to delete post"
+      failure: "Публикацията не бе изтрита"
     helper: 
-      no_message_to_display: "No message to display."
+      no_message_to_display: "Няма съобщение за изобразяване."
     new: 
       mentioning: "Mentioning: %{person}"
     show: 
-      destroy: "Delete"
-      not_found: "Sorry, we couldn't find that post."
+      destroy: "Изтриване"
+      not_found: "За съжаление публикацията не може да бъде намерена."
       permalink: "permalink"
   stream_helper: 
-    hide_comments: "hide comments"
-    show_comments: "show all comments"
+    hide_comments: "скриване на коментарите"
+    show_comments: "всички коментари"
   tags: 
     show: 
-      nobody_talking: "Nobody is talking about %{tag} yet."
-      people_tagged_with: "People tagged with %{tag}"
-      posts_tagged_with: "Posts tagged with #%{tag}"
+      nobody_talking: "Никой не е говорил за %{tag}."
+      people_tagged_with: "Хора маркирани с %{tag}"
+      posts_tagged_with: "Публикации с марка #%{tag}"
   the_world: "the world"
   undo: "Undo?"
-  username: "Username"
+  username: "Потребителско име"
   users: 
-    destroy: "Account successfully closed."
+    destroy: "Акаунтът е затворен успешно."
     edit: 
-      also_commented: "...someone also comments on your contact's post?"
-      change: "Change"
-      change_language: "Change Language"
-      change_password: "Change Password"
-      close_account: "Close Account"
-      comment_on_post: "...someone comments on your post?"
-      current_password: "Current password"
-      download_photos: "download my photos"
-      download_xml: "download my xml"
-      edit_account: "Edit account"
-      export_data: "Export Data"
-      mentioned: "...you are mentioned in a post?"
-      new_password: "New Password"
-      private_message: "...you receive a private message?"
-      receive_email_notifications: "Receive email notifications when..."
-      request_acceptence: "...your share request is accepted?"
-      request_received: "...you receive a new share request?"
-      your_email: "Your email"
-      your_handle: "Your diaspora handle"
+      also_commented: "...някой коментира публикация на ваш контакт?"
+      change: "Промяна"
+      change_language: "Промяна на езика"
+      change_password: "Промяна на паролата"
+      close_account: "Затваряне на акаунта"
+      comment_on_post: "...някой коментира ваша публикация?"
+      current_password: "Текуща парола"
+      download_photos: "снимките ви"
+      download_xml: "данните ви (XML формат)"
+      edit_account: "Редактиране на акаунта"
+      export_data: "Сваляне на..."
+      mentioned: "...бъдете споменат в публикация?"
+      new_password: "Нова парола"
+      private_message: "...получите лично съобщение?"
+      receive_email_notifications: "Получаване на известие по ел. поща когато..."
+      request_acceptence: "...бъде приета отправена от вас покана за споделяне?"
+      request_received: "...получите покана за споделяне?"
+      your_email: "Вашата ел. поща"
+      your_handle: "Вашият адрес в Diaspora"
     getting_started: 
       connect_on_diaspora: "Connect on Diaspora"
-      connect_services: "Connect your other services"
+      connect_services: "Свързване към други услуги"
       could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
       edit_profile: "Edit your profile"
-      finished: "Finished!"
-      save_and_continue: "Save and continue"
+      finished: "Готово!"
+      save_and_continue: "Запиши и продължи"
       signup_steps: "Finish your sign up by completing these three steps:"
       skip: "skip getting started"
       step_2: 
-        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        find_your_friends_on_diaspora: "Желаете ли да намерите приятелите си от Facebook в Diaspora?"
         skip: "Skip"
       step_3: 
         finish: "Finish"
-        people_already_on_diaspora: "People already on Diaspora"
-      welcome: "Welcome to Diaspora!"
+        people_already_on_diaspora: "Хора, които вече са в Diaspora"
+      welcome: "Добре дошли в Diaspora!"
     public: 
-      does_not_exist: "User %{username} does not exist!"
+      does_not_exist: "Потребителят %{username} не съществува!"
     update: 
       email_notifications_changed: "Email notifications changed"
       language_changed: "Language Changed"
-      language_not_changed: "Language Change Failed"
-      password_changed: "Password Changed"
-      password_not_changed: "Password Change Failed"
+      language_not_changed: "Езикът не бе променен"
+      password_changed: "Паролата е променена"
+      password_not_changed: "Паролата не бе променена"
   webfinger: 
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for %{account}"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 17ba80793..70d58fe44 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -520,7 +520,7 @@ de:
       logged_in: "Eingeloggt in %{service}"
       manage: "verbundene Dienste verwalten"
       outside: "Öffentliche Nachrichten sind für andere außerhalb von Diaspora sichtbar."
-      title: "Du bist dabei, eine öffentliche Nachricht zu posten!"
+      title: "Verbundene Dienste verwalten"
     publisher: 
       add_photos: "Fotos hinzufügen"
       all: "alle"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index 6d0dbfc54..4878856cb 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -343,7 +343,7 @@ el:
       remove_contact: "αφαίρεση επαφής"
       remove_from: "Αφαίρεση του χρήστη %{name} από τη πτυχή %{aspect}?"
     show: 
-      add_some: "προσθέστε κάποιον"
+      add_some: "προσθέστε κάποιες"
       does_not_exist: "Ο/Η χρήστης δεν υπάρχει!"
       edit: "επεξεργασία"
       incoming_request: "Ο/Η %{name} θέλει να μοιραστεί μαζί σας"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 49c204a7d..b8ebd10e5 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -533,7 +533,7 @@ es:
       publishing_to: "publicar en: "
       share: "Compartir"
       share_with: "compartir con"
-      whats_on_your_mind: "¿Qué tienes en mente?"
+      whats_on_your_mind: "...y qué te cuentas?"
     reshare: 
       reshare: "Publicar en..."
     stream_element: 
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 6f9dce08d..e861fb5f7 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -520,7 +520,7 @@ it:
       logged_in: "accesso effettuato a %{service}"
       manage: "gestisci i servizi collegati"
       outside: "I messaggi pubblici saranno visibili a persone al di fuori di Diaspora."
-      title: "Stai per inviare un messaggio pubblico!"
+      title: "Configura i servizi collegati"
     publisher: 
       add_photos: "aggiungi foto"
       all: "tutti"
diff --git a/config/locales/javascript/javascript.bg.yml b/config/locales/javascript/javascript.bg.yml
new file mode 100644
index 000000000..004d1af45
--- /dev/null
+++ b/config/locales/javascript/javascript.bg.yml
@@ -0,0 +1,33 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+bg: 
+  javascripts: 
+    confirm_dialog: "Сигурни ли сте?"
+    publisher: 
+      at_least_one_aspect: "Трябва да публикувате в поне един аспект"
+    search_for: "Търсене за {{name}}"
+    shared: 
+      contact_list: 
+        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
+    timeago: 
+      day: "ден"
+      days: "%d дни"
+      hour: "около час"
+      hours: "около %d часа"
+      minute: "около минута"
+      minutes: "%d минути"
+      month: "около месец"
+      months: "%d месеца"
+      prefixAgo: "преди"
+      prefixFromNow: ""
+      seconds: "по-малко от минута"
+      suffixAgo: "преди"
+      suffixFromNow: "от сега"
+      year: "около година"
+      years: "%d години"
+    videos: 
+      unknown: "Неизвестен вид видео"
+      watch: "Гледайте видеото в {{provider}}"
diff --git a/config/locales/rails-i18n/es-CL.yml b/config/locales/rails-i18n/es-CL.yml
index 6c8fd25b5..1cfc207bc 100644
--- a/config/locales/rails-i18n/es-CL.yml
+++ b/config/locales/rails-i18n/es-CL.yml
@@ -137,7 +137,7 @@ es-CL:
       prompt: "Por favor seleccione"
 
     submit:
-      create: 'Guardar %{model}'
+      create: 'Crear %{model}'
       update: 'Actualizar %{model}'
       submit: 'Guardar %{model}'
 
diff --git a/config/locales/rails-i18n/es.yml b/config/locales/rails-i18n/es.yml
index c65ea7bd7..970975d90 100644
--- a/config/locales/rails-i18n/es.yml
+++ b/config/locales/rails-i18n/es.yml
@@ -138,7 +138,7 @@
       prompt: "Por favor seleccione"
 
     submit:
-      create: 'Guardar %{model}'
+      create: 'Crear %{model}'
       update: 'Actualizar %{model}'
       submit: 'Guardar %{model}'
 
diff --git a/config/locales/rails-i18n/pl.yml b/config/locales/rails-i18n/pl.yml
index f91081f67..55eceb57b 100644
--- a/config/locales/rails-i18n/pl.yml
+++ b/config/locales/rails-i18n/pl.yml
@@ -1,6 +1,7 @@
 # Polish translations for Ruby on Rails
 # by Jacek Becela (jacek.becela@gmail.com, http://github.com/ncr)
 # Minor changes and adjustments for Rails 3 by Piotrek Okoński (http://github.com/pokonski)
+# Minor changes and adjustments by Paweł Chojnacki (https://github.com/chojnacki)
 
 pl:
   date:
@@ -85,8 +86,8 @@ pl:
           thousand: Tysiąc
           million: Milion
           billion: Miliard
-          trillion: Trylion
-          quadrillion: Kwadrylion
+          trillion: Bilion
+          quadrillion: Biliard
 
   datetime:
     distance_in_words:

From 931b85fe62b037208df05618514702e9c7b91f95 Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Wed, 20 Apr 2011 01:05:57 +0200
Subject: [PATCH 17/17] added bulgarian

---
 config/locale_settings.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/locale_settings.yml b/config/locale_settings.yml
index 60fe3c7b9..6b8177841 100644
--- a/config/locale_settings.yml
+++ b/config/locale_settings.yml
@@ -1,5 +1,6 @@
 default: "en"
 available:
+  bg: "български език"
   br: "Brezhoneg"
   ca: "Català"
   cs: "Čeština"