From 348ae0b61db3b1a0be10e791286cee8db68b8557 Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Sat, 29 Jan 2011 18:42:50 -0800
Subject: [PATCH 1/5] small hack to add some feedback when links are tapped on
 the mobile site.

---
 app/views/status_messages/_status_message.haml | 3 ++-
 public/javascripts/application.js              | 4 ++++
 public/javascripts/mobile.js                   | 9 ---------
 public/stylesheets/sass/mobile.sass            | 9 +++++++++
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/app/views/status_messages/_status_message.haml b/app/views/status_messages/_status_message.haml
index d441dc9d7..76bf8fef1 100644
--- a/app/views/status_messages/_status_message.haml
+++ b/app/views/status_messages/_status_message.haml
@@ -2,7 +2,8 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-= markdownify(post.message, :youtube_maps => post[:youtube_titles])
+.message
+  = markdownify(post.message, :youtube_maps => post[:youtube_titles])
 
 - if photos.count > 0
   .photo_attachments
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index e17c8425a..52a721694 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -25,5 +25,9 @@ $(document).ready(function() {
   $("a.paginate").live("click", function() {
     $(document).trigger("retrieve.infscr");
   });
+
+  $('a').live('tap',function(){
+    $(this).addClass('tapped');
+  })
 });
 
diff --git a/public/javascripts/mobile.js b/public/javascripts/mobile.js
index 65fbf0815..05b67fefa 100644
--- a/public/javascripts/mobile.js
+++ b/public/javascripts/mobile.js
@@ -7,15 +7,6 @@ var Mobile = {
   initialize: function() {
     $("abbr.timeago").timeago();
     $('#main_stream + .pagination').hide();
-    $('#aspect_picker').change(Mobile.changeAspect);
   },
-  
-  changeAspect: function() {
-    Mobile.windowLocation('/aspects/' + $('#aspect_picker option:selected').val());
-  },
-  
-  windowLocation: function(url) {
-    window.location = url;
-  }
 };
 
diff --git a/public/stylesheets/sass/mobile.sass b/public/stylesheets/sass/mobile.sass
index 1d6a936cb..26eeb1af7 100644
--- a/public/stylesheets/sass/mobile.sass
+++ b/public/stylesheets/sass/mobile.sass
@@ -50,6 +50,12 @@ a.ui-link-inherit
     :-moz-box-shadow 0 1px 3px #ccc
     :box-shadow 0 1px 3px #ccc
 
+.tapped
+  :background
+    :color rgba(100, 103, 103, .2)
+  :border-radius 5px
+a
+  :padding 2px
 .alpha-warning
   @include mobile-box
 
@@ -58,6 +64,9 @@ a.ui-link-inherit
   label
     :font-weight bold
 
+.message
+  :padding
+    :left 2px
 .stream_element,
 .comment
   :position relative

From 6dffdd815258fa32d8a7f6794cdccab763a3fa6d Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Sat, 29 Jan 2011 18:58:34 -0800
Subject: [PATCH 2/5] don't remove these methods

---
 public/javascripts/mobile.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/public/javascripts/mobile.js b/public/javascripts/mobile.js
index 05b67fefa..65fbf0815 100644
--- a/public/javascripts/mobile.js
+++ b/public/javascripts/mobile.js
@@ -7,6 +7,15 @@ var Mobile = {
   initialize: function() {
     $("abbr.timeago").timeago();
     $('#main_stream + .pagination').hide();
+    $('#aspect_picker').change(Mobile.changeAspect);
   },
+  
+  changeAspect: function() {
+    Mobile.windowLocation('/aspects/' + $('#aspect_picker option:selected').val());
+  },
+  
+  windowLocation: function(url) {
+    window.location = url;
+  }
 };
 

From 9e457f30ae15e46f8709fa247ae5730a1b2e9e43 Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Sun, 30 Jan 2011 09:24:57 +0100
Subject: [PATCH 3/5] moved javascript translations to their own files

---
 config/locales/diaspora/da.yml                 | 17 -----------------
 config/locales/diaspora/de.yml                 | 17 -----------------
 config/locales/diaspora/el.yml                 | 17 -----------------
 config/locales/diaspora/en.yml                 |  5 -----
 config/locales/diaspora/es.yml                 | 17 -----------------
 config/locales/diaspora/fr.yml                 | 17 -----------------
 config/locales/diaspora/he.yml                 | 17 -----------------
 config/locales/diaspora/hu.yml                 | 17 -----------------
 config/locales/diaspora/id.yml                 | 17 -----------------
 config/locales/diaspora/it.yml                 | 17 -----------------
 config/locales/diaspora/nl.yml                 | 17 -----------------
 config/locales/diaspora/pt-PT.yml              | 17 -----------------
 config/locales/diaspora/ro.yml                 | 17 -----------------
 config/locales/diaspora/sv.yml                 | 17 -----------------
 config/locales/javascript/javascript.cs.yml    | 18 ++++++++++++++++++
 config/locales/javascript/javascript.da.yml    | 18 ++++++++++++++++++
 config/locales/javascript/javascript.de.yml    | 18 ++++++++++++++++++
 config/locales/javascript/javascript.el.yml    | 18 ++++++++++++++++++
 config/locales/javascript/javascript.en.yml    |  6 ++++++
 config/locales/javascript/javascript.es.yml    | 18 ++++++++++++++++++
 config/locales/javascript/javascript.fr.yml    | 18 ++++++++++++++++++
 config/locales/javascript/javascript.he.yml    | 18 ++++++++++++++++++
 config/locales/javascript/javascript.hu.yml    | 18 ++++++++++++++++++
 config/locales/javascript/javascript.id.yml    | 18 ++++++++++++++++++
 config/locales/javascript/javascript.it.yml    | 18 ++++++++++++++++++
 config/locales/javascript/javascript.ja.yml    | 18 ++++++++++++++++++
 config/locales/javascript/javascript.ko.yml    | 16 ++++++++++++++++
 config/locales/javascript/javascript.nl.yml    | 18 ++++++++++++++++++
 config/locales/javascript/javascript.pt-PT.yml | 18 ++++++++++++++++++
 config/locales/javascript/javascript.ro.yml    | 18 ++++++++++++++++++
 config/locales/javascript/javascript.sv.yml    | 18 ++++++++++++++++++
 config/locales/javascript/javascript.zh.yml    | 18 ++++++++++++++++++
 32 files changed, 310 insertions(+), 226 deletions(-)
 create mode 100644 config/locales/javascript/javascript.cs.yml
 create mode 100644 config/locales/javascript/javascript.da.yml
 create mode 100644 config/locales/javascript/javascript.de.yml
 create mode 100644 config/locales/javascript/javascript.el.yml
 create mode 100644 config/locales/javascript/javascript.en.yml
 create mode 100644 config/locales/javascript/javascript.es.yml
 create mode 100644 config/locales/javascript/javascript.fr.yml
 create mode 100644 config/locales/javascript/javascript.he.yml
 create mode 100644 config/locales/javascript/javascript.hu.yml
 create mode 100644 config/locales/javascript/javascript.id.yml
 create mode 100644 config/locales/javascript/javascript.it.yml
 create mode 100644 config/locales/javascript/javascript.ja.yml
 create mode 100644 config/locales/javascript/javascript.ko.yml
 create mode 100644 config/locales/javascript/javascript.nl.yml
 create mode 100644 config/locales/javascript/javascript.pt-PT.yml
 create mode 100644 config/locales/javascript/javascript.ro.yml
 create mode 100644 config/locales/javascript/javascript.sv.yml
 create mode 100644 config/locales/javascript/javascript.zh.yml

diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 4499c1f2d..8d2e61d83 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -493,20 +493,3 @@ da:
     no_person_constructed: "Ingen person kunne konstrueres fra dette hcard."
     not_enabled: "det ser ikke ud til at webfinger er aktiveret på %{account}s domæne"
     xrd_fetch_failed: "der opstod en fejl i forbindelse med hentning af xrd fra kontoen %{account}"
-  javascripts:
-    timeago:
-      prefixAgo: "for"
-      prefixFromNow: "om"
-      suffixAgo: "siden"
-      suffixFromNow: ""
-      seconds: "mindre end et minut"
-      minute: "ca. et minut"
-      minutes: "%d minutter"
-      hour: "ca. en time"
-      hours: "ca. %d timer"
-      day: "en dag"
-      days: "%d dage"
-      month: "ca. en måned"
-      months: "%d måneder"
-      year: "ca. et år"
-      years: "%d år"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index e39bdd446..477ca13ab 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -493,20 +493,3 @@ de:
     no_person_constructed: "Konnte keine Person aus dieser hcard erstellen."
     not_enabled: "Webfinger scheint nicht für den Server von %{account} verfügbar zu sein."
     xrd_fetch_failed: "Die XRD-Datei von %{account} konnte nicht heruntergeladen werden"
