Merge branch 'master' into ps-ember-update

.localeapp/log.yml

@@ -1,3 +1,3 @@
 ---
-:polled_at: 1361792606
+:polled_at: 1363093348
-:updated_at: 1361792606
+:updated_at: 1363093348

CONTRIBUTING.md

@@ -0,0 +1,15 @@
+# Contributing to Travis-CI
+Issues for any Travis-CI should be submitted to https://github.com/travis-ci/travis-ci/issues
+
+## Security Issues
+***Any security issues should be submitted directly to [security@travis-ci.org](mailto:security@travis-ci.org)***
+
+## Reporting Issues
+- Explain what you expected to happen vs the actual results
+- Include a screenshot if it helps illustrate the issue. https://github.com/blog/1347-issue-attachments
+- What steps are required to reproduce the issue
+- An example build that shows the issue
+
+## Submitting a PR to Travis-Web
+
+See testing and setup notes in the base [README](https://github.com/travis-ci/travis-web)

assets/scripts/app/templates/sponsors/decks.hbs

@@ -1,4 +1,4 @@
-<h4>{{t layouts.application.sponsers}}</h4>
+<h4>{{t layouts.application.sponsors}}</h4>
 
 <ul class="sponsors top">
   {{#each deck in controller}}

assets/scripts/app/templates/sponsors/links.hbs

@@ -1,5 +1,5 @@
 <div class="box">
-  <h4>{{t layouts.application.sponsers}}</h4>
+  <h4>{{t layouts.application.sponsors}}</h4>
 
   <ul class="sponsors bottom">
     {{#each controller}}

locales/de.yml

@@ -71,7 +71,7 @@ de:
       my_repositories: Meine Repositories
       recent: Aktuell
       search: Suche
-      sponsers: Sponsoren
+      sponsors: Sponsoren
       sponsors_link: Schaue alle unsere tollen Sponsoren an →
     mobile:
       author: Autor
@@ -96,6 +96,7 @@ de:
       sign_out: Abmelden
       signing_in: Anmelden...
       stats: Statistik
+      status: 
   locales:
     ca: 
     de: Deutsch

locales/en.yml

@@ -71,7 +71,7 @@ en:
       my_repositories: My Repositories
       recent: Recent
       search: Search
-      sponsers: Sponsors
+      sponsors: Sponsors
       sponsors_link: See all of our amazing sponsors →
     mobile:
       author: Author

locales/es.yml

@@ -71,7 +71,7 @@ es:
       my_repositories: Mis Repositorios
       recent: Reciente
       search: Buscar
-      sponsers: Patrocinadores
+      sponsors: Patrocinadores
       sponsors_link: Ver todos nuestros patrocinadores →
     mobile:
       author: Autor
@@ -96,6 +96,7 @@ es:
       sign_out: Desconectar
       signing_in: 
       stats: Estadísticas
+      status: 
   locales:
     ca: 
     de: Deutsch

locales/fr.yml

@@ -71,7 +71,7 @@ fr:
       my_repositories: Mes dépôts
       recent: Récent
       search: Chercher
-      sponsers: Sponsors
+      sponsors: Sponsors
       sponsors_link: Voir tous nos extraordinaire sponsors →
     mobile:
       author: Auteur
@@ -96,6 +96,7 @@ fr:
       sign_out: Déconnexion
       signing_in: 
       stats: Statistiques
+      status: 
   locales:
     ca: 
     de: Deutsch

locales/ja.yml

@@ -65,7 +65,7 @@ ja:
       my_repositories: マイリポジトリ
       recent: 最近
       search: 検索
-      sponsers: スポンサー
+      sponsors: スポンサー
       sponsors_link: スポンサーをもっと見る →
     mobile:
       author: 制作者
@@ -90,6 +90,7 @@ ja:
       sign_out: ログアウト
       signing_in: 
       stats: 統計
+      status: 
   locales:
     ca: 
     de: Deutsch

locales/nb.yml

@@ -71,7 +71,7 @@ nb:
       my_repositories: Mine kodelagre
       recent: Nylig
       search: Søk
-      sponsers: Sponsorer
+      sponsors: Sponsorer
       sponsors_link: Se alle de flotte sponsorene våre →
     mobile:
       author: Forfatter
@@ -96,6 +96,7 @@ nb:
       sign_out: Logg ut
       signing_in: 
       stats: Statistikk
+      status: 
   locales:
     ca: 
     de: Deutsch

locales/nl.yml

@@ -71,7 +71,7 @@ nl:
       my_repositories: Mijn repositories
       recent: Recent
       search: Zoeken
-      sponsers: Sponsors
+      sponsors: Sponsors
       sponsors_link: Bekijk al onze geweldige sponsors →
     mobile:
       author: Auteur
@@ -96,6 +96,7 @@ nl:
       sign_out: Uitloggen
       signing_in: 
       stats: Statistieken
+      status: 
   locales:
     ca: 
     de: Deutsch

locales/pl.yml

@@ -74,7 +74,7 @@ pl:
       my_repositories: Moje Repozytoria
       recent: Ostatnie
       search: Wyniki
-      sponsers: Sponsorzy
+      sponsors: Sponsorzy
       sponsors_link: Zobacz naszych wszystkich wspaniałych sponsorów →
     mobile:
       author: Autor
@@ -99,6 +99,7 @@ pl:
       sign_out: Wyloguj się
       signing_in: Zaloguj się
       stats: Statystki
+      status: 
   locales:
     ca: Čeština
     de: Deutsch

locales/pt-BR.yml

@@ -71,7 +71,7 @@ pt-BR:
       my_repositories: Meus Repositórios
       recent: Recentes
       search: Buscar
-      sponsers: Patrocinadores
+      sponsors: Patrocinadores
       sponsors_link: Conheça todos os nossos patrocinadores →
     mobile:
       author: Autor
@@ -96,6 +96,7 @@ pt-BR:
       sign_out: Sair
       signing_in: 
       stats: Estatísticas
+      status: 
   locales:
     ca: 
     de: Deutsch

locales/ru.yml

@@ -77,7 +77,7 @@ ru:
       my_repositories: Мои репозитории
       recent: Недавние
       search: Поиск
-      sponsers: Спонсоры
+      sponsors: Спонсоры
       sponsors_link: Список всех наших замечательных спонсоров →
     mobile:
       author: Автор
@@ -102,6 +102,7 @@ ru:
       sign_out: Выход
       signing_in: авторизация
       stats: Статистика
+      status: 
   locales:
     ca: 
     de: Deutsch