social_stream 2.0.0.beta2 → 2.0.0.beta3

data/presence/config/locales/en.yml

@@ -1,27 +1,28 @@
+---
 en:
   chat:
-    connecting: "Connecting"
-    reconnecting: "Reconnecting"
-    disconnected: "Disconnected"
-    unableconnect: "Out of Service"
-    title: "Chat"
-    password: "Password"
-    zerousers: "No users connected"
-    search: "Search contacts"
-    zerocontacts: "No contacts found"
-    status: 
-      choose: "Choose status"
-      available: "Available"
-      away: "Away"
-      dnd: "Busy"
-      offline: "Offline"
+    connecting: Connecting
+    reconnecting: Reconnecting
+    disconnected: Disconnected
+    unableconnect: Out of Service
+    title: Chat
+    password: Password
+    zerousers: No users connected
+    search: Search contacts
+    zerocontacts: No contacts found
+    status:
+      choose: Choose status
+      available: Available
+      away: Away
+      dnd: Busy
+      offline: Offline
     settings:
-      title: "Enable and configure Social Stream Chat"  
-      checkbox: "Enable or disable Social Stream Chat"  
-      update: "Update Settings"
+      title: Enable and configure Social Stream Chat
+      checkbox: Enable or disable Social Stream Chat
+      update: Update Settings
     notify:
-      offline: "You are offline"
-      guestOffline: "{{name}} is offline"
+      offline: You are offline
+      guestOffline: '{{name}} is offline'
     videochat:
       disconnected: Videochat disconnected
       disconnecting: Videochat disconnecting...
@@ -32,36 +33,37 @@ en:
       establishing: Establishing...
       connnected: Videochat connected.
       unable: Unable to init videochat.
-      serverIssue: "Server Error: Invalid response"
-      call: "{{name}} wants to start a video call"
-      rejected: "{{name}} has rejected your call"
-      rejectedBusy: "{{name}} is busy"
+      serverIssue: 'Server Error: Invalid response'
+      call: '{{name}} wants to start a video call'
+      rejected: '{{name}} has rejected your call'
+      rejectedBusy: '{{name}} is busy'
       accept: Accept
       deny: Deny
-      clientIssue: "{{name}}'s client not support videochat"
-      guestOffline: "Unable to connect. {{name}} is offline"
-      offline: "Unable to connect. You are offline"
-      cancel: "{{name}} cancel the videocall"
-      requirements: You don't have the minimum requirements to run videocall application. Please upgrade to the latest version of Flash.
+      clientIssue: '{{name}}''s client not support videochat'
+      guestOffline: Unable to connect. {{name}} is offline
+      offline: Unable to connect. You are offline
+      cancel: '{{name}} cancel the videocall'
+      requirements: You don't have the minimum requirements to run videocall application.
+        Please upgrade to the latest version of Flash.
     muc:
-      group: "{{group}} group"
-      join: "{{nick}} joined in the room."
-      leave: "{{nick}} has left the room."
-      occupants: "Occupants"
-      joining: "Joining..."
+      group: '{{group}} group'
+      join: '{{nick}} joined in the room.'
+      leave: '{{nick}} has left the room.'
+      occupants: Occupants
+      joining: Joining...
       joinError: "You can't join in the room \n {{errorMsg}}"
-      offline: "You are offline"
+      offline: You are offline
     game:
-      call: "{{name}} wants to play a {{game}} game"
+      call: '{{name}} wants to play a {{game}} game'
       accept: Accept
       deny: Deny
-      offline: "Unable to connect. You are offline"
-      guestOffline: "Unable to connect. {{name}} is offline"
+      offline: Unable to connect. You are offline
+      guestOffline: Unable to connect. {{name}} is offline
       unable: Unable to init game.
-      rejected: "{{name}} has rejected your invitation"
-      rejectedBusy: "{{name}} is busy"
-      cancel: "{{name}} cancel the invitation"
-      finish: "{{name}} close the game"
+      rejected: '{{name}} has rejected your invitation'
+      rejectedBusy: '{{name}} is busy'
+      cancel: '{{name}} cancel the invitation'
+      finish: '{{name}} close the game'
       waiting: Waiting for response...
       unknown: Unknown response