-  javascripts:
-    timeago:
-      prefixAgo: "vor"
-      prefixFromNow: "in"
-      suffixAgo: ""
-      suffixFromNow: ""
-      seconds: "wenigen Sekunden"
-      minute: "etwa einer Minute"
-      minutes: "%d Minuten"
-      hour: "etwa einer Stunde"
-      hours: "%d Stunden"
-      day: "etwa einem Tag"
-      days: "%d Tagen"
-      month: "etwa einem Monat"
-      months: "%d Monaten"
-      year: "etwa einem Jahr"
-      years: "%d Jahren"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index 2b7a74681..3ab4480e5 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -493,20 +493,3 @@ el:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
-  javascripts:
-    timeago:
-      prefixAgo: "πριν"
-      prefixFromNow: "σε"
-      suffixAgo: ""
-      suffixFromNow: ""
-      seconds: "λιγότερο από ένα λεπτό"
-      minute: "περίπου ένα λεπτό"
-      minutes: "%d λεπτά"
-      hour: "περίπου μία ώρα"
-      hours: "περίπου %d ώρες"
-      day: "μία μέρα"
-      days: "%d μέρες"
-      month: "περίπου ένα μήνα"
-      months: "%d μήνες"
-      year: "περίπου ένα χρόνο"
-      years: "%d χρόνια"
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 967ee416d..8fe40bcf2 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -498,9 +498,4 @@ en:
   pagination:
       next: "Next"
       previous: "Previous"
-  javascripts:
-      confirm_dialog: "Are you sure?"
-      videos:
-          watch: "Watch this video on {{provider}}"
-          unknown: "Unknown video type"
 
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index e80f23647..379c2dec5 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -493,20 +493,3 @@ es:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "el webfinger parece no estar habilitado para el host de %{account}"
     xrd_fetch_failed: "hubo un error al recibir el xrd desde la cuenta %{account}"
-  javascripts:
-    timeago:
-      prefixAgo: "hace"
-      prefixFromNow: "dentro de"
-      suffixAgo: ""
-      suffixFromNow: ""
-      seconds: "menos de un minuto"
-      minute: "un minuto"
-      minutes: "unos %d minutos"
-      hour: "una hora"
-      hours: "%d horas"
-      day: "un día"
-      days: "%d días"
-      month: "un mes"
-      months: "%d meses"
-      year: "un año"
-      years: "%d años"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 50c34adae..94c3a9027 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -493,20 +493,3 @@ fr:
     no_person_constructed: "Cette hcard semble être invalide."
     not_enabled: "webfinger ne semble pas être activé sur l'hôte de %{account}'s"
     xrd_fetch_failed: "une erreur est survenue lors de la récupération du xrd du compte %{account}"
-  javascripts:
-    timeago:
-      prefixAgo: "il y a"
-      prefixFromNow: "d'ici"
-      suffixAgo: ""
-      suffixFromNow: ""
-      seconds: "moins d'une minute"
-      minute: "environ une minute"
-      minutes: "environ %d minutes"
-      hour: "environ une heure"
-      hours: "environ %d heures"
-      day: "environ un jour"
-      days: "environ %d jours"
-      month: "environ un mois"
-      months: "environ %d mois"
-      year: "un an"
-      years: "%d ans"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index bf5570764..37e2c15da 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -493,20 +493,3 @@ he:
     no_person_constructed: "לא ניתן להרכיב איש קשר מ־hcard זה."
     not_enabled: "נראה כי webfinger אינו פעיל עבור המארח של %{account}"
     xrd_fetch_failed: "אירעה שגיאה בקבלת ה־xrd מהחשבון %{account}"
-  javascripts:
-    timeago:
-      prefixAgo: "לפני"
-      prefixFromNow: "מעכשיו"
-      suffixAgo: ""
-      suffixFromNow: ""
-      seconds: "פחות מדקה"
-      minute: "דקה"
-      minutes: "%d דקות"
-      hour: "שעה"
-      hours: "%d שעות"
-      day: "יום"
-      days: "%d ימים"
-      month: "חודש"
-      months: "%d חודשים"
-      year: "שנה"
-      years: "%d שנים"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 496b4fa88..b0ecfd8d8 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -493,20 +493,3 @@ hu:
     no_person_constructed: "Ebből a hCard névjegyből nem lehet személyt létrehozni."
     not_enabled: "a webfinger nincs engedélyezve %{account} kiszolgálóján"
     xrd_fetch_failed: "%{account} fiókjából nem sikerült az XRD kiolvasása"
-  javascripts:
-    timeago:
-      prefixAgo: ""
-      prefixFromNow: ""
-      suffixAgo: ""
-      suffixFromNow: ""
-      seconds: "kevesebb mint egy perce"
-      minute: "körülbelül egy perce"
-      minutes: "%d perce"
-      hour: "körülbelül egy órája"
-      hours: "körülbelül %d órája"
-      day: "körülbelül egy napja"
-      days: "%d napja"
-      month: "körülbelül egy hónapja"
-      months: "%d hónapja"
-      year: "körülbelül egy éve"
-      years: "%d éve"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index 76a374d5b..52c5a9518 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -493,20 +493,3 @@ id:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
-  javascripts:
-    timeago:
-      prefixAgo: ""
-      prefixFromNow: ""
-      suffixAgo: "yang lalu"
-      suffixFromNow: "dari sekarang"
-      seconds: "kurang dari semenit"
-      minute: "sekitar satu menit"
-      minutes: "%d menit"
-      hour: "sekitar sejam"
-      hours: "sekitar %d jam"
-      day: "sehari"
-      days: "%d hari"
-      month: "sekitar sebulan"
-      months: "%d tahun"
-      year: "sekitar setahun"
-      years: "%d tahun"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 00bb1b9a2..b0a29fe3a 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -493,20 +493,3 @@ it:
     no_person_constructed: "Questa hcard non contiene i dati di una persona."
     not_enabled: "webfinger non attivo sull'host di %{account}"
     xrd_fetch_failed: "impossibile recuperare il xrd dall'account %{account}"
-  javascripts:
-    timeago:
-      prefixAgo: ""
-      prefixFromNow: ""
-      suffixAgo: "fa"
-      suffixFromNow: "da ora"
-      seconds: "meno di un minuto"
-      minute: "circa un minuto"
-      minutes: "%d minuti"
-      hour: "circa un'ora"
-      hours: "circa %d ore"
-      day: "un giorno"
-      days: "%d giorni"
-      month: "circa un mese"
-      months: "%d mesi"
-      year: "circa un anno"
-      years: "%d anni"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index 4e176ef08..1dab5f1f4 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -493,20 +493,3 @@ nl:
     no_person_constructed: "Er kon geen persoon worden gemaakt van deze hcard."
     not_enabled: "webfinger lijkt niet aan te staan voor %{account}'s provider"
     xrd_fetch_failed: "er was een probleem bij het verkrijgen van de xrd van het account %{account}"
-  javascript:
-    timeago:
-      prefixAgo: ""
-      prefixFromNow: ""
-      suffixAgo: "geleden"
-      suffixFromNow: "vanaf nu"
-      seconds: "iets minder dan een minute"
-      minute: "ongeveer een minuut"
-      minutes: "%d minuten"
-      hour: "ongeveer een uur"
-      hours: "ongeveer %d uren"
-      day: "een dag"
-      days: "%d dagen"
-      month: "ongeveer een maand"
-      months: "%d maanden"
-      year: "ongeveer een jaar"
-      years: "%d jaar"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 54a589f31..08509007c 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -493,20 +493,3 @@ pt-PT:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
-  javascripts:
-    timeago:
-      prefixAgo: ""
-      prefixFromNow: ""
-      suffixAgo: "atrás"
-      suffixFromNow: "a partir de agora"
-      seconds: "menos de um minuto"
-      minute: "cerca de um minuto"
-      minutes: "%d minutos"
-      hour: "cerca de uma hora"
-      hours: "cerca de %d horas"
-      day: "um dia"
-      days: "%d dias"
-      month: "cerca de um mês"
-      months: "%d meses"
-      year: "cerca de um ano"
-      years: "%d anos"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 2f4d3636b..636b2630f 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -493,20 +493,3 @@ ro:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
-  javascripts:
-    timeago:
-      prefixAgo: "acum"
-      prefixFromNow: "in timp de"
-      suffixAgo: ""
-      suffixFromNow: ""
-      seconds: "mai putin de un minut"
-      minute: "un minut"
-      minutes: "%d minute"
-      hour: "o ora"
-      hours: "%d ore"
-      day: "o zi"
-      days: "%d zile"
-      month: "o luna"
-      months: "%d luni"
-      year: "un an"
-      years: "%d ani"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index bffa94683..817f9a8f9 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -493,20 +493,3 @@ sv:
     no_person_constructed: "Den här personen kunde inte hittas (hcard-fel)."
     not_enabled: "Webfinger verkar inte vara påslaget på %{account}'s server"
     xrd_fetch_failed: "kunde inte hämta xrd-fil från kontot %{account}"
