Skip to content

Commit 3364de4

Browse files
authored
I18n clean up (#611)
1 parent 18c4db5 commit 3364de4

File tree

6 files changed

+65
-218
lines changed

6 files changed

+65
-218
lines changed

config/locales/ca.yml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
ca:
22
active_admin:
3-
comments:
4-
author_type: Tipus d'autor
5-
resource_type: Tipus de recurs
63
users:
74
organization: Banc de temps
85
upload_csv: Fitxer
@@ -36,7 +33,6 @@ ca:
3633
phone: Telèfon
3734
public_opening_times: Horari d'atenció al públic
3835
reg_number_seq: Nombre de seqüència d'usuari
39-
theme: Tema visual
4036
updated_at: Actualitzat
4137
post:
4238
category: Categoria
@@ -154,28 +150,10 @@ ca:
154150
type_of_swaps: Tipus d'intercanvis
155151
users: Usuaris
156152
without_offers: Sense ofertes publicades
157-
organization_list:
158-
address: Direcció
159-
city: Ciutat
160-
description: Descripció
161-
email: Correu
162-
neighborhood: Barri
163-
not_member: No ets membre de cap Banc de Temps, per fer servir el sistema hauràs de posar-te en contacte amb un dels Bancs de Temps del sistema
164-
phone: Telèfon
165-
public_opening_times: Horari d'atenció al públic
166-
time_bank: Banc de Temps
167-
welcome: Benvingut a Timeoverflow %{user}.
168153
terms_conditions: Termes del servei
169154
tips:
170155
entertag: Introdueix etiquetes separades per comes
171156
user_not_found: Usuari no trobat.
172-
categories:
173-
index:
174-
add: Afegir servei
175-
all: Totes
176-
global: Globals
177-
local: Locals
178-
tree: Principals
179157
devise:
180158
confirmations:
181159
confirmed: El teu compte ha estat confirmat amb èxit.
@@ -534,13 +512,10 @@ ca:
534512
account_deactivated: El teu compte ha estat desactivat per aquest Banc de Temps
535513
actions: Accions
536514
active_warning: Estàs a punt de canviar l'estat de l'usuari %{username}
537-
active_warning_angular: Vas a canviar l'estat del compte de l'usuari {{username}}
538515
cancel_warning: Estàs a punt d'esborrar el compte de l'usuari %{username}
539-
cancel_warning_angular: Vas a eliminar del banc a l'usuari {{username}}
540516
create: Crear nou usuari
541517
deactivated_warning: 'Si creus que el vostre compte es podria haver desactivat per error, poseu-vos en contacte amb l''administrador amb la informació que es proporciona a continuació. '
542518
manage_warning: Estàs a punt de canviar els permisos de l'usuari %{username}
543-
manage_warning_angular: Vas a canviar els permisos de l'usuari {{username}}
544519
members: Membres
545520
user_created: Usuari %{uid} %{name} guardat
546521
member_card:

config/locales/en.yml

Lines changed: 63 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
en:
22
active_admin:
3-
comments:
4-
author_type: Author type
5-
resource_type: Resource type
63
users:
74
organization: Time bank
85
upload_csv: File
@@ -21,6 +18,10 @@ en:
2118
common:
2219
created_at: Created
2320
updated_at: Updated
21+
inquiry:
22+
is_group: Group inquiry
23+
offer:
24+
is_group: Group offer
2425
organization:
2526
address: Address
2627
city: City
@@ -32,12 +33,7 @@ en:
3233
phone: Phone
3334
public_opening_times: Opening hours
3435
reg_number_seq: User sequence number
35-
theme: Theme
3636
updated_at: Updated
37-
offer:
38-
is_group: Group offer
39-
inquiry:
40-
is_group: Group inquiry
4137
post:
4238
category: Category
4339
created_at: Created
@@ -61,22 +57,22 @@ en:
6157
alt_phone: Alternative Phone
6258
created_at: Created
6359
date_of_birth: Date of birth
60+
deactivated: Deactivated
6461
description: Description
6562
email: Email
6663
gender: Gender
6764
identity_document: Identity Document
6865
last_sign_in_at: Last login
6966
notifications: Receive email notifications
70-
push_notifications: Receive mobile notifications
7167
organization: Organization
7268
phone: Phone
69+
push_notifications: Receive mobile notifications
7370
registration_date: Registration date
7471
registration_number: User code
7572
superadmin: System Administrator
7673
unconfirmed_email: Unconfirmed Email
7774
updated_at: Updated
7875
username: Name
79-
deactivated: Deactivated
8076
errors:
8177
models:
8278
organization:
@@ -136,6 +132,7 @@ en:
136132
admin: Manage
137133
administration: Administration
138134
adminshort: Admin
135+
all_transfers: All transfers
139136
categories: Services
140137
demographics: Demographics data
141138
global_activity: Global activity
@@ -153,28 +150,10 @@ en:
153150
type_of_swaps: Type of transactions
154151
users: Users
155152
without_offers: Without offers
156-
organization_list:
157-
address: Address
158-
city: City
159-
description: Description
160-
email: Email
161-
neighborhood: Neighborhood
162-
not_member: You do not belong to any time bank at this moment, in order to use this platform you need to keep in touch with one of the time banks that have joint the platform
163-
phone: Phone
164-
public_opening_times: Opening hours
165-
time_bank: Time Bank
166-
welcome: Welcome to Timeoverflow %{user}.
167153
terms_conditions: Terms of service
168154
tips:
169155
entertag: Enter tags separated by commas
170156
user_not_found: User not found.
171-
categories:
172-
index:
173-
add: Add service
174-
all: All
175-
global: Global
176-
local: Local
177-
tree: Main
178157
devise:
179158
confirmations:
180159
confirmed: Your account was successfully confirmed.
@@ -225,20 +204,20 @@ en:
225204
registrations:
226205
destroyed: Bye! Your account was successfully cancelled. We hope to see you again soon.
227206
edit:
228-
cancel_account:
229-
current_password:
230-
edit_user:
231-
help_current_password:
232-
help_password:
233-
password:
234-
password_confirmation:
235-
unhappy:
236-
update:
207+
cancel_account: Cancel account
208+
current_password: Current password
209+
edit_user: Edit user
210+
help_current_password: Help current password
211+
help_password: Help Password
212+
password: Password
213+
password_confirmation: Password confirmation
214+
unhappy: Unhappy
215+
update: Update
237216
new:
238-
password:
239-
password_confirmation:
240-
sign_me_up:
241-
sign_up:
217+
password: Password
218+
password_confirmation: Password confirmation
219+
sign_me_up: Sign me up
220+
sign_up: Sign up
242221
signed_up: Welcome! You have signed up successfully.
243222
signed_up_but_inactive: You have signed up successfully. However, we could not sign you in because your account is not yet activated.
244223
signed_up_but_locked: You have signed up successfully. However, we could not sign you in because your account is locked.
@@ -285,10 +264,6 @@ en:
285264
description: The page you were looking for doesn't exist. You may have mistyped the address or the page may have moved.
286265
title: Not found
287266
global:
288-
from: From
289-
to: To
290-
next: Next
291-
create: Create
292267
add_new: Create new
293268
all: All
294269
amount: Quantity
@@ -297,19 +272,22 @@ en:
297272
balance: 'Balance:'
298273
cancel_membership: Permanent deletion
299274
contact_details: Contact details
275+
create: Create
300276
date: Data
301277
delete: Delete
302278
demote: Demote to normal user
303279
edit: Update
304280
enter_to_timebank: Enter to timebank
305281
filter: Filter
282+
from: From
306283
give_time: Time transfer
307284
home: Home
308285
information: Information
309286
locales_header: change language
310287
member_count: 'Number of users:'
311288
more: More
312289
movements: Transactions
290+
next: Next
313291
promote: Promote to administrator
314292
reason: Reason
315293
required_field: "* Required field"
@@ -320,6 +298,7 @@ en:
320298
statistics: Statistics
321299
table:
322300
actions: Actions
301+
to: To
323302
inquiries:
324303
edit:
325304
submit: Change inquiry
@@ -337,20 +316,39 @@ en:
337316
report:
338317
report_title: REPORT
339318
locales:
340-
ar:
319+
ar: Arabic
341320
ca: Catalan
342321
en: English
343322
es: Spanish
344-
eu:
345-
fr:
346-
gl:
347-
pt:
323+
eu: Basque
324+
fr: French
325+
gl: Galician
326+
pt: Portuguese
348327
pt-BR: Portuguese
349328
mailers_globals:
350329
footer:
351330
text: "%{organization_name} from"
352331
text_donation: The ADBdT association offers TimeOverflow for free to Time Banks. If you want to help maintain and improve the platform %{href}.
353332
text_donation_link: visit this website
333+
multi_transfers:
334+
multi_transfers: Multi transfers
335+
step:
336+
confirm:
337+
description: Confirm the changes
338+
type_of_transfer: Type of transfer
339+
select_type:
340+
description: Select the type of transfer
341+
set_params:
342+
description: Specify amount to transfer, reason, and post ( if any ).
343+
set_source:
344+
description: Select the account/s that will transfer time
345+
set_target:
346+
description: Select the account/s that will receive time
347+
success: Transfers created successfully
348+
types:
349+
many_to_one: Many to one
350+
one_to_many: One to many
351+
one_to_one: One to one
354352
offers:
355353
edit:
356354
submit: Change offer
@@ -381,6 +379,8 @@ en:
381379
contact_information: Contact information
382380
pages:
383381
about:
382+
app-mobile: Mobile App
383+
app-mobile-text: The mobile app TimeOverflow is available. <br /> This app has been possible thanks to the collaboration of the municipality of Barcelona, program %{impulsem_link} (Barcelona Activa) 2017-2018
384384
banner-button: Request access to TimeOverflow
385385
banner-subtitle: We will contact you to start it up or make you a demonstration
386386
banner-title: Are you a Time Bank?
@@ -404,15 +404,13 @@ en:
404404
feature-text-4: Members of a Time Bank can access the system and connect with other members
405405
feature-text-5: Posting of offers and inquiries
406406
feature-text-6: Pay hours to other members
407+
impulsem-link: Impulsem el que fas
407408
subtitle: TimeOverflow is open source, free and collaborative
408409
title: The software designed by and for
409410
title2: Time Banks
410-
app-mobile: Mobile App
411-
app-mobile-text: The mobile app TimeOverflow is available. <br /> This app has been possible thanks to the collaboration of the municipality of Barcelona, program %{impulsem_link} (Barcelona Activa) 2017-2018
412-
impulsem-link: "Impulsem el que fas"
413411
posts:
414412
show:
415-
info: "This %{type} belongs to %{organization}."
413+
info: This %{type} belongs to %{organization}.
416414
reports:
417415
cat_with_users:
418416
title: Offered Services
@@ -424,8 +422,8 @@ en:
424422
delete_reason: Are you sure to delete this comment?
425423
movements: Movements
426424
post_form:
427-
group_offer: Is it a group offer?
428425
group_inquiry: Is it a group inquiry?
426+
group_offer: Is it a group offer?
429427
you_can_use: You can use
430428
simple_form:
431429
error_notification:
@@ -492,25 +490,6 @@ en:
492490
accept: Accept
493491
show:
494492
accept: Accept
495-
multi_transfers:
496-
multi_transfers: 'Multi transfers'
497-
success: 'Transfers created successfully'
498-
types:
499-
one_to_many: 'One to many'
500-
many_to_one: 'Many to one'
501-
one_to_one: 'One to one'
502-
step:
503-
select_type:
504-
description: 'Select the type of transfer'
505-
set_source:
506-
description: 'Select the account/s that will transfer time'
507-
set_target:
508-
description: 'Select the account/s that will receive time'
509-
set_params:
510-
description: 'Specify amount to transfer, reason, and post ( if any ).'
511-
confirm:
512-
description: 'Confirm the changes'
513-
type_of_transfer: 'Type of transfer'
514493
transfers:
515494
computation:
516495
hour:
@@ -530,18 +509,18 @@ en:
530509
give_time:
531510
give_time: Give time to
532511
index:
533-
members: Members
512+
account_deactivated: Your account have been deactivated from this timebank
534513
actions: Actions
535514
active_warning: You are going to change user account status for %{username}
536-
active_warning_angular: You are going to change user account status for {{username}}
537515
cancel_warning: You are going to delete account from the Time Bank for user %{username}
538-
cancel_warning_angular: You are going to delete account from the Time Bank for user {{username}}
539516
create: Create new user
540-
account_deactivated: Your account have been deactivated from this timebank
541517
deactivated_warning: If you think your account might have been deactivated by mistake, please contact the administrator with the information provided below.
542518
manage_warning: You are going to change privileges for user %{username}
543-
manage_warning_angular: You are going to change privileges for user {{username}}
519+
members: Members
544520
user_created: User %{uid} %{name} saved
521+
member_card:
522+
active_ago: Active %{time} ago
523+
no_activity: No activity
545524
new:
546525
cancel: Cancel
547526
create_more_users_button: Create and add another user
@@ -573,13 +552,10 @@ en:
573552
cancel_warning: You are going to delete account from the Time Bank for user %{user}
574553
deactivate: Deactivate
575554
manage_warning: You are going to change privileges for user %{user}
576-
member_card:
577-
no_activity: No activity
578-
active_ago: Active %{time} ago
579555
views:
580556
pagination:
581-
first:
582-
last:
583-
next:
584-
previous:
585-
truncate:
557+
first: First
558+
last: Last
559+
next: Next
560+
previous: Previous
561+
truncate: Truncate

0 commit comments

Comments
 (0)