-      clientIssue: "{{name}}'s client not support games"
+      clientIssue: '{{name}}''s client not support games'

data/presence/config/locales/es.yml

@@ -1,27 +1,28 @@
+---
 es:
   chat:
-    connecting: "Conectando"
-    reconnecting: "Reconectando"
-    disconnected: "Desconectado"
-    unableconnect: "Fuera de servicio"
-    title: "Chat"
-    password: "Contraseña"
-    zerousers: "No hay contactos conectados"
-    search: "Buscar contactos"
-    zerocontacts: "No se encontró ningún contacto"
+    connecting: Conectando
+    reconnecting: Reconectando
+    disconnected: Desconectado
+    unableconnect: Fuera de servicio
+    title: Chat
+    password: Contraseña
+    zerousers: No hay contactos conectados
+    search: Buscar contactos
+    zerocontacts: No se encontró ningún contacto
     status:
-      choose: "Establecer estado"
-      available: "Disponible"
-      away: "Ausente"
-      dnd: "No molestar"
-      offline: "Desconectado"
+      choose: Establecer estado
+      available: Disponible
+      away: Ausente
+      dnd: No molestar
+      offline: Desconectado
     settings:
-      title: "Activación y configuración del chat de Social Stream"
-      checkbox: "Activar o desactivar chat"  
-      update: "Guardar configuración"
+      title: Activación y configuración del chat de Social Stream
+      checkbox: Activar o desactivar chat
+      update: Guardar configuración
     notify:
-      offline: "Estás desconectado"
-      guestOffline: "{{name}} está desconectado"
+      offline: Estás desconectado
+      guestOffline: '{{name}} está desconectado'
     videochat:
       disconnected: Videochat desconectado
       disconnecting: Videochat desconectando...
@@ -32,36 +33,37 @@ es:
       establishing: Estableciendo conexión...
       connnected: Videochat conectado
       unable: Imposible iniciar videochat
-      serverIssue: "Error del servidor: Respuesta inválida"
-      call: "{{name}} quiere iniciar una videollamada"
-      rejected: "{{name}} ha rechazado tu llamada"
-      rejectedBusy: "{{name}} está ocupado"
+      serverIssue: 'Error del servidor: Respuesta inválida'
+      call: '{{name}} quiere iniciar una videollamada'
+      rejected: '{{name}} ha rechazado tu llamada'
+      rejectedBusy: '{{name}} está ocupado'
       accept: Aceptar
       deny: Rechazar
-      clientIssue: "El cliente de {{name}} no soporta videochat"
-      guestOffline: "Imposible conectar. {{name}} está desconectado"
-      offline: "Imposible conectar. Estás desconectado"
-      cancel: "{{name}} canceló la videollamada"
-      requirements: No tienes los requisitos minimos para iniciar la aplicación de videoconferencia. Por favor, actualiza a la última versión de Flash.
+      clientIssue: El cliente de {{name}} no soporta videochat
+      guestOffline: Imposible conectar. {{name}} está desconectado
+      offline: Imposible conectar. Estás desconectado
+      cancel: '{{name}} canceló la videollamada'
+      requirements: No tienes los requisitos minimos para iniciar la aplicación de
+        videoconferencia. Por favor, actualiza a la última versión de Flash.
     muc:
-       group: "Grupo {{group}}"
-       join: "{{nick}} ha entrado en la sala."
-       leave: "{{nick}} se ha ido de la sala."
-       occupants: "Miembros"
-       joining: "Accediendo..."
-       joinError: "No se pudo acceder a la sala.  \n {{errorMsg}}"
-       offline: "Estás desconectado"
+      group: Grupo {{group}}
+      join: '{{nick}} ha entrado en la sala.'
+      leave: '{{nick}} se ha ido de la sala.'
+      occupants: Miembros
+      joining: Accediendo...
+      joinError: "No se pudo acceder a la sala.  \n {{errorMsg}}"
+      offline: Estás desconectado
     game:
-      call: "{{name}} quiere iniciar una partida de {{game}}"
+      call: '{{name}} quiere iniciar una partida de {{game}}'
       accept: Aceptar
       deny: Rechazar
-      offline: "Imposible conectar. Estás desconectado"
-      guestOffline: "Imposible conectar. {{name}} está desconectado"
+      offline: Imposible conectar. Estás desconectado
+      guestOffline: Imposible conectar. {{name}} está desconectado
       unable: Imposible iniciar partida.