-  javascripts:
-    timeago:
-      prefixAgo: "för"
-      prefixFromNow: "om"
-      suffixAgo: "sedan"
-      suffixFromNow: ""
-      seconds: "mindre än en minut"
-      minute: "ungefär en minut"
-      minutes: "%d minuter"
-      hour: "ungefär en timme"
-      hours: "ungefär %d timmar"
-      day: "en dag"
-      days: "%d dagar"
-      month: "ungefär en månad"
-      months: "%d månader"
-      year: "ungefär ett år"
-      years: "%d år"
diff --git a/config/locales/javascript/javascript.cs.yml b/config/locales/javascript/javascript.cs.yml
new file mode 100644
index 000000000..d8fc1b77a
--- /dev/null
+++ b/config/locales/javascript/javascript.cs.yml
@@ -0,0 +1,18 @@
+cs:
+  javascripts:
+    timeago:
+      prefixAgo: "před"
+      prefixFromNow: ""
+      suffixAgo: ""
+      suffixFromNow: ""
+      seconds: "méně než minutou"
+      minute: "minutou"
+      minutes: "%d minutami"
+      hour: "hodinou"
+      hours: "%d hodinami"
+      day: "1 dnem"
+      days: "%d dny"
+      month: "1 měsícem"
+      months: "%d měsíci"
+      year: "1 rokem"
+      years: "%d roky"
diff --git a/config/locales/javascript/javascript.da.yml b/config/locales/javascript/javascript.da.yml
new file mode 100644
index 000000000..d83b3403e
--- /dev/null
+++ b/config/locales/javascript/javascript.da.yml
@@ -0,0 +1,18 @@
+da:
+  javascripts:
+    timeago:
+      prefixAgo: "for"
+      prefixFromNow: "om"
+      suffixAgo: "siden"
+      suffixFromNow: ""
+      seconds: "mindre end et minut"
+      minute: "ca. et minut"
+      minutes: "%d minutter"
+      hour: "ca. en time"
+      hours: "ca. %d timer"
+      day: "en dag"
+      days: "%d dage"
+      month: "ca. en måned"
+      months: "%d måneder"
+      year: "ca. et år"
+      years: "%d år"
diff --git a/config/locales/javascript/javascript.de.yml b/config/locales/javascript/javascript.de.yml
new file mode 100644
index 000000000..3d889a191
--- /dev/null
+++ b/config/locales/javascript/javascript.de.yml
@@ -0,0 +1,18 @@
+de:
+  javascripts:
+    timeago:
+      prefixAgo: "vor"
+      prefixFromNow: "in"
+      suffixAgo: ""
+      suffixFromNow: ""
+      seconds: "wenigen Sekunden"
+      minute: "etwa einer Minute"
+      minutes: "%d Minuten"
+      hour: "etwa einer Stunde"
+      hours: "%d Stunden"
+      day: "etwa einem Tag"
+      days: "%d Tagen"
+      month: "etwa einem Monat"
+      months: "%d Monaten"
+      year: "etwa einem Jahr"
+      years: "%d Jahren"
diff --git a/config/locales/javascript/javascript.el.yml b/config/locales/javascript/javascript.el.yml
new file mode 100644
index 000000000..b612871aa
--- /dev/null
+++ b/config/locales/javascript/javascript.el.yml
@@ -0,0 +1,18 @@
+el:
+  javascripts:
+    timeago:
+      prefixAgo: "πριν"
+      prefixFromNow: "σε"
+      suffixAgo: ""
+      suffixFromNow: ""
+      seconds: "λιγότερο από ένα λεπτό"
+      minute: "περίπου ένα λεπτό"
+      minutes: "%d λεπτά"
+      hour: "περίπου μία ώρα"
+      hours: "περίπου %d ώρες"
+      day: "μία μέρα"
+      days: "%d μέρες"
+      month: "περίπου ένα μήνα"
+      months: "%d μήνες"
+      year: "περίπου ένα χρόνο"
+      years: "%d χρόνια"
diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml
new file mode 100644
index 000000000..030b96497
--- /dev/null
+++ b/config/locales/javascript/javascript.en.yml
@@ -0,0 +1,6 @@
+en:
+  javascripts:
+      confirm_dialog: "Are you sure?"
+      videos:
+          watch: "Watch this video on {{provider}}"
+          unknown: "Unknown video type"
diff --git a/config/locales/javascript/javascript.es.yml b/config/locales/javascript/javascript.es.yml
new file mode 100644
index 000000000..13c327b70
--- /dev/null
+++ b/config/locales/javascript/javascript.es.yml
@@ -0,0 +1,18 @@
+es:
+  javascripts:
+    timeago:
+      prefixAgo: "hace"
+      prefixFromNow: "dentro de"
+      suffixAgo: ""
+      suffixFromNow: ""
+      seconds: "menos de un minuto"
+      minute: "un minuto"
+      minutes: "unos %d minutos"
+      hour: "una hora"
+      hours: "%d horas"
+      day: "un día"
+      days: "%d días"
+      month: "un mes"
+      months: "%d meses"
+      year: "un año"
+      years: "%d años"
diff --git a/config/locales/javascript/javascript.fr.yml b/config/locales/javascript/javascript.fr.yml
new file mode 100644
index 000000000..bec60fb04
--- /dev/null
+++ b/config/locales/javascript/javascript.fr.yml
@@ -0,0 +1,18 @@
+fr:
+  javascripts:
+    timeago:
+      prefixAgo: "il y a"
+      prefixFromNow: "d'ici"
+      suffixAgo: ""
+      suffixFromNow: ""
+      seconds: "moins d'une minute"
+      minute: "environ une minute"
+      minutes: "environ %d minutes"
+      hour: "environ une heure"
+      hours: "environ %d heures"
+      day: "environ un jour"
+      days: "environ %d jours"
+      month: "environ un mois"
+      months: "environ %d mois"
+      year: "un an"
+      years: "%d ans"
diff --git a/config/locales/javascript/javascript.he.yml b/config/locales/javascript/javascript.he.yml
new file mode 100644
index 000000000..0725479ce
--- /dev/null
+++ b/config/locales/javascript/javascript.he.yml
@@ -0,0 +1,18 @@
+he:
+  javascripts:
+    timeago:
+      prefixAgo: "לפני"
+      prefixFromNow: "מעכשיו"
+      suffixAgo: ""
+      suffixFromNow: ""
+      seconds: "פחות מדקה"
+      minute: "דקה"
+      minutes: "%d דקות"
+      hour: "שעה"
+      hours: "%d שעות"
+      day: "יום"
+      days: "%d ימים"
+      month: "חודש"
+      months: "%d חודשים"
+      year: "שנה"
+      years: "%d שנים"
diff --git a/config/locales/javascript/javascript.hu.yml b/config/locales/javascript/javascript.hu.yml
new file mode 100644
index 000000000..02f0b4c88
--- /dev/null
+++ b/config/locales/javascript/javascript.hu.yml
@@ -0,0 +1,18 @@
+hu:
+  javascripts:
+    timeago:
+      prefixAgo: ""
+      prefixFromNow: ""
+      suffixAgo: ""
+      suffixFromNow: ""
+      seconds: "kevesebb mint egy perce"
+      minute: "körülbelül egy perce"
+      minutes: "%d perce"
+      hour: "körülbelül egy órája"
+      hours: "körülbelül %d órája"
+      day: "körülbelül egy napja"
+      days: "%d napja"
+      month: "körülbelül egy hónapja"
+      months: "%d hónapja"
+      year: "körülbelül egy éve"
+      years: "%d éve"
diff --git a/config/locales/javascript/javascript.id.yml b/config/locales/javascript/javascript.id.yml
new file mode 100644
index 000000000..a7c7af688
--- /dev/null
+++ b/config/locales/javascript/javascript.id.yml
@@ -0,0 +1,18 @@
+id:
+  javascripts:
+    timeago:
+      prefixAgo: ""
+      prefixFromNow: ""
+      suffixAgo: "yang lalu"
+      suffixFromNow: "dari sekarang"
+      seconds: "kurang dari semenit"
+      minute: "sekitar satu menit"
+      minutes: "%d menit"
+      hour: "sekitar sejam"
+      hours: "sekitar %d jam"
+      day: "sehari"
+      days: "%d hari"
+      month: "sekitar sebulan"
+      months: "%d tahun"
+      year: "sekitar setahun"
+      years: "%d tahun"
diff --git a/config/locales/javascript/javascript.it.yml b/config/locales/javascript/javascript.it.yml
new file mode 100644
index 000000000..fdf8194fa
--- /dev/null
+++ b/config/locales/javascript/javascript.it.yml
@@ -0,0 +1,18 @@
+it:
+  javascripts:
+    timeago:
+      prefixAgo: ""
+      prefixFromNow: ""
+      suffixAgo: "fa"
+      suffixFromNow: "da ora"
+      seconds: "meno di un minuto"
+      minute: "circa un minuto"
+      minutes: "%d minuti"
+      hour: "circa un'ora"
+      hours: "circa %d ore"
+      day: "un giorno"
+      days: "%d giorni"
+      month: "circa un mese"
+      months: "%d mesi"
+      year: "circa un anno"
+      years: "%d anni"
diff --git a/config/locales/javascript/javascript.ja.yml b/config/locales/javascript/javascript.ja.yml
new file mode 100644
index 000000000..274f87fe5
--- /dev/null
+++ b/config/locales/javascript/javascript.ja.yml
@@ -0,0 +1,18 @@
+ja:
+  javascripts:
+    timeago:
+      prefixAgo: ""
+      prefixFromNow: "今から"
+      suffixAgo: "前"
+      suffixFromNow: "後"
+      seconds: "ほんの数秒"
+      minute: "約一分"
+      minutes: "%d 分"
+      hour: "大体一時間"
+      hours: "大体 %d 時間位"
+      day: "一日"
+      days: "%d 日ほど"
+      month: "大体一ヶ月"
+      months: "%d ヶ月ほど"
+      year: "丁度一年（虎舞流ｗ）"
+      years: "%d 年"
diff --git a/config/locales/javascript/javascript.ko.yml b/config/locales/javascript/javascript.ko.yml
new file mode 100644
index 000000000..dfffeda5a
--- /dev/null
+++ b/config/locales/javascript/javascript.ko.yml
@@ -0,0 +1,16 @@
+ko:
+  javascripts:
+    timeago:
+      suffixAgo: "전"
+      suffixFromNow: "후"
+      seconds: "1분  이내"
+      minute: "1분"
+      minutes: "%d분"
+      hour: "1시간"
+      hours: "%d시간"
+      day: "하루"
+      days: "%d일"
+      month: "한달"
+      months: "%d달"
+      year: "1년"
+      years: "%d년"
diff --git a/config/locales/javascript/javascript.nl.yml b/config/locales/javascript/javascript.nl.yml
new file mode 100644
index 000000000..e239c9342
--- /dev/null
+++ b/config/locales/javascript/javascript.nl.yml
@@ -0,0 +1,18 @@
+nl:
+  javascripts:
+    timeago:
+      prefixAgo: ""
+      prefixFromNow: ""
+      suffixAgo: "geleden"
+      suffixFromNow: "vanaf nu"
+      seconds: "iets minder dan een minute"
+      minute: "ongeveer een minuut"
+      minutes: "%d minuten"
+      hour: "ongeveer een uur"
+      hours: "ongeveer %d uren"
+      day: "een dag"
+      days: "%d dagen"
+      month: "ongeveer een maand"
+      months: "%d maanden"
+      year: "ongeveer een jaar"
+      years: "%d jaar"
diff --git a/config/locales/javascript/javascript.pt-PT.yml b/config/locales/javascript/javascript.pt-PT.yml
new file mode 100644
index 000000000..881ea0668
--- /dev/null
+++ b/config/locales/javascript/javascript.pt-PT.yml
@@ -0,0 +1,18 @@
+pt-PT:
+  javascripts:
+    timeago:
+      prefixAgo: ""
+      prefixFromNow: ""
+      suffixAgo: "atrás"
+      suffixFromNow: "a partir de agora"
+      seconds: "menos de um minuto"
+      minute: "cerca de um minuto"
+      minutes: "%d minutos"
+      hour: "cerca de uma hora"
+      hours: "cerca de %d horas"
+      day: "um dia"
+      days: "%d dias"
+      month: "cerca de um mês"
+      months: "%d meses"
+      year: "cerca de um ano"
+      years: "%d anos"
diff --git a/config/locales/javascript/javascript.ro.yml b/config/locales/javascript/javascript.ro.yml
new file mode 100644
index 000000000..1e3d4e4aa
--- /dev/null
+++ b/config/locales/javascript/javascript.ro.yml
@@ -0,0 +1,18 @@
+ro:
+  javascripts:
+    timeago:
+      prefixAgo: "acum"
+      prefixFromNow: "in timp de"
+      suffixAgo: ""
+      suffixFromNow: ""
+      seconds: "mai putin de un minut"
+      minute: "un minut"
+      minutes: "%d minute"
+      hour: "o ora"
+      hours: "%d ore"
+      day: "o zi"
+      days: "%d zile"
+      month: "o luna"
+      months: "%d luni"
+      year: "un an"
+      years: "%d ani"
diff --git a/config/locales/javascript/javascript.sv.yml b/config/locales/javascript/javascript.sv.yml
new file mode 100644
index 000000000..957a4c570
--- /dev/null
+++ b/config/locales/javascript/javascript.sv.yml
@@ -0,0 +1,18 @@
+sv:
+  javascripts:
+    timeago:
+      prefixAgo: "för"
+      prefixFromNow: "om"
+      suffixAgo: "sedan"
+      suffixFromNow: ""
+      seconds: "mindre än en minut"
+      minute: "ungefär en minut"
+      minutes: "%d minuter"
+      hour: "ungefär en timme"
+      hours: "ungefär %d timmar"
+      day: "en dag"
+      days: "%d dagar"
+      month: "ungefär en månad"
+      months: "%d månader"
+      year: "ungefär ett år"
+      years: "%d år"
diff --git a/config/locales/javascript/javascript.zh.yml b/config/locales/javascript/javascript.zh.yml
new file mode 100644
index 000000000..4800c32f5
--- /dev/null
+++ b/config/locales/javascript/javascript.zh.yml
@@ -0,0 +1,18 @@
+zh:
+  javascripts:
+    timeago:
+      prefixAgo: ""
+      prefixFromNow: "从现在开始"
+      suffixAgo: "之前"
+      suffixFromNow: ""
+      seconds: "不到 1 分钟"
+      minute: "大约 1 分钟"
+      minutes: "%d 分钟"
+      hour: "大约 1 小时"
+      hours: "大约 %d 小时"
+      day: "1 天"
+      days: "%d 天"
+      month: "大约 1 个月"
+      months: "%d 月"
+      year: "大约 1 年"
+      years: "%d 年"

