Merge pull request #117 from zoombody/fixes

Miscellaneous minor fixes
This commit is contained in:
Matt Rogers 2012-10-26 15:02:48 -07:00
commit 84fc7f9ece
10 changed files with 9 additions and 14 deletions

View file

@ -40,7 +40,7 @@ class UsersController < ApplicationController
end
if User.no_users_yet?
@page_title = t('users.new_user_title')
@page_title = t('users.first_user_title')
@heading = t('users.first_user_heading')
@user = get_new_user
elsif (@user && @user.is_admin?) || SITE_CONFIG['open_signups']

View file

@ -1,8 +1,8 @@
<div id="footer">
<p><%= t('footer.send_feedback', :version => TRACKS_VERSION) %>: <a href="http://www.assembla.com/spaces/tracks-tickets/tickets"><%= t('common.bugs')%></a> |
<p><%= t('footer.send_feedback', :version => TRACKS_VERSION) %>: <a href="https://www.assembla.com/spaces/tracks-tickets/tickets"><%= t('common.bugs')%></a> |
<a href="https://github.com/TracksApp/tracks/wiki"><%= t('common.wiki')%></a> |
<a href="mailto:tracksapp@googlegroups.com?subject=Tracks feedback"><%= t('common.email')%></a> |
<a href="http://www.getontracks.org/"><%= t('common.website')%></a> |
<a href="http://getontracks.org/development"><%= t('common.contribute')%></a></p>
<a href="http://groups.google.com/group/TracksApp"><%= t('common.mailing_list')%></a> |
<a href="http://getontracks.org/"><%= t('common.website')%></a> |
<a href="http://getontracks.org/development/"><%= t('common.contribute')%></a></p>
<%= link_to(t('layouts.navigation.mobile'), todos_path(:format => 'm')) %>
</div>

View file

@ -1 +1 @@
<div class="footer"><p>Mobile Tracks <%= TRACKS_VERSION %>: <a href="mailto:butshesagirl@rousette.org.uk?subject=Tracks feedback">Email</a> | <a href="http://www.getontracks.org/">Website</a> | <a href="http://getontracks.org/tracks/contribute">Contribute</a></p></div>
<div class="footer"><p>Mobile Tracks <%= TRACKS_VERSION %>: <a href="http://groups.google.com/group/TracksApp"><%= t('common.mailing_list')%></a> | <a href="http://getontracks.org/"><%= t('common.website')%></a> | <a href="http://getontracks.org/development/"><%= t('common.contribute')%></a></p></div>

View file

@ -106,7 +106,6 @@ cz:
errors_with_fields: "Nastaly potíže s následujícími polí?ky:"
first: První
forth: "?tvrtý"
forum: Fórum
fourth: "?tvrtý"
go_back: Zp?t
last: Poslední

View file

@ -105,7 +105,6 @@ de:
errors_with_fields: "Mit folgenden Feldern sind Probleme aufgetreten:"
first: Erste
forth: Vierte
forum: Forum
fourth: Vierte
go_back: Zurück
last: Letzte

View file

@ -110,7 +110,6 @@ en:
second: Second
month: month
server_error: An error occurred on the server.
forum: Forum
notes: Notes
review: Review
last: Last
@ -150,6 +149,7 @@ en:
weeks: weeks
wiki: Wiki
email: Email
mailing_list: Mailing List
search: Search
ajaxError: There was an error retrieving from server
days_midsentence:
@ -838,7 +838,8 @@ en:
label_auth_type: Authentication type
new_password_label: New password
you_have_to_reset_your_password: "You have to reset your password"
new_user_title: TRACKS::Sign up as the admin user
first_user_title: TRACKS::Sign up as the admin user
new_user_title: TRACKS::Sign up
destroy_user: Destroy user
total_users_count: You have a total of %{count} users
destroy_confirmation: "Warning: this will delete user '%{login}', all their actions, contexts, project and notes. Are you sure that you want to continue?"

View file

@ -105,7 +105,6 @@ es:
errors_with_fields: "Ha habido problemas con los siguientes campos:"
first: Primero
forth: Siguiente
forum: Foro
fourth: Cuarto
go_back: "Volver atrás"
last: Último

View file

@ -106,7 +106,6 @@ fr:
errors_with_fields: "Il y a des problème avec les champs suivants :"
first: Premier
forth: FORTH
forum: Forum
fourth: Quatrième
go_back: Retour
last: Dernier

View file

@ -102,7 +102,6 @@ he:
errors_with_fields: "?????? ????? ?????????"
first: "?????"
forth: "?????"
forum: "?????"
fourth: "?????"
go_back: "????"
last: "?????"

View file

@ -106,7 +106,6 @@ nl:
errors_with_fields: "Er waren problemen met de volgende velden"
first: Eerste
forth: Vierde
forum: Forum
fourth: Vierde
go_back: "Ga terug"
last: Laatste