-      rejected: "{{name}} ha rechazado tu invitación"
-      rejectedBusy: "{{name}} está ocupado"
-      cancel: "{{name}} canceló la partida"
-      finish: "{{name}} ha cerrado el juego"
+      rejected: '{{name}} ha rechazado tu invitación'
+      rejectedBusy: '{{name}} está ocupado'
+      cancel: '{{name}} canceló la partida'
+      finish: '{{name}} ha cerrado el juego'
       waiting: Esperando respuesta...
       unknown: Respuesta desconocida
-      clientIssue: "El cliente de {{name}} no tiene juegos"
+      clientIssue: El cliente de {{name}} no tiene juegos

data/presence/config/locales/zh.yml

@@ -0,0 +1,69 @@
+---
+zh:
+  chat:
+    connecting: Connecting
+    reconnecting: Reconnecting
+    disconnected: Disconnected
+    unableconnect: Out of Service
+    title: Chat
+    password: Password
+    zerousers: No users connected
+    search: Search contacts
+    zerocontacts: No contacts found
+    status:
+      choose: Choose status
+      available: Available
+      away: Away
+      dnd: Busy
+      offline: Offline
+    settings:
+      title: Enable and configure Social Stream Chat
+      checkbox: Enable or disable Social Stream Chat
+      update: Update Settings
+    notify:
+      offline: You are offline
+      guestOffline: '{{name}} is offline'
+    videochat:
+      disconnected: Videochat disconnected
+      disconnecting: Videochat disconnecting...
+      negotiating: Negotiating...
+      connectingWait: Connecting...
+      connecting: Connecting to the server...
+      waiting: Waiting for response...
+      establishing: Establishing...
+      connnected: Videochat connected.
+      unable: Unable to init videochat.
+      serverIssue: 'Server Error: Invalid response'
+      call: '{{name}} wants to start a video call'
+      rejected: '{{name}} has rejected your call'
+      rejectedBusy: '{{name}} is busy'
+      accept: Accept
+      deny: Deny
+      clientIssue: '{{name}}''s client not support videochat'
+      guestOffline: Unable to connect. {{name}} is offline
+      offline: Unable to connect. You are offline
+      cancel: '{{name}} cancel the videocall'
+      requirements: You don't have the minimum requirements to run videocall application.
+        Please upgrade to the latest version of Flash.
+    muc:
+      group: '{{group}} group'
+      join: '{{nick}} joined in the room.'
+      leave: '{{nick}} has left the room.'
+      occupants: Occupants
+      joining: Joining...
+      joinError: "You can't join in the room \n {{errorMsg}}"
+      offline: You are offline
+    game:
+      call: '{{name}} wants to play a {{game}} game'
+      accept: Accept
+      deny: Deny
+      offline: Unable to connect. You are offline
+      guestOffline: Unable to connect. {{name}} is offline
+      unable: Unable to init game.
+      rejected: '{{name}} has rejected your invitation'
+      rejectedBusy: '{{name}} is busy'
+      cancel: '{{name}} cancel the invitation'
+      finish: '{{name}} close the game'
+      waiting: Waiting for response...
+      unknown: Unknown response
+      clientIssue: '{{name}}''s client not support games'

data/presence/lib/social_stream/presence/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Presence
-    VERSION = "2.0.0.beta2"
+    VERSION = "2.0.0.beta3"
   end
 end

data/presence/social_stream-presence.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 2.0.0.beta2')
+  s.add_runtime_dependency('social_stream-base', '~> 2.0.0.beta3')
   
   s.add_runtime_dependency "xmpp4r"
 

data/social_stream.gemspec