From f487df2961f8dec7c57c6098cfceccb52d3ea838 Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Sun, 30 Jan 2011 09:27:12 +0100
Subject: [PATCH 4/5] added javascripts:timeago to the master file

---
 config/locales/javascript/javascript.en.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml
index 030b96497..a065ed553 100644
--- a/config/locales/javascript/javascript.en.yml
+++ b/config/locales/javascript/javascript.en.yml
@@ -1,6 +1,22 @@
 en:
   javascripts:
       confirm_dialog: "Are you sure?"
+      timeago:
+        prefixAgo: ""
+        prefixFromNow: ""
+        suffixAgo: "ago"
+        suffixFromNow: "from now"
+        seconds: "less than a minute"
+        minute: "about a minute"
+        minutes: "%d minutes"
+        hour: "about an hour"
+        hours: "about %d hours"
+        day: "a day"
+        days: "%d days"
+        month: "about a month"
+        months: "%d months"
+        year: "about a year"
+        years: "%d years"
       videos:
           watch: "Watch this video on {{provider}}"
           unknown: "Unknown video type"

From 3b3807e8df34f46f4ab29da2532f9dbb76993f06 Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Sun, 30 Jan 2011 10:10:53 +0100
Subject: [PATCH 5/5] updated locales

---
 config/locales/diaspora/de.yml                | 12 ++--
 config/locales/diaspora/fi.yml                | 56 +++++++++----------
 config/locales/diaspora/fr.yml                | 14 ++---
 config/locales/diaspora/ro.yml                | 30 +++++-----
 config/locales/javascript/javascript.cs.yml   | 33 +++++++----
 config/locales/javascript/javascript.da.yml   | 33 +++++++----
 config/locales/javascript/javascript.de.yml   | 33 +++++++----
 config/locales/javascript/javascript.el.yml   | 33 +++++++----
 config/locales/javascript/javascript.es.yml   | 33 +++++++----
 config/locales/javascript/javascript.fr.yml   | 33 +++++++----
 config/locales/javascript/javascript.he.yml   | 33 +++++++----
 config/locales/javascript/javascript.hu.yml   | 33 +++++++----
 config/locales/javascript/javascript.id.yml   | 33 +++++++----
 config/locales/javascript/javascript.it.yml   | 33 +++++++----
 config/locales/javascript/javascript.nl.yml   | 33 +++++++----
 .../locales/javascript/javascript.pt-PT.yml   | 33 +++++++----
 config/locales/javascript/javascript.ro.yml   | 33 +++++++----
 config/locales/javascript/javascript.sv.yml   | 33 +++++++----
 18 files changed, 350 insertions(+), 224 deletions(-)

diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 477ca13ab..abb983437 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -53,8 +53,8 @@ de:
       success: "Kontakt erfolgreich zum Aspekt hinzugefügt."
     aspect_contacts: 
       done_editing: "Änderungen abgeschlossen"
-    contacts_not_visible: "Contacts in this aspect will not be able to see each other."
-    contacts_visible: "Contacts in this aspect will be able to see each other."
+    contacts_not_visible: "Kontakte in diesem Aspekt können nicht sich sehen."
+    contacts_visible: "Kontakte in diesem Aspekt können sich sehen."
     create: 
       failure: "Erstellen des Aspekts fehlgeschlagen."
       success: "Dein neuer Aspekt %{name} wurde erstellt."
