MrZYX
00b0519ed3
updated locales
2011-07-27 21:52:44 +02:00
MrZYX
ea5db03bdf
Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca
2011-07-26 18:41:47 +02:00
MrZYX
b95fd33eac
updated locales
2011-07-26 18:41:26 +02:00
Jordi Mallach
0237c54452
Merge branch 'master' of git://github.com/diaspora/diaspora
2011-07-26 10:27:45 +02:00
Jordi Mallach
835005ef02
Update Catalan translation to 658e836.
2011-07-26 10:27:29 +02:00
Andrej Kacian
658e836f4c
Make the "No tags" string translatable
2011-07-25 23:09:53 +02:00
Jordi Mallach
c5e3f7a231
Update Catalan translation to 384a71b.
2011-07-25 17:03:22 +02:00
Jordi Mallach
1471500166
Merge branch 'master' of git://github.com/diaspora/diaspora
2011-07-25 17:00:32 +02:00
Jordi Mallach
dcda19bc17
Update Catalan translation to e88c1510.
2011-07-25 16:53:54 +02:00
Jordi Mallach
1707612628
Add missing space.
2011-07-25 16:40:12 +02:00
Jordi Mallach
986306f03c
Fix overcapitalisation in reshare strings.
2011-07-25 16:27:29 +02:00
Jonne Hass
384a71bdc4
Merge pull request #1614 from ticho/1603-likes-i18n-fix
...
Fix for issue #1603 - use different i18n string for comment likes count
2011-07-25 07:20:24 -07:00
MrZYX
6425bdc47c
added esperanto to the available languages
2011-07-25 15:38:17 +02:00
MrZYX
47e2f70e96
Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca
2011-07-25 13:25:42 +02:00
MrZYX
072e48462b
updated locales
2011-07-25 13:25:16 +02:00
Jordi Mallach
e88c151031
Harmonise spelling of ‘email’ and capitalisation.
...
Use ‘email’ everywhere and avoid capitalisation where it’s not needed.
2011-07-25 12:37:40 +02:00
Jordi Mallach
7503b0775c
Merge branch 'master' of git://github.com/diaspora/diaspora
2011-07-25 12:26:00 +02:00
maxwell
7a5852e73a
fix a bug with openssl keys in development. note to future max and
...
rafi. never monkey patch anything on the top of a completely random
model. never again. ever.
TODO: look into replacing a monkey patch on a to_s in User#generate_key
that makes the single test green, but my dell had a heart attack other
places, that might just be sqlite3 or my dell
2011-07-24 20:06:07 -07:00
Raphael Sofaer
241999f72a
MS RS translated reshares
2011-07-22 17:58:52 -07:00
Raphael Sofaer
00885be738
Provide feedback when a user tries to double-reshare
2011-07-22 17:43:05 -07:00
Andrej Kacian
c1e5a83f15
Fix for issue #1603 - use different i18n string for comment likes count
2011-07-22 19:57:18 +02:00
Raphael Sofaer
7382dfb7be
Multi-server spec now successfully passes along a reshare
2011-07-21 18:23:33 -07:00
Raphael Sofaer
e19fb6d0f8
Use authority instead of host in order to get the port as well.
2011-07-21 18:23:33 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
bd1c8efe54
wip integration servers
2011-07-21 18:23:33 -07:00
danielgrippi
509a435cc9
moving to not including the post in the reshare xml
2011-07-21 18:22:17 -07:00
Maxwell Salzberg
06f886ad77
WIP reshare
2011-07-21 18:22:17 -07:00
Maxwell Salzberg
df62f58156
fixed the safe_buffer issues
2011-07-21 14:32:09 -07:00
Raphael Sofaer
9797e04957
Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change
...
Conflicts:
app/controllers/users_controller.rb
config/locales/diaspora/en.yml
db/schema.rb
spec/controllers/users_controller_spec.rb
spec/mailers/notifier_spec.rb
2011-07-19 10:44:00 -07:00
Jordi Mallach
956e2ead27
Update Catalan translation to 713f4dc.
2011-07-18 12:15:42 +02:00
Jordi Mallach
d8fce7a9db
Merge branch 'master' of git://github.com/diaspora/diaspora
2011-07-18 12:14:36 +02:00
Andrej Kacian
713f4dcc9d
Fix for issue #1600 : Missing string for translation ("Recent notifications")
2011-07-17 17:04:51 +02:00
Jordi Mallach
ae298e803a
Updated Catalan translation to 12cb51d.
2011-07-17 07:49:14 +02:00
Jordi Mallach
2262bb4dca
Merge branch 'master' of git://github.com/diaspora/diaspora
2011-07-17 07:38:13 +02:00
danielgrippi
12cb51d194
take ':' out of translation
2011-07-15 21:32:01 -07:00
danielgrippi
c4b715f3ff
fixed emails to show avatars, have subject lines that allow threading in email clients, and relevant content previews
2011-07-15 21:22:29 -07:00
Jonne Hass
8cfd2e02e1
Merge pull request #1583 from Gallaecio/master
...
Update of Galician (gl) translation
2011-07-15 15:28:42 -07:00
Adrián Chaves Fernández (Gallaecio)
bd8bedc22a
Had forgotten to use the right string delimiters (not needed, but hey, I want to do things right\!).
2011-07-15 12:05:07 +02:00
Adrián Chaves Fernández (Gallaecio)
282f68e624
Review of Galician (gl) translation of Diaspora finished.
2011-07-15 11:59:47 +02:00
Adrián Chaves Fernández (Gallaecio)
92b06323d3
Added correct string delimiters to the last strings of ‘diaspora/gl.yml’ file.
2011-07-15 11:55:53 +02:00
Adrián Chaves Fernández (Gallaecio)
80b72a9213
Minor (translation) fix for a string, the one related to the “time ago”.
2011-07-15 11:48:08 +02:00
Adrián Chaves Fernández (Gallaecio)
db22c60578
Minor (translation) fix for a string, the one related to the “time ago”.
2011-07-15 11:44:50 +02:00
Adrián Chaves Fernández (Gallaecio)
effd951f58
Finished the review of the Galician (gl) translation of ‘diaspora/(lang).yml’ file.
2011-07-15 11:40:55 +02:00
MrZYX
d88e86681d
updated locales
2011-07-14 20:29:55 +02:00
Adrián Chaves Fernández (Gallaecio)
8816e82ad4
Started revision of Galician (gl) translation of ‘diaspora/(lang).yml’ file. Progress: around 50%.
2011-07-14 18:20:07 +02:00
Adrián Chaves Fernández (Gallaecio)
5111279bfd
Removed unneeded character (probably problematic) after a string.
2011-07-14 12:59:15 +02:00
Adrián Chaves Fernández (Gallaecio)
cade8c4d04
Fixed usage of the wrong delimiter for strings with variables.
2011-07-14 12:55:59 +02:00
Adrián Chaves Fernández (Gallaecio)
0653f4fa4f
Updated Galician (gl) translation of ‘devise.yml’ file.
2011-07-14 12:38:52 +02:00
Jordi Mallach
2ea2e55353
Updated Catalan translation to 03e79da.
2011-07-13 20:18:32 +02:00
Arzumy MD
03e79da171
fixed missing i18n key for no_services
2011-07-13 12:17:47 +08:00
Raphael Sofaer
14759b2c80
Use person_link in notifications_helper, move hovercard css out to a file
2011-07-12 16:21:03 -07:00