@@ -10,13 +10,13 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 2.0.0.beta2')
-  s.add_runtime_dependency('social_stream-documents', '~> 2.0.0.beta2')
-  s.add_runtime_dependency('social_stream-events', '~> 2.0.0.beta2')
-  s.add_runtime_dependency('social_stream-linkser', '~> 2.0.0.beta2')
-  s.add_runtime_dependency('social_stream-presence', '~> 2.0.0.beta2')
-  s.add_runtime_dependency('social_stream-ostatus', '~> 2.0.0.beta2')
-  s.add_runtime_dependency('social_stream-oauth2_server', '~> 2.0.0.beta2')
+  s.add_runtime_dependency('social_stream-base', '~> 2.0.0.beta3')
+  s.add_runtime_dependency('social_stream-documents', '~> 2.0.0.beta3')
+  s.add_runtime_dependency('social_stream-events', '~> 2.0.0.beta3')
+  s.add_runtime_dependency('social_stream-linkser', '~> 2.0.0.beta3')
+  s.add_runtime_dependency('social_stream-presence', '~> 2.0.0.beta3')
+  s.add_runtime_dependency('social_stream-ostatus', '~> 2.0.0.beta3')
+  s.add_runtime_dependency('social_stream-oauth2_server', '~> 2.0.0.beta3')
  
   # Development Gem dependencies
   #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: social_stream
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta2
+  version: 2.0.0.beta3
 platform: ruby
 authors:
 - GING - DIT - UPM
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
@@ -16,98 +16,98 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0.beta3
 - !ruby/object:Gem::Dependency
   name: social_stream-documents
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0.beta3
 - !ruby/object:Gem::Dependency
   name: social_stream-events
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0.beta3
 - !ruby/object:Gem::Dependency
   name: social_stream-linkser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0.beta3
 - !ruby/object:Gem::Dependency
   name: social_stream-presence
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0.beta3
 - !ruby/object:Gem::Dependency
   name: social_stream-ostatus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0.beta3
 - !ruby/object:Gem::Dependency
   name: social_stream-oauth2_server
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0.beta3
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -329,20 +329,24 @@ files:
 - base/app/assets/javascripts/social_stream/user.js
 - base/app/assets/javascripts/social_stream/wall.js
 - base/app/assets/stylesheets/social_stream-base.css.sass
-- base/app/assets/stylesheets/social_stream/base/_adjust.css.sass
-- base/app/assets/stylesheets/social_stream/base/_buttons.scss.sass
-- base/app/assets/stylesheets/social_stream/base/_groups.css.sass
-- base/app/assets/stylesheets/social_stream/base/_jquery-ui.css.sass
+- base/app/assets/stylesheets/social_stream/base/adjust.css.sass
+- base/app/assets/stylesheets/social_stream/base/adjust/_adjust.css.sass
+- base/app/assets/stylesheets/social_stream/base/adjust/layout/_adjust.css.sass
+- base/app/assets/stylesheets/social_stream/base/buttons.css.sass
+- base/app/assets/stylesheets/social_stream/base/buttons/_buttons.scss.sass
+- base/app/assets/stylesheets/social_stream/base/contacts.css.sass
 - base/app/assets/stylesheets/social_stream/base/contacts/_contacts.css.sass
 - base/app/assets/stylesheets/social_stream/base/contacts/layouts/_contacts.css.sass
 - base/app/assets/stylesheets/social_stream/base/contacts/responsive/_responsive-1200px-min.css.sass
 - base/app/assets/stylesheets/social_stream/base/contacts/responsive/_responsive-767px-max.css.sass
 - base/app/assets/stylesheets/social_stream/base/contacts/responsive/_responsive-768px-979px.css.sass
+- base/app/assets/stylesheets/social_stream/base/conversation.css.sass
 - base/app/assets/stylesheets/social_stream/base/conversation/_conversation.css.sass
 - base/app/assets/stylesheets/social_stream/base/conversation/layout/_conversation.css.sass
 - base/app/assets/stylesheets/social_stream/base/conversation/responsive/_responsive-1200px-min.css.sass
 - base/app/assets/stylesheets/social_stream/base/conversation/responsive/_responsive-767px-max.css.sass
 - base/app/assets/stylesheets/social_stream/base/conversation/responsive/_responsive-768px-979px.css.sass
+- base/app/assets/stylesheets/social_stream/base/explore.css.sass
 - base/app/assets/stylesheets/social_stream/base/explore/_explore-search.css.sass
 - base/app/assets/stylesheets/social_stream/base/explore/_explore-timeline.css.sass
 - base/app/assets/stylesheets/social_stream/base/explore/_explore.css.sass