@@ -63,10 +63,10 @@ de:
     edit: 
       add_existing: "Ein bereits bestehendes Konto hinzufügen"
       confirm_remove_aspect: "Bist du dir sicher, dass du diesen Aspekt löschen möchtest?"
-      make_aspect_list_visible: "make aspect list visible to others in aspect"
+      make_aspect_list_visible: "Zeige deine Aspekte anderen in diesem Aspekt"
       remove_aspect: "Aspekt löschen"
       rename: "umbenennen"
-      save: "Save"
+      save: "Speichern"
     helper: 
       are_you_sure: "Möchtest du diesen Aspekt wirklich löschen?"
       aspect_not_empty: "Aspekt ist nicht leer"
@@ -379,8 +379,8 @@ de:
       click_link_to_accept_invitation: "Öffne diesen Link um die Einladung zu akzeptieren"
       join_me_on_diaspora: "Folge mir auf DIASPORA*"
     remote_friend: 
-      invite: "invite"
-      resend: "resend"
+      invite: "Einladen"
+      resend: "Erneut senden"
   settings: "Einstellungen"
   shared: 
     add_contact: 
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index d9b22e4ef..4035aca7a 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -53,23 +53,23 @@ fi:
       success: "Ystävän lisäys näkymään onnistui."
     aspect_contacts: 
       done_editing: "muokkaus valmis"
-    contacts_not_visible: "Contacts in this aspect will not be able to see each other."
-    contacts_visible: "Contacts in this aspect will be able to see each other."
+    contacts_not_visible: "Kontaktit tässä näkymässä eivät voi nähdä toisiaan."
+    contacts_visible: "Kontaktit tässä näkymässä voivat nähdä toisensa."
     create: 
-      failure: "Verkostonäkymän luonti epäonnistui."
+      failure: "Näkymän luonti epäonnistui."
       success: "Uusi näkymäsi, %{name}, on luotu"
     destroy: 
       success: "%{name} poistettiin onnistuneesti."
     edit: 
       add_existing: "Lisää olemassa oleva kontakti"
       confirm_remove_aspect: "Oletko varma että haluat poistaa tämän näkymän?"
-      make_aspect_list_visible: "make aspect list visible to others in aspect"
+      make_aspect_list_visible: "tee näkymälistasta näkyvä sen jäsenille"
       remove_aspect: "Poista näkymä"
       rename: "nimeä uudelleen"
-      save: "Save"
+      save: "Tallenna"
     helper: 
       are_you_sure: "Haluatko varmasti poistaa tämän näkymän?"
-      aspect_not_empty: "Verkostonäkymä ei ole tyhjä"
+      aspect_not_empty: "Näkymä ei ole tyhjä"
       remove: "poista"
     index: 
       handle_explanation: "Tämä on Diaspora-osoitteesi. Voit käyttää sitä kuten sähköpostiosoitettasi. Sen avulla sinut tavoitetaan Diasporasta."
@@ -84,7 +84,7 @@ fi:
     move_contact: 
       error: "Virhe siirrettäessä kontaktia: %{inspect}"
       failure: "ei toiminut %{inspect}"
-      success: "Henkilö siirretty toiseen näkymään"
+      success: "Henkilö siirretty uuteen näkymään"
     new_aspect: 
       create: "Luo"
       name: "Nimi"
@@ -93,7 +93,7 @@ fi:
       add_contact_to: "Lisää henkilö näkymään %{aspect_name}"
       invite: "Kutsu ystäväsi Diasporan käyttäjäksi!"
       nobody: "Tuo elämäsi tärkeät ihmiset Diasporaan!"
-      nobody_in_aspect: "Verkostonäkymäsi '%{aspect_name}' on tyhjä."
+      nobody_in_aspect: "Näkymäsi, '%{aspect_name}', on tyhjä."
     no_posts_message: 
       start_talking: "Kukaan ei ole sanonut vielä mitään. Aloita keskustelu!"
     remove_from_aspect: 
@@ -106,7 +106,7 @@ fi:
       edit_aspect: "muokkaa näkymää"
     update: 
       failure: "Antamasi näkymän nimi, %{name}, on liian pitkä."
-      success: "Verkostonäkymäsi, %{name}, muokkaus onnistui."
+      success: "Näkymäsi, %{name}, muokkaus onnistui."
   back: "Takaisin"
   cancel: "Peruuta"
   comments: 
@@ -155,7 +155,7 @@ fi:
       sign_up: "rekisteröidy"
     new: 
       already_invited: "On jo kutsuttu"
-      aspect: "Verkostonäkymä"
+      aspect: "Näkymä"
       comma_seperated_plz: "Voit syöttää useita sähköpostiosoitteita pilkuilla erotettuna."
       if_they_accept_info: "jos he hyväksyvät, heidät lisätään siihen näkymään, johon heidät kutsuit."
       invite_someone_to_join: "Kutsu joku Diasporan käyttäjäksi!"
@@ -166,10 +166,10 @@ fi:
   layouts: 
     application: 
       have_a_problem: "Ongelmia? Löydä ratkaisu täältä"
-      logged_in_as: "logged in as %{name}"
+      logged_in_as: "kirjautuneena nimellä %{name}"
       powered_by: "PALVELUN TARJOAA DIASPORA*"
       whats_new: "Uutta"
-      your_aspects: "your aspects"
+      your_aspects: "näkymäsi"
     header: 
       account_settings: "käyttäjätilin asetukset"
       blog: "blogi"
@@ -230,7 +230,7 @@ fi:
   password_confirmation: "Salasanan varmistus"
   people: 
     aspect_list: 
-      edit_membership: "muokkaa jäsenen näkymää."
+      edit_membership: "muokkaa näkymän jäsenyyttä."
     edit: 
       allow_search: "Salli ihmisten etsiä sinua Diasporassa"
       edit_profile: "Muokkaa profiilia"
@@ -249,7 +249,7 @@ fi:
       results_for: " tulokset kyselylle %{params}"
     index: 
       couldnt_find_them_send_invite: "Etkö löytänyt heitä? Lähetä kutsu!"
-      no_one_found: "...eikä ketään löytynyt."
+      no_one_found: "...ketään ei löytynyt."
       no_results: "Hei! Sinun tulisi etsiä jotakin."
       results_for: "hakutulokset kohteelle"
     person: 
@@ -362,12 +362,12 @@ fi:
       error: "palvelun yhdistämisessä tapahtui virhe"
     finder: 
       friends: 
-        few: "%{count} friends"
-        one: "1 friend"
-        other: "%{count} friends"
-        zero: "no friends"
-      invite_your_friends_from: "Invite your friends from %{service}"
-      not_connected: "not connected"
+        few: "%{count} ystävää"
+        one: "1 ystävä"
+        other: "%{count} ystävää"
+        zero: "ei ystäviä"
+      invite_your_friends_from: "Kutsu ystäväsi palvelusta %{service}"
+      not_connected: "ei yhdistetty"
     index: 
       connect_to_facebook: "Yhdistä palveluun facebook"
       connect_to_twitter: "Yhdistä palveluun twitter"
@@ -376,18 +376,18 @@ fi:
       logged_in_as: "kirjautunut käyttäjänä"
       really_disconnect: "katkaise %{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: "Paina tätä linkkiä hyväksyäksesi kutsun"
+      join_me_on_diaspora: "DIASPORA* kutsuu!"
     remote_friend: 
-      invite: "invite"
-      resend: "resend"
+      invite: "kutsu"
+      resend: "lähetä uudelleen"
   settings: "Asetukset"
   shared: 
     add_contact: 
       create_request: "Etsi Diaspora-tunnuksella"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "Anna Diaspora-käyttäjätunnus:"
-      know_email: "Tiedätkö heidän sähköpostiosoitteita? Mikset kutsuisi heitä Diasporaan?"
+      know_email: "Tiedätkö heidän sähköpostiosoitteitansa? Kutsu heidät!"
       your_diaspora_username_is: "Diaspora käyttäjätunnuksesi on: %{diaspora_handle}"
     contact_list: 
       all_contacts: "Kaikki kontaktit"
@@ -461,18 +461,18 @@ fi:
       skip: "ohita aloitusohjeet"
       step_2: 
         add: "Lisää"
-        aspect_name: "Verkostonäkymän nimi"
+        aspect_name: "Näkymän nimi"
         description: "Kerro Diasporalle mitä näkymiä näytetään kontakteillesi. Voit muokata näitä asetuksia myöhemmin yläoikealta löytyvän valikon kautta. Näkymäsi ovat yksilöllisiä sinulle, eikä niitä näytetä muille. "
         drag_to_add: "Raahaa heidät näkymään itsestäsi, jonka he tietävät"
         no_requests: "Ei pyyntöjä"
