Skip to content

Commit

Permalink
git line normalization so windows end of line is OK
Browse files Browse the repository at this point in the history
added .gitattributes to handle line normalization
  • Loading branch information
weedySeaDragon committed Feb 16, 2015
1 parent d7688e7 commit 00b31cc
Show file tree
Hide file tree
Showing 9 changed files with 33 additions and 27 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Auto detect text files and perform LF normalization
* text=auto
1 change: 0 additions & 1 deletion config/locales/de.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ de:
blank: "'Veröffentlichen am' wird benötigt"
url:
start_with_slash: "URL darf nicht mit einem Schrägstrich anfangen ('/')"
unique: "URL wird bereits von einem anderen Beitrag verwendet"
monologue/user:
blank: "%{attribute} wird benötigt"
taken: "%{attribute} wurde schon benutzt"
Expand Down
1 change: 0 additions & 1 deletion config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ en:
blank: "'Published at' is required"
url:
start_with_slash: "URL can't start with a slash ('/')"
unique: "URL is already used by another post"
monologue/user:
blank: "%{attribute} is required"
taken: "%{attribute} has already been taken"
Expand Down
13 changes: 12 additions & 1 deletion config/locales/es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,18 @@ es:
comments:
show:
recent_comments: "Comentarios recientes"
cache:
show:
title: "Gestioanr cache"
description: "Puedes borrar la cache aquí"
files_in_cache: "Estos son los ficheros en cache:"
no_files_are_cached: "No hay ningun fichero en cache"
delete: "Borrar la cache por completo?"
confirm: 'Estas seguro de que quieres borrar la cache por completo?'
cache_wiped: "La cache se ha borrado!"
how_to_enable:
warning: "No puedes gestionar la cache!"
explanations: "Hay ciertos ajustes que no estan correctamente definidos para usar la cache de Monologue. Por favor revisa la documentación de configuración"
sessions:
new:
title: "Iniciar sesión"
Expand Down Expand Up @@ -128,7 +140,6 @@ es:
blank: "'Publicado en' es obligatorio"
url:
start_with_slash: "URL no puede empezar con '/'"
unique: "URL está en uso por otro artículo"
monologue/user:
blank: "%{attribute} es obligatorio"
taken: "%{attribute} ya está en uso"
Expand Down
2 changes: 0 additions & 2 deletions config/locales/fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ fr:
new:
create: "Ajouter"
header: "Ajouter un utilisateur"
create:
success: "L'utilisateur créé avec succès"
delete:
removed: "L'utilisateur '%{user}' a été supprimé"
failed: "L'utilisateur '%{user}' n'a pas pu être supprimé"
Expand Down
1 change: 0 additions & 1 deletion config/locales/it.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ it:
full_messages: "%{message}"
monologue/posts_revision:
blank: "%{attribute} è richiesto"
taken: "%{attribute} è già utilizzato da un altro post"
attributes:
published_at:
blank: "'Pubblicato il' è richiesto"
Expand Down
19 changes: 9 additions & 10 deletions config/locales/pt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,19 @@ pt_BR:
header: "Editar configurações de usuário"
save: "Salvar"
new:
create: "Criar"
header: "Adicionar um usuárior"
create: "TODO Create"
header: "TODO Add a user"
create:
success: "Usuário criado"
success: "TODO User created"
delete:
removed: "Usuário '%{user}' removido com sucesso"
failed: "Não poderia remover o usuário '%{user}'"
removed: "TODO User '%{user}' removed successfully"
failed: "TODO Could not remove user '%{user}'"
index:
email: "Email"
name: "Nome"
edit: "Editar"
delete: "Deletar"
create: "Criar"
create: "TODO Create"
posts:
index:
title: "Título"
Expand Down Expand Up @@ -108,11 +108,11 @@ pt_BR:
edit_user_info: "Minha conta"
settings: "Configurações"
log_out: "Sair"
users: "Usuários"
users: "TODO Users"
activerecord:
attributes:
monologue/user:
password_digest: "Confirmação de senha"
password_digest: "TODO Password confirmation"
errors:
format: "%{message}"
errors:
Expand All @@ -128,10 +128,9 @@ pt_BR:
blank: "'Data de publicação' é obrigatório"
url:
start_with_slash: "URL não pode começar com '/'"
unique: "URL já é utilizado por outro post"
monologue/user:
blank: "%{attribute} é obrigatório"
taken: "%{attribute} já utilizada por outro post"
taken: "TODO %{attribute} has already been taken"
attributes:
password:
confirmation: "Senha e confirmação diferem."
19 changes: 9 additions & 10 deletions config/locales/ro.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,19 @@ ro:
header: "Modificare cont"
save: "Salvati"
new:
create: "Crea"
header: "Adăugați un utilizator"
create: "TODO Create"
header: "TODO Add a user"
create:
success: "Utilizatorul a fost creat."
success: "TODO User created"
delete:
removed: "Utilizatorul '%{user}' a fost eliminat cu succes."
failed: "Nu a putut fi elimina utilizatorul '%{user}'"
removed: "TODO User '%{user}' removed successfully"
failed: "TODO Could not remove user '%{user}'"
index:
email: "Email"
name: "Nume"
edit: "Modificati"
delete: "Stergeti"
create: "Crea"
create: "TODO Create"
posts:
index:
title: "Titlu"
Expand Down Expand Up @@ -108,11 +108,11 @@ ro:
edit_user_info: "Contul meu"
settings: "Preferinte"
log_out: "Iesire"
users: "Utilizatorii"
users: "TODO Users"
activerecord:
attributes:
monologue/user:
password_digest: "Confirmarea parolei"
password_digest: "TODO Password confirmation"
errors:
format: "%{message}"
errors:
Expand All @@ -128,10 +128,9 @@ ro:
blank: "'Published at' este necesar"
url:
start_with_slash: "URL-ul nu poate incepe cu slash ('/')"
unique: "URL-ul este deja utilizat de un alt post"
monologue/user:
blank: "%{attribute} este necesar"
taken: "%{attribute} a fost deja luată"
taken: "TODO %{attribute} has already been taken"
attributes:
password:
confirmation: "Parola si confirmarea acesteia nu sunt identice."
2 changes: 1 addition & 1 deletion config/locales/tr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ tr:
blank: "'Gönderi tarihi' gerekli"
url:
start_with_slash: "URL ('/') ile başlayamaz"
unique: "URL zaten başka bir yazı tarafından kullanılan"

monologue/user:
blank: "%{attribute} gereklidir"
taken: "%{attribute} zaten kullanılmakta"
Expand Down

0 comments on commit 00b31cc

Please sign in to comment.