@@ -352,7 +356,9 @@ files:
 - base/app/assets/stylesheets/social_stream/base/explore/responsive/_responsive-1200px-min.css.sass
 - base/app/assets/stylesheets/social_stream/base/explore/responsive/_responsive-767px-max.css.sass
 - base/app/assets/stylesheets/social_stream/base/explore/responsive/_responsive-768px-979px.css.sass
+- base/app/assets/stylesheets/social_stream/base/footer.css.sass
 - base/app/assets/stylesheets/social_stream/base/footer/layout/_footer.css.sass
+- base/app/assets/stylesheets/social_stream/base/frontpage_devise.css.sass
 - base/app/assets/stylesheets/social_stream/base/frontpage_devise/_devise.css.sass
 - base/app/assets/stylesheets/social_stream/base/frontpage_devise/_frontpage.css.sass
 - base/app/assets/stylesheets/social_stream/base/frontpage_devise/layout/_devise.css.sass
@@ -360,47 +366,67 @@ files:
 - base/app/assets/stylesheets/social_stream/base/frontpage_devise/responsive/_responsive-1200px-min.css.sass
 - base/app/assets/stylesheets/social_stream/base/frontpage_devise/responsive/_responsive-767px-max.css.sass
 - base/app/assets/stylesheets/social_stream/base/frontpage_devise/responsive/_responsive-768px-979px.css.sass
+- base/app/assets/stylesheets/social_stream/base/groups/_groups.css.sass
+- base/app/assets/stylesheets/social_stream/base/groups/layout/_groups.css.sass
+- base/app/assets/stylesheets/social_stream/base/icons.css.sass
 - base/app/assets/stylesheets/social_stream/base/icons/icon.css.css
+- base/app/assets/stylesheets/social_stream/base/jquery-ui.css.sass
+- base/app/assets/stylesheets/social_stream/base/jquery-ui/_jquery-ui.css.sass
+- base/app/assets/stylesheets/social_stream/base/layouts.css.sass
 - base/app/assets/stylesheets/social_stream/base/layouts/_header.css.sass
 - base/app/assets/stylesheets/social_stream/base/layouts/_layout.css.sass
+- base/app/assets/stylesheets/social_stream/base/logo.css.sass
 - base/app/assets/stylesheets/social_stream/base/logo/_logo-in.css
 - base/app/assets/stylesheets/social_stream/base/logo/_logo-out.css
 - base/app/assets/stylesheets/social_stream/base/logo/layout/_logo-in.css.sass
 - base/app/assets/stylesheets/social_stream/base/logo/layout/_logo-out.css
 - base/app/assets/stylesheets/social_stream/base/logo/responsive/_responsive-767px-max.css.sass
+- base/app/assets/stylesheets/social_stream/base/mixins.css.sass
 - base/app/assets/stylesheets/social_stream/base/mixins/_animation.css.sass
 - base/app/assets/stylesheets/social_stream/base/mixins/_buttons.css.sass
 - base/app/assets/stylesheets/social_stream/base/mixins/_colorfont.css.sass
 - base/app/assets/stylesheets/social_stream/base/mixins/_inputs.css.sass
 - base/app/assets/stylesheets/social_stream/base/mixins/_layout.css.sass
+- base/app/assets/stylesheets/social_stream/base/notifications.css.sass
 - base/app/assets/stylesheets/social_stream/base/notifications/_notifications.css.sass
 - base/app/assets/stylesheets/social_stream/base/notifications/layout/_notifications.css.sass
 - base/app/assets/stylesheets/social_stream/base/notifications/responsive/_responsive-1200px-min.css.sass
 - base/app/assets/stylesheets/social_stream/base/notifications/responsive/_responsive-767px-max.css.sass
 - base/app/assets/stylesheets/social_stream/base/notifications/responsive/_responsive-768px-979px.css.sass
+- base/app/assets/stylesheets/social_stream/base/profile.css.sass
 - base/app/assets/stylesheets/social_stream/base/profile/_profile.css.sass
 - base/app/assets/stylesheets/social_stream/base/profile/layout/_profile.css.sass
 - base/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-1200px-min.css.sass
 - base/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-767px-max.css.sass
 - base/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-768px-979px.css.sass