-        your_aspects: "Verkostonäkymäsi"
+        your_aspects: "Näkymäsi"
         your_inviter: "Tässä ovat sinua odottavat henkilöt:"
       step_3: 
         description: "Voit yhdistää käyttämäsi yhteisöpalvelut Diaspora-käyttäjätiliisi. Sinun on mahdollista lähettää ulospäin julkisia viestejä etusivulta valitsemalla \"tee julkiseksi.\""
         your_services: "Palvelusi"
       step_4: 
         change_profile: "Voit muokata profiiliasi ja hallita yhdistettyjä palveluitasi koska tahansa valitsemalla "
-        continue: "Jatka etusivulle, joka tarjoaa yleisnäkymän kaikkiin näkymiisi."
+        continue: "Jatka etusivulle, joka tarjoaa katsauksen kaikkiin näkymiisi."
         finish: "Valmis"
         manage_aspects: "Voit myös lisätä kontakteja ollessasi missä hyvänsä näkymässä."
         ready_to_share: "Olet nyt valmis aloittamaan jakamisen henkilöille"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 94c3a9027..ba11a1d52 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -53,8 +53,8 @@ fr:
       success: "Vous avez ajouté le contact à l’aspect avec succès."
     aspect_contacts: 
       done_editing: "fin de la modification"
-    contacts_not_visible: "Contacts in this aspect will not be able to see each other."
-    contacts_visible: "Contacts in this aspect will be able to see each other."
+    contacts_not_visible: "Les contacts dans cet aspect ne se verront pas les uns les autres."
+    contacts_visible: "Les contacts dans cet aspect pourront se voir entre eux."
     create: 
       failure: "La création de l’aspect a échoué."
       success: "Votre nouvel aspect %{name} a été créé."
@@ -63,10 +63,10 @@ fr:
     edit: 
       add_existing: "Ajouter un contact existant"
       confirm_remove_aspect: "Voulez-vous vraiment supprimer cet aspect ?"
-      make_aspect_list_visible: "make aspect list visible to others in aspect"
+      make_aspect_list_visible: "rendre la liste de l'aspect visible aux autres membres de l'aspect"
       remove_aspect: "Supprimer cet aspect"
       rename: "renommer"
-      save: "Save"
+      save: "Enregistrer"
     helper: 
       are_you_sure: "Voulez-vous vraiment supprimer cet aspect ?"
       aspect_not_empty: "L’aspect n’est pas vide"
@@ -230,7 +230,7 @@ fr:
   password_confirmation: "Confirmation du mot de passe"
   people: 
     aspect_list: 
-      edit_membership: "modifier les membres de l'aspect"
+      edit_membership: "modifier l'appartenance à vos aspects"
     edit: 
       allow_search: "Autoriser des personnes à vous rechercher au sein de Diaspora"
       edit_profile: "Modifier le profil"
@@ -379,8 +379,8 @@ fr:
       click_link_to_accept_invitation: "Cliquer sur ce lien pour accepter l'invitation"
       join_me_on_diaspora: "Rejoignez-moi sur DIASPORA*"
     remote_friend: 
-      invite: "invite"
-      resend: "resend"
+      invite: "inviter"
+      resend: "envoyer à nouveau"
   settings: "Options"
   shared: 
     add_contact: 
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 636b2630f..4e0c3d3d8 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -57,7 +57,7 @@ ro:
     contacts_visible: "Contacts in this aspect will be able to see each other."
     create: 
       failure: "Crearea aspectului a eşuat."
-      success: "Click on the plus on the left side to tell Diaspora who can see your new aspect."
+      success: "S-a creat noul aspect %{name}"
     destroy: 
       success: "%{name} a fost eliminat cu succes."
     edit: 
@@ -76,7 +76,7 @@ ro:
       no_contacts: "No contacts"
     manage: 
       add_a_new_aspect: "Adaugă un nou aspect"
-      add_a_new_contact: "Add a new contact"
+      add_a_new_contact: "Adaugă un contact nou"
       drag_to_add: "Glisaţi pentru a adăuga persoane"
       manage_aspects: "Gestionează aspectele"
       no_requests: "Nici o cerere nouă"
@@ -84,14 +84,14 @@ ro:
     move_contact: 
       error: "Error moving contact: %{inspect}"
       failure: "didn't work %{inspect}"
-      success: "Person moved to new aspect"
+      success: "S-a mutat persoana la noul aspectul"
     new_aspect: 
       create: "Crează"
       name: "Nume"
     no_contacts_message: 
-      add_contact: "Add a contact"
+      add_contact: "Adaugă un contact"
       add_contact_to: "Add someone to %{aspect_name}"
-      invite: "Invite someone to join Diaspora!"
+      invite: "Invită pe cineva pe Diaspora!"
       nobody: "We know you know people — bring them to Diaspora!"
       nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
     no_posts_message: 
@@ -166,7 +166,7 @@ ro:
   layouts: 
     application: 
       have_a_problem: "Ai o problemă? Găseşte un răspuns aici"
-      logged_in_as: "logged in as %{name}"
+      logged_in_as: "logat ca %{name}"
       powered_by: "POWERED BY DIASPORA*"
       whats_new: "what's new?"
       your_aspects: "aspectele tale"
@@ -328,9 +328,9 @@ ro:
     edit: 
       cancel_my_account: "Cancel my account"
       edit: "Edit %{name}"
-      leave_blank: "(leave blank if you don't want to change it)"
-      password_to_confirm: "(we need your current password to confirm your changes)"
-      unhappy: "Unhappy?"
+      leave_blank: "(lăsaţi necompletat dacă nu doriţi să o schimbaţi)"
+      password_to_confirm: "(avem nevoie de parola curentă pentru a confirma modificările)"
+      unhappy: "Nefericit?"
       update: "Update"
     new: 
       enter_email: "Enter an e-mail"
@@ -348,7 +348,7 @@ ro:
       ignore: "Ignorează cererea de contact."
       success: "Sunteţi acum prieteni."
     manage_aspect_contacts: 
-      existing: "Existing contacts"
+      existing: "Contactele existente"
       manage_within: "Manage contacts within"
     new_request_to_person: 
       sent: "sent!"
@@ -409,7 +409,7 @@ ro:
       outside: "Mesajele publice vor fi disponibile pentru cei ce nu fac parte din Diaspora."
       title: "Sunteţi pe cale de a publica un mesaj public!"
     publisher: 
-      add_photos: "add photos"
+      add_photos: "adaugă fotografii"
       all: "toate"
       all_contacts: "toate contactele"
       make_public: "make public"
@@ -461,15 +461,15 @@ ro:
       skip: "skip getting started"
       step_2: 
         add: "Add"
-        aspect_name: "Aspect name"
+        aspect_name: "Numele aspectului"
         description: "Tell Diaspora what different aspects of you are seen by different friends.  You can manage these later by clicking the manage tab on the top right.  Your aspects are unique to you, and not visible by others."
         drag_to_add: "Drag them to the aspect of yourself they know"
         no_requests: "Nu ai nici o cerere"
-        your_aspects: "Your aspects"
+        your_aspects: "Aspectele dvs."
         your_inviter: "Here are the people who are waiting for you:"
       step_3: 
         description: "Connect your existing social networks to your Diaspora account.  You will be able to post publically through your Everyone tab when you select \"public.\""
-        your_services: "Your services"
+        your_services: "Serviciile dvs."
       step_4: 
         change_profile: "You can change your profile any time by clicking"
         continue: "Continue on to your everyone page, an overview of all of your aspects."
@@ -478,7 +478,7 @@ ro:
         ready_to_share: "You're now ready to start sharing with "
         set_up: "You're all set up, %{name}!"
         user_menu: "in your user menu (top right)."
-      welcome: "Welcome to Diaspora!"
+      welcome: "Bine ai venit pe Diaspora!"
     public: 
       does_not_exist: "Utilizatorul %{username} nu există!"
     update: 
diff --git a/config/locales/javascript/javascript.cs.yml b/config/locales/javascript/javascript.cs.yml
index d8fc1b77a..05fa4a4f7 100644
--- a/config/locales/javascript/javascript.cs.yml
+++ b/config/locales/javascript/javascript.cs.yml
@@ -1,18 +1,27 @@
-cs:
-  javascripts:
-    timeago:
-      prefixAgo: "před"
-      prefixFromNow: ""
-      suffixAgo: ""
-      suffixFromNow: ""
-      seconds: "méně než minutou"
-      minute: "minutou"
-      minutes: "%d minutami"
-      hour: "hodinou"
-      hours: "%d hodinami"
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+cs: 
+  javascripts: 
+    confirm_dialog: "Are you sure?"
+    timeago: 
       day: "1 dnem"
       days: "%d dny"
+      hour: "hodinou"
+      hours: "%d hodinami"
+      minute: "minutou"
+      minutes: "%d minutami"
       month: "1 měsícem"
       months: "%d měsíci"
+      prefixAgo: "před"
+      prefixFromNow: ""
+      seconds: "méně než minutou"
+      suffixAgo: ""
+      suffixFromNow: ""
       year: "1 rokem"
       years: "%d roky"
+    videos: 
+      unknown: "Unknown video type"
+      watch: "Watch this video on {{provider}}"
diff --git a/config/locales/javascript/javascript.da.yml b/config/locales/javascript/javascript.da.yml
index d83b3403e..7c72588e4 100644
--- a/config/locales/javascript/javascript.da.yml
+++ b/config/locales/javascript/javascript.da.yml
@@ -1,18 +1,27 @@
-da:
-  javascripts:
-    timeago:
-      prefixAgo: "for"
-      prefixFromNow: "om"
-      suffixAgo: "siden"
-      suffixFromNow: ""
-      seconds: "mindre end et minut"
-      minute: "ca. et minut"
-      minutes: "%d minutter"
-      hour: "ca. en time"
-      hours: "ca. %d timer"
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+da: 
+  javascripts: 
+    confirm_dialog: "Are you sure?"
+    timeago: 
       day: "en dag"
       days: "%d dage"
+      hour: "ca. en time"
+      hours: "ca. %d timer"
+      minute: "ca. et minut"
+      minutes: "%d minutter"
       month: "ca. en måned"
       months: "%d måneder"
+      prefixAgo: "for"
+      prefixFromNow: "om"
+      seconds: "mindre end et minut"
+      suffixAgo: "siden"
+      suffixFromNow: ""
       year: "ca. et år"
       years: "%d år"
+    videos: 
+      unknown: "Unknown video type"
+      watch: "Watch this video on {{provider}}"
diff --git a/config/locales/javascript/javascript.de.yml b/config/locales/javascript/javascript.de.yml
index 3d889a191..e1ff45c8b 100644
--- a/config/locales/javascript/javascript.de.yml
+++ b/config/locales/javascript/javascript.de.yml
@@ -1,18 +1,27 @@
-de:
-  javascripts:
-    timeago:
-      prefixAgo: "vor"
-      prefixFromNow: "in"
-      suffixAgo: ""
-      suffixFromNow: ""
-      seconds: "wenigen Sekunden"
-      minute: "etwa einer Minute"
-      minutes: "%d Minuten"
-      hour: "etwa einer Stunde"
-      hours: "%d Stunden"
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+de: 
+  javascripts: 
+    confirm_dialog: "Are you sure?"
+    timeago: 
       day: "etwa einem Tag"
       days: "%d Tagen"
+      hour: "etwa einer Stunde"
+      hours: "%d Stunden"
+      minute: "etwa einer Minute"
+      minutes: "%d Minuten"
       month: "etwa einem Monat"
       months: "%d Monaten"
+      prefixAgo: "vor"
+      prefixFromNow: "in"
+      seconds: "wenigen Sekunden"
+      suffixAgo: ""
+      suffixFromNow: ""
       year: "etwa einem Jahr"
       years: "%d Jahren"
+    videos: 
+      unknown: "Unknown video type"
+      watch: "Watch this video on {{provider}}"
diff --git a/config/locales/javascript/javascript.el.yml b/config/locales/javascript/javascript.el.yml
index b612871aa..c1a9feed5 100644
--- a/config/locales/javascript/javascript.el.yml
+++ b/config/locales/javascript/javascript.el.yml
@@ -1,18 +1,27 @@
-el:
-  javascripts:
-    timeago:
-      prefixAgo: "πριν"
-      prefixFromNow: "σε"
-      suffixAgo: ""
-      suffixFromNow: ""
-      seconds: "λιγότερο από ένα λεπτό"
-      minute: "περίπου ένα λεπτό"
-      minutes: "%d λεπτά"
-      hour: "περίπου μία ώρα"
-      hours: "περίπου %d ώρες"
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+el: 
+  javascripts: 
+    confirm_dialog: "Are you sure?"
+    timeago: 
       day: "μία μέρα"
       days: "%d μέρες"
+      hour: "περίπου μία ώρα"
+      hours: "περίπου %d ώρες"
+      minute: "περίπου ένα λεπτό"
+      minutes: "%d λεπτά"
       month: "περίπου ένα μήνα"
       months: "%d μήνες"
+      prefixAgo: "πριν"
+      prefixFromNow: "σε"
+      seconds: "λιγότερο από ένα λεπτό"
+      suffixAgo: ""
+      suffixFromNow: ""
       year: "περίπου ένα χρόνο"
       years: "%d χρόνια"
+    videos: 
+      unknown: "Unknown video type"
+      watch: "Watch this video on {{provider}}"
diff --git a/config/locales/javascript/javascript.es.yml b/config/locales/javascript/javascript.es.yml
index 13c327b70..991be35aa 100644
--- a/config/locales/javascript/javascript.es.yml
+++ b/config/locales/javascript/javascript.es.yml
@@ -1,18 +1,27 @@
-es:
-  javascripts:
-    timeago:
-      prefixAgo: "hace"
-      prefixFromNow: "dentro de"
-      suffixAgo: ""
-      suffixFromNow: ""
-      seconds: "menos de un minuto"
-      minute: "un minuto"
-      minutes: "unos %d minutos"
-      hour: "una hora"
-      hours: "%d horas"
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+es: 
+  javascripts: 
+    confirm_dialog: "Are you sure?"
+    timeago: 
       day: "un día"
       days: "%d días"
+      hour: "una hora"
+      hours: "%d horas"
+      minute: "un minuto"
+      minutes: "unos %d minutos"
       month: "un mes"
       months: "%d meses"
+      prefixAgo: "hace"
+      prefixFromNow: "dentro de"
+      seconds: "menos de un minuto"
+      suffixAgo: ""
+      suffixFromNow: ""
       year: "un año"
       years: "%d años"
+    videos: 
+      unknown: "Unknown video type"
+      watch: "Watch this video on {{provider}}"
diff --git a/config/locales/javascript/javascript.fr.yml b/config/locales/javascript/javascript.fr.yml
index bec60fb04..10a495fc4 100644
--- a/config/locales/javascript/javascript.fr.yml
+++ b/config/locales/javascript/javascript.fr.yml
@@ -1,18 +1,27 @@
-fr:
-  javascripts:
-    timeago:
-      prefixAgo: "il y a"
-      prefixFromNow: "d'ici"
-      suffixAgo: ""
-      suffixFromNow: ""
-      seconds: "moins d'une minute"
-      minute: "environ une minute"
-      minutes: "environ %d minutes"
-      hour: "environ une heure"
-      hours: "environ %d heures"
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+fr: 
+  javascripts: 
+    confirm_dialog: "Are you sure?"
+    timeago: 
       day: "environ un jour"
       days: "environ %d jours"
+      hour: "environ une heure"
+      hours: "environ %d heures"
+      minute: "environ une minute"
+      minutes: "environ %d minutes"
       month: "environ un mois"
       months: "environ %d mois"
+      prefixAgo: "il y a"
+      prefixFromNow: "d'ici"
+      seconds: "moins d'une minute"
+      suffixAgo: ""
+      suffixFromNow: ""
       year: "un an"
       years: "%d ans"
+    videos: 
+      unknown: "Unknown video type"
+      watch: "Watch this video on {{provider}}"
diff --git a/config/locales/javascript/javascript.he.yml b/config/locales/javascript/javascript.he.yml
index 0725479ce..20d123759 100644
--- a/config/locales/javascript/javascript.he.yml
+++ b/config/locales/javascript/javascript.he.yml
@@ -1,18 +1,27 @@
-he:
-  javascripts:
-    timeago:
-      prefixAgo: "לפני"
-      prefixFromNow: "מעכשיו"
-      suffixAgo: ""
-      suffixFromNow: ""
-      seconds: "פחות מדקה"
-      minute: "דקה"
-      minutes: "%d דקות"
-      hour: "שעה"
-      hours: "%d שעות"
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+he: 
+  javascripts: 
+    confirm_dialog: "Are you sure?"
+    timeago: 
       day: "יום"
       days: "%d ימים"
+      hour: "שעה"
+      hours: "%d שעות"
+      minute: "דקה"
+      minutes: "%d דקות"
       month: "חודש"
       months: "%d חודשים"
+      prefixAgo: "לפני"
+      prefixFromNow: "מעכשיו"
+      seconds: "פחות מדקה"
+      suffixAgo: ""
+      suffixFromNow: ""
       year: "שנה"
       years: "%d שנים"
+    videos: 
+      unknown: "Unknown video type"
+      watch: "Watch this video on {{provider}}"
diff --git a/config/locales/javascript/javascript.hu.yml b/config/locales/javascript/javascript.hu.yml
index 02f0b4c88..d5a9ed062 100644
--- a/config/locales/javascript/javascript.hu.yml
+++ b/config/locales/javascript/javascript.hu.yml
@@ -1,18 +1,27 @@
-hu:
-  javascripts:
-    timeago:
-      prefixAgo: ""
-      prefixFromNow: ""
-      suffixAgo: ""
-      suffixFromNow: ""
-      seconds: "kevesebb mint egy perce"
-      minute: "körülbelül egy perce"
-      minutes: "%d perce"
-      hour: "körülbelül egy órája"
-      hours: "körülbelül %d órája"
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+hu: 
+  javascripts: 
+    confirm_dialog: "Are you sure?"
+    timeago: 
       day: "körülbelül egy napja"
       days: "%d napja"