+- base/app/assets/stylesheets/social_stream/base/responsive.css.sass
 - base/app/assets/stylesheets/social_stream/base/responsive/_responsive-1200px-min.css.sass
 - base/app/assets/stylesheets/social_stream/base/responsive/_responsive-767px-max.css.sass
 - base/app/assets/stylesheets/social_stream/base/responsive/_responsive-768px-979px.css.sass
+- base/app/assets/stylesheets/social_stream/base/search.css.sass
 - base/app/assets/stylesheets/social_stream/base/search/_header.css.sass
+- base/app/assets/stylesheets/social_stream/base/select2.css.sass
 - base/app/assets/stylesheets/social_stream/base/select2/_sselect2.css.sass
 - base/app/assets/stylesheets/social_stream/base/select2/layout/_sselect2.css.sass
+- base/app/assets/stylesheets/social_stream/base/settings.css.sass
 - base/app/assets/stylesheets/social_stream/base/settings/_settings.css.sass
 - base/app/assets/stylesheets/social_stream/base/settings/layout/_settings.css.sass
 - base/app/assets/stylesheets/social_stream/base/settings/responsive/_responsive-1200px-min.css.sass
 - base/app/assets/stylesheets/social_stream/base/settings/responsive/_responsive-767px-max.css.sass
 - base/app/assets/stylesheets/social_stream/base/settings/responsive/_responsive-768px-979px.css.sass
+- base/app/assets/stylesheets/social_stream/base/sidebar.css.sass
 - base/app/assets/stylesheets/social_stream/base/sidebar/_sidebar.css.sass
 - base/app/assets/stylesheets/social_stream/base/sidebar/layout/_sidebar.css.sass
 - base/app/assets/stylesheets/social_stream/base/sidebar/responsive/_responsive-1200px-min.css.sass
+- base/app/assets/stylesheets/social_stream/base/timeline.css.sass
 - base/app/assets/stylesheets/social_stream/base/timeline/_timeline.css.sass
 - base/app/assets/stylesheets/social_stream/base/timeline/_wrapper_activities.css.sass
 - base/app/assets/stylesheets/social_stream/base/timeline/layout/_timeline.css.sass
 - base/app/assets/stylesheets/social_stream/base/timeline/layout/_wrapper_activities.css.sass
+- base/app/assets/stylesheets/social_stream/base/timeline/responsive/_responsive-1200px-min.css.sass
+- base/app/assets/stylesheets/social_stream/base/timeline/responsive/_responsive-767px-max.css.sass
+- base/app/assets/stylesheets/social_stream/base/timeline/responsive/_responsive-768px-979px.css.sass
+- base/app/assets/stylesheets/social_stream/base/toolbar.css.sass
 - base/app/assets/stylesheets/social_stream/base/toolbar/_toolbar.css.sass
 - base/app/assets/stylesheets/social_stream/base/toolbar/layout/_toolbar.css.sass
 - base/app/assets/stylesheets/social_stream/base/toolbar/responsive/_responsive-1200px-min.css.sass
@@ -414,36 +440,19 @@ files:
 - base/app/assets/stylesheets/social_stream/bootstrap-rewrite/_nav.scss
 - base/app/assets/stylesheets/social_stream/bootstrap-rewrite/_navbar.scss
 - base/app/assets/stylesheets/social_stream/bootstrap-rewrite/_variables.scss
-- base/app/assets/stylesheets/social_stream/fonts/BreeSerif-Regular.ttf
-- base/app/assets/stylesheets/social_stream/fonts/DIN_OSP-Original.ttf
-- base/app/assets/stylesheets/social_stream/fonts/DIN_OSP-Outline.ttf
-- base/app/assets/stylesheets/social_stream/fonts/DIN_OSP-Overlay.ttf
-- base/app/assets/stylesheets/social_stream/fonts/DIN_OSP/DIN_OSP-Original.ttf
-- base/app/assets/stylesheets/social_stream/fonts/DIN_OSP/DIN_OSP-Outline.ttf
-- base/app/assets/stylesheets/social_stream/fonts/DIN_OSP/DIN_OSP-Overlay.ttf
 - base/app/assets/stylesheets/social_stream/fonts/GiveYouGlory.ttf