+      hour: "körülbelül egy órája"
+      hours: "körülbelül %d órája"
+      minute: "körülbelül egy perce"
+      minutes: "%d perce"
       month: "körülbelül egy hónapja"
       months: "%d hónapja"
+      prefixAgo: ""
+      prefixFromNow: ""
+      seconds: "kevesebb mint egy perce"
+      suffixAgo: ""
+      suffixFromNow: ""
       year: "körülbelül egy éve"
       years: "%d éve"
+    videos: 
+      unknown: "Unknown video type"
+      watch: "Watch this video on {{provider}}"
diff --git a/config/locales/javascript/javascript.id.yml b/config/locales/javascript/javascript.id.yml
index a7c7af688..f2a2a8c05 100644
--- a/config/locales/javascript/javascript.id.yml
+++ b/config/locales/javascript/javascript.id.yml
@@ -1,18 +1,27 @@
-id:
-  javascripts:
-    timeago:
-      prefixAgo: ""
-      prefixFromNow: ""
-      suffixAgo: "yang lalu"
-      suffixFromNow: "dari sekarang"
-      seconds: "kurang dari semenit"
-      minute: "sekitar satu menit"
-      minutes: "%d menit"
-      hour: "sekitar sejam"
-      hours: "sekitar %d jam"
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+id: 
+  javascripts: 
+    confirm_dialog: "Are you sure?"
+    timeago: 
       day: "sehari"
       days: "%d hari"
+      hour: "sekitar sejam"
+      hours: "sekitar %d jam"
+      minute: "sekitar satu menit"
+      minutes: "%d menit"
       month: "sekitar sebulan"
       months: "%d tahun"
+      prefixAgo: ""
+      prefixFromNow: ""
+      seconds: "kurang dari semenit"
+      suffixAgo: "yang lalu"
+      suffixFromNow: "dari sekarang"
       year: "sekitar setahun"
       years: "%d tahun"
+    videos: 
+      unknown: "Unknown video type"
+      watch: "Watch this video on {{provider}}"
diff --git a/config/locales/javascript/javascript.it.yml b/config/locales/javascript/javascript.it.yml
index fdf8194fa..4957e99d0 100644
--- a/config/locales/javascript/javascript.it.yml
+++ b/config/locales/javascript/javascript.it.yml
@@ -1,18 +1,27 @@
-it:
-  javascripts:
-    timeago:
-      prefixAgo: ""
-      prefixFromNow: ""
-      suffixAgo: "fa"
-      suffixFromNow: "da ora"
-      seconds: "meno di un minuto"
-      minute: "circa un minuto"
-      minutes: "%d minuti"
-      hour: "circa un'ora"
-      hours: "circa %d ore"
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+it: 
+  javascripts: 
+    confirm_dialog: "Are you sure?"
+    timeago: 
       day: "un giorno"
       days: "%d giorni"
+      hour: "circa un'ora"
+      hours: "circa %d ore"
+      minute: "circa un minuto"
+      minutes: "%d minuti"
       month: "circa un mese"
       months: "%d mesi"
+      prefixAgo: ""
+      prefixFromNow: ""
+      seconds: "meno di un minuto"
+      suffixAgo: "fa"
+      suffixFromNow: "da ora"
       year: "circa un anno"
       years: "%d anni"
+    videos: 
+      unknown: "Unknown video type"
+      watch: "Watch this video on {{provider}}"
diff --git a/config/locales/javascript/javascript.nl.yml b/config/locales/javascript/javascript.nl.yml
index e239c9342..64d8515f1 100644
--- a/config/locales/javascript/javascript.nl.yml
+++ b/config/locales/javascript/javascript.nl.yml
@@ -1,18 +1,27 @@
-nl:
-  javascripts:
-    timeago:
-      prefixAgo: ""
-      prefixFromNow: ""
-      suffixAgo: "geleden"
-      suffixFromNow: "vanaf nu"
-      seconds: "iets minder dan een minute"
-      minute: "ongeveer een minuut"
-      minutes: "%d minuten"
-      hour: "ongeveer een uur"
-      hours: "ongeveer %d uren"
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+nl: 
+  javascripts: 
+    confirm_dialog: "Are you sure?"
+    timeago: 
       day: "een dag"
       days: "%d dagen"
+      hour: "ongeveer een uur"
+      hours: "ongeveer %d uren"
+      minute: "ongeveer een minuut"
+      minutes: "%d minuten"
       month: "ongeveer een maand"
       months: "%d maanden"
+      prefixAgo: ""
+      prefixFromNow: ""
+      seconds: "iets minder dan een minute"
+      suffixAgo: "geleden"
+      suffixFromNow: "vanaf nu"
       year: "ongeveer een jaar"
       years: "%d jaar"
+    videos: 
+      unknown: "Unknown video type"
+      watch: "Watch this video on {{provider}}"
diff --git a/config/locales/javascript/javascript.pt-PT.yml b/config/locales/javascript/javascript.pt-PT.yml
index 881ea0668..179ba1357 100644
--- a/config/locales/javascript/javascript.pt-PT.yml
+++ b/config/locales/javascript/javascript.pt-PT.yml
@@ -1,18 +1,27 @@
-pt-PT:
-  javascripts:
-    timeago:
-      prefixAgo: ""
-      prefixFromNow: ""
-      suffixAgo: "atrás"
-      suffixFromNow: "a partir de agora"
-      seconds: "menos de um minuto"
-      minute: "cerca de um minuto"
-      minutes: "%d minutos"
-      hour: "cerca de uma hora"
-      hours: "cerca de %d horas"
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+pt-PT: 
+  javascripts: 
+    confirm_dialog: "Are you sure?"
+    timeago: 
       day: "um dia"
       days: "%d dias"
+      hour: "cerca de uma hora"
+      hours: "cerca de %d horas"
+      minute: "cerca de um minuto"
+      minutes: "%d minutos"
       month: "cerca de um mês"
       months: "%d meses"
+      prefixAgo: ""
+      prefixFromNow: ""
+      seconds: "menos de um minuto"
+      suffixAgo: "atrás"
+      suffixFromNow: "a partir de agora"
       year: "cerca de um ano"
       years: "%d anos"
+    videos: 
+      unknown: "Unknown video type"
+      watch: "Watch this video on {{provider}}"
diff --git a/config/locales/javascript/javascript.ro.yml b/config/locales/javascript/javascript.ro.yml
index 1e3d4e4aa..73634c459 100644
--- a/config/locales/javascript/javascript.ro.yml
+++ b/config/locales/javascript/javascript.ro.yml
@@ -1,18 +1,27 @@
-ro:
-  javascripts:
-    timeago:
-      prefixAgo: "acum"
-      prefixFromNow: "in timp de"
-      suffixAgo: ""
-      suffixFromNow: ""
-      seconds: "mai putin de un minut"
-      minute: "un minut"
-      minutes: "%d minute"
-      hour: "o ora"
-      hours: "%d ore"
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+ro: 
+  javascripts: 
+    confirm_dialog: "Are you sure?"
+    timeago: 
       day: "o zi"
       days: "%d zile"
+      hour: "o ora"
+      hours: "%d ore"
+      minute: "un minut"
+      minutes: "%d minute"
       month: "o luna"
       months: "%d luni"
+      prefixAgo: "acum"
+      prefixFromNow: "in timp de"
+      seconds: "mai putin de un minut"
+      suffixAgo: ""
+      suffixFromNow: ""
       year: "un an"
       years: "%d ani"
+    videos: 
+      unknown: "Unknown video type"
+      watch: "Watch this video on {{provider}}"
diff --git a/config/locales/javascript/javascript.sv.yml b/config/locales/javascript/javascript.sv.yml
index 957a4c570..49516dcf2 100644
--- a/config/locales/javascript/javascript.sv.yml
+++ b/config/locales/javascript/javascript.sv.yml
@@ -1,18 +1,27 @@
-sv:
-  javascripts:
-    timeago:
-      prefixAgo: "för"
-      prefixFromNow: "om"
-      suffixAgo: "sedan"
-      suffixFromNow: ""
-      seconds: "mindre än en minut"
-      minute: "ungefär en minut"
-      minutes: "%d minuter"
-      hour: "ungefär en timme"
-      hours: "ungefär %d timmar"
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+sv: 
+  javascripts: 
+    confirm_dialog: "Are you sure?"
+    timeago: 
       day: "en dag"
       days: "%d dagar"
+      hour: "ungefär en timme"
+      hours: "ungefär %d timmar"
+      minute: "ungefär en minut"
+      minutes: "%d minuter"
       month: "ungefär en månad"
       months: "%d månader"
+      prefixAgo: "för"
+      prefixFromNow: "om"
+      seconds: "mindre än en minut"
+      suffixAgo: "sedan"
+      suffixFromNow: ""
       year: "ungefär ett år"
       years: "%d år"
+    videos: 
+      unknown: "Unknown video type"
+      watch: "Watch this video on {{provider}}"