+- base/app/assets/stylesheets/social_stream/fonts/JosefinSlabOverlay.ttf
+- base/app/assets/stylesheets/social_stream/fonts/JosefinSlabRegular-Outline.ttf
+- base/app/assets/stylesheets/social_stream/fonts/JosefinSlabRegular.ttf
 - base/app/assets/stylesheets/social_stream/fonts/OpenSans-Light.ttf
-- base/app/assets/stylesheets/social_stream/fonts/RockSalt.ttf
 - base/app/assets/stylesheets/social_stream/fonts/colorfont.css
 - base/app/assets/stylesheets/social_stream/fonts/fonts.css
 - base/app/assets/stylesheets/social_stream/fonts/opensans-regular-webfont.eot
 - base/app/assets/stylesheets/social_stream/fonts/opensans-regular-webfont.svg
 - base/app/assets/stylesheets/social_stream/fonts/opensans-regular-webfont.woff
 - base/app/assets/stylesheets/social_stream/fonts/opensans-regular.ttf
-- base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SIL OFL Font License
-  - Source Sans Pro.txt
-- base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Black.otf
-- base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-BlackIt.otf
-- base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Bold.otf
-- base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-BoldIt.otf
-- base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-ExtraLight.otf
-- base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-ExtraLightIt.otf
-- base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-It.otf
-- base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Light.otf
-- base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-LightIt.otf
-- base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Regular.otf
-- base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-Semibold.otf
-- base/app/assets/stylesheets/social_stream/fonts/source-sans-pro/SourceSansPro-SemiboldIt.otf
+- base/app/assets/stylesheets/social_stream/fonts/social-stream:fonts:colorfont.css.sass
+- base/app/assets/stylesheets/social_stream/fonts/social-stream:fonts:fonts.css.sass
 - base/app/controllers/activities_controller.rb
 - base/app/controllers/activity_actions_controller.rb
 - base/app/controllers/api_controller.rb
@@ -612,9 +621,10 @@ files:
 - base/app/views/frontpage/_presentation_default.html.erb
 - base/app/views/frontpage/_sponsor.html.erb
 - base/app/views/frontpage/index.html.erb
+- base/app/views/groups/_form.html.erb
 - base/app/views/groups/_group.html.erb
 - base/app/views/groups/_index.html.erb
-- base/app/views/groups/_new.html.erb
+- base/app/views/groups/_new_modal.html.erb
 - base/app/views/groups/_quick_search_result.html.erb
 - base/app/views/groups/_search_result.html.erb
 - base/app/views/groups/_show.html.erb
@@ -956,7 +966,7 @@ files:
 - documents/app/assets/javascripts/social_stream/document.js
 - documents/app/assets/javascripts/social_stream/documents.timeline.js
 - documents/app/assets/javascripts/social_stream/documents.wall.js
-- documents/app/assets/javascripts/social_stream/video.js.erb
+- documents/app/assets/javascripts/social_stream/video.js
 - documents/app/assets/stylesheets/social_stream-documents.css.sass
 - documents/app/assets/stylesheets/social_stream/documents/_toolbar.css.sass
 - documents/app/assets/stylesheets/social_stream/documents/aside/_documents.css.sass
@@ -993,6 +1003,7 @@ files:
 - documents/app/views/audios/_audio_processing.html.erb
 - documents/app/views/audios/_audio_show.html.erb
 - documents/app/views/audios/_new.html.erb
+- documents/app/views/audios/_player.html.erb
 - documents/app/views/audios/_quick_search_result.html.erb
 - documents/app/views/audios/_search_result.html.erb
 - documents/app/views/audios/_timeline.html.erb
@@ -1030,6 +1041,7 @@ files:
 - documents/app/views/pictures/index.html.erb
 - documents/app/views/pictures/show.html.erb
 - documents/app/views/videos/_new.html.erb
+- documents/app/views/videos/_player.html.erb
 - documents/app/views/videos/_quick_search_result.html.erb
 - documents/app/views/videos/_search_result.html.erb
 - documents/app/views/videos/_timeline.html.erb
@@ -1044,6 +1056,7 @@ files:
 - documents/app/worker/videoencoder.rb
 - documents/config/locales/en.yml
 - documents/config/locales/es.yml
+- documents/config/locales/zh.yml
 - documents/config/routes.rb
 - documents/db/migrate/20120208143721_create_social_stream_documents.rb
 - documents/lib/delayed_paperclip/social_stream-documents.rb
@@ -1134,6 +1147,7 @@ files:
 - events/app/views/events/_poster.html.erb
 - events/app/views/events/_quick_search_result.html.erb
 - events/app/views/events/_search_result.html.erb
+- events/app/views/events/_show_modal.html.erb
 - events/app/views/events/_timeline.html.erb
 - events/app/views/events/create.js.erb
 - events/app/views/events/destroy.js.erb
@@ -1148,6 +1162,7 @@ files:
 - events/app/views/sidebar/_calendar.html.erb
 - events/config/locales/en.yml
 - events/config/locales/es.yml
+- events/config/locales/zh.yml
 - events/config/routes.rb
 - events/db/migrate/20120330131859_create_social_stream_events.rb
 - events/lib/generators/social_stream/events/install_generator.rb
@@ -1175,6 +1190,7 @@ files:
 - lib/generators/social_stream/USAGE
 - lib/generators/social_stream/install_generator.rb
 - lib/social_stream.rb
+- lib/social_stream/components.rb
 - lib/social_stream/release/component.rb
 - lib/social_stream/release/component/version_file.rb
 - lib/social_stream/release/dependency_update.rb
@@ -1182,6 +1198,7 @@ files:
 - lib/social_stream/release/global/version_file.rb
 - lib/social_stream/release/kernel.rb
 - lib/social_stream/version.rb
+- lib/tasks/i18n.rake
 - lib/tasks/migrations.rake
 - linkser/.gitignore
 - linkser/.rspec
@@ -1218,6 +1235,7 @@ files:
 - linkser/app/views/links/show.html.erb
 - linkser/config/locales/en.yml
 - linkser/config/locales/es.yml
+- linkser/config/locales/zh.yml
 - linkser/config/routes.rb
 - linkser/db/migrate/20120208143739_create_social_stream_linkser.rb
 - linkser/lib/generators/social_stream/linkser/install_generator.rb
@@ -1235,8 +1253,11 @@ files:
 - linkser/spec/support/devise.rb
 - linkser/spec/support/mock.rb
 - linkser/vendor/assets/javascripts/jquery.jplayer.js
+- linkser/vendor/assets/jplayer.blue.monday.video.play.hover.png
+- linkser/vendor/assets/jplayer.blue.monday.video.play.png
 - linkser/vendor/assets/stylesheets/jplayer.blue.monday.css
 - linkser/vendor/assets/stylesheets/jplayer.blue.monday.jpg
+- linkser/vendor/assets/stylesheets/jplayer.blue.monday.png
 - linkser/vendor/assets/stylesheets/jplayer.blue.monday.video.play.hover.png
 - linkser/vendor/assets/stylesheets/jplayer.blue.monday.video.play.png
 - linkser/vendor/assets/stylesheets/jquery.lightbox.css
@@ -1290,6 +1311,7 @@ files:
 - oauth2_server/app/views/site/clients/show.html.erb
 - oauth2_server/config/locales/en.yml
 - oauth2_server/config/locales/es.yml
+- oauth2_server/config/locales/zh.yml
 - oauth2_server/config/routes.rb
 - oauth2_server/db/migrate/20130115102300_create_social_stream_oauth2_server.rb
 - oauth2_server/lib/generators/social_stream/oauth2_server/install_generator.rb
@@ -1333,6 +1355,7 @@ files:
 - ostatus/app/views/remote_subjects/_show.html.erb
 - ostatus/app/views/remote_subjects/show.html.erb
 - ostatus/config/locales/en.yml
+- ostatus/config/locales/zh.yml
 - ostatus/config/routes.rb
 - ostatus/db/migrate/20120905145030_create_social_stream_ostatus.rb
 - ostatus/lib/generators/social_stream/ostatus/install_generator.rb
@@ -1508,6 +1531,7 @@ files:
 - presence/app/views/xmpp/getOpenTokSessionIDAndToken.xml.builder
 - presence/config/locales/en.yml
 - presence/config/locales/es.yml
+- presence/config/locales/zh.yml
 - presence/config/routes.rb
 - presence/db/migrate/20120330132148_create_social_stream_presence.rb
 - presence/ejabberd/conf/ejabberd_example.cfg