nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4296 commits 4 branches 0 tags 121 MiB
Commit graph

304 commits

Author SHA1 Message Date
J David Eisenberg
1a32766fb0 Issue #492: Informal, vague description when signing up as a new user 2010-11-01 16:42:47 +01:00
Curtis J Schofield
f693a97bf3 i put in a dash 2010-11-01 16:42:46 +01:00
livefromthemoon@gmail.com
60f6e091d3 Added missing strings to french translation 2010-11-01 00:27:32 +01:00
J David Eisenberg
f54820f456 Issue #496: Eliminate self-links in Getting Started 2010-10-31 12:16:07 -07:00
Abdulaziz Al-Shetwi
96906d9eaf Retranslate arabic localization. 2010-10-31 14:14:48 +03:00
Hexagon
0bef839261 Translating a huge amount of untranslated strings 2010-10-30 15:24:26 +02:00
Alec Leamas
58ead768d6 Small fix 2010-10-30 09:58:01 +02:00
Alec Leamas
68cba5da98 Merge branch 'se-l10n-update-2' of http://github.com/Hexagon/diaspora into Hexagon-se-l10n-update-2 2010-10-30 09:54:28 +02:00
Raphael
555c15dfef Simplify validations on user 2010-10-29 16:56:04 -07:00
Hexagon
99661a3240 Added swedish translations 2010-10-30 01:32:32 +02:00
danielvincent
8ec49e685b going to a non-friend's page contains a way to add them. 2010-10-29 15:43:44 -07:00
Alec Leamas
94327264d4 Comments on Swedish diaspora terms, trailing blanks killed 2010-10-29 11:11:56 +02:00
Hexagon
09fb02ec9f modified: config/locales/diaspora/sv.yml 2010-10-29 00:55:27 +02:00
danielvincent
1d5b7a87f1 Merge branch 'master' into getting-started 2010-10-27 18:14:08 -07:00
danielvincent
cd726c0ba7 users#getting_started route -> getting_started. getting_started is now a mini-template referring to partials in users/getting_started/ 2010-10-27 12:21:25 -07:00
Raphael
16e455958c Merge remote branch 'hexagon/se-localization' 2010-10-27 11:08:06 -07:00
Raphael
f700eb537a Add activemodel error message for person to en and fr locales 2010-10-27 10:27:30 -07:00
danielvincent
a8086f2990 further refinements. added back buttons, more explanation text. 2010-10-26 23:27:26 -07:00
Raphael
f975199f19 Merge remote branch 'mael/fr-locales' 2010-10-26 16:40:50 -07:00
danielvincent
6e015790a7 settings are more restful with account settings submitting to users#update, and profile settings submitting to person#update 2010-10-26 16:02:53 -07:00
Hexagon
1382bd9d08 Fixed header in swedish translation 2010-10-25 21:45:43 +02:00
Hexagon
d617392108 Added/complemented swedish translation 2010-10-25 21:41:32 +02:00
maelsoucaze
14ac908c3d French localizations updates. 2010-10-25 00:06:05 +02:00
maelsoucaze
294c8849b9 Merge remote branch 'upstream/master' into fr-locales 2010-10-25 00:04:24 +02:00
maxwell
bc9c852e25 fixed translation showing en on person show page when the person had no posts 2010-10-20 17:52:07 -07:00
ilya
94a7a3c6ad IZ MS; deleted move_friends removed 2010-10-20 14:26:45 -07:00
Joseph Method
4b588ccefb Addresses [#380] and [#239] by handling the errors from bad identities 2010-10-19 23:44:43 -04:00
danielvincent
0621aa2f6c fixed no friends/posts message positioning 2010-10-19 12:28:54 -07:00
danielvincent
ea00d35f1f padding on stream fix. added add aspect button in aspect nav. 2010-10-19 12:10:22 -07:00
ilya
d642928268 invite sends friend request if already friends, and raises if already friends 2010-10-18 16:27:02 -07:00
Joseph Method
e3e4a6b319 Continuation of previous commit 2010-10-17 19:07:54 -04:00
Sarah Mei
f688653936 disallow whitespace in username 2010-10-16 23:34:58 -07:00
Sarah Mei
d25847a626 Error message for duplicate email; add email validation spec. 2010-10-16 22:46:13 -07:00
Sarah Mei
83b23a0ffe Error message for duplicate username; refactor User validation specs. 2010-10-16 22:36:26 -07:00
maelsoucaze
34b21e7543 French localization updates. 2010-10-16 17:19:19 +02:00
danielvincent
db31357172 another typo change 2010-10-15 11:16:04 -07:00
danielvincent
d18b59f3d3 typo fix 2010-10-15 11:12:12 -07:00
Raphael
0680c2b5a6 Merge remote branch 'maelsoucaze/fr-locales' 2010-10-14 17:43:27 -07:00
Raphael
ecc7a55f8b Merge remote branch 'flea/master' 
Conflicts:
	.gitignore
 2010-10-14 17:24:46 -07:00
Raphael
08e629668d I18ning empty_messages 2010-10-14 16:55:00 -07:00
maelsoucaze
9134c4545c Fixes and updates French (Informal Honorifics) localization. 2010-10-15 01:17:33 +02:00
maelsoucaze
753deedc65 Fixes and updates French (Formal Honorifics) localization. 2010-10-15 01:17:17 +02:00
danielvincent
32a0f60a2f moved photos link to the side bar for now 2010-10-14 14:38:19 -07:00
Volkan Unsal
241d104bc1 change en to tr 2010-10-13 21:10:36 -04:00
ilya
36b9f66f60 the invited user keeps track of who invited them, limit on invites, 
removed the invites controller test
 2010-10-13 16:52:33 -07:00
ilya
324f14c719 setting the token to nil on accept of invite 2010-10-12 18:23:59 -07:00
ilya
bb7e2a9918 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-11 14:58:22 -07:00
ilya
007f6cfb6f close account 2010-10-11 14:58:11 -07:00
danielvincent
afad554f01 DG MS; added link to send invitation, consolidated locale file for devise invitable, upgraded devise to 1.1.3 in the gemfile 2010-10-11 13:42:05 -07:00
Volkan Unsal
73f06bb61b add devise.tr.yml 2010-10-11 15:09:43 -04:00
danielvincent
9bfb213465 Merge branch 'invites' of github.com:diaspora/diaspora into invites 2010-10-11 11:52:57 -07:00
Volkan Unsal
6d00b2ca8a correct some spelling errors in Turkish translation 2010-10-10 23:49:36 -04:00
Volkan Unsal
35ad703a5b Merge branch 'master' of http://github.com/diaspora/diaspora 2010-10-10 23:09:19 -04:00
Volkan Unsal
633048fbed finished Turkish translation 2010-10-10 23:06:56 -04:00
Nick van der Burgt
09b38bb726 Added dutch locale 2010-10-08 09:11:04 +02:00
ilya
4ecda6ab8f Merge branch 'master' of github.com:diaspora/diaspora into invites 
Conflicts:
	Gemfile
	Gemfile.lock
 2010-10-07 18:20:51 -07:00
Raphael
2bb36a266a Merge remote branch 'minilibra/master' 2010-10-07 17:32:20 -07:00
Raphael
1fd3aeabd9 Add or later to license notice 2010-10-07 16:25:34 -07:00
danielvincent
bd9e9043e0 fixed nb locale 2010-10-07 14:37:38 -07:00
minilibra
ae6f39a0d0 Localization file for Indonesian added. Change "en" at the top of both files to "id". Thanks to rsofaer. 2010-10-08 02:09:13 +07:00
Raphael
e47aa90b15 Merge remote branch 'Stigjb/master' 2010-10-07 11:06:27 -07:00
Raphael
d7bbb66d27 Run whitespace:cleanup 2010-10-07 10:47:37 -07:00
Raphael
0831812e97 Merge remote branch 'kashif/master' 2010-10-07 10:41:50 -07:00
Yaron Shahrabani
77d5b68e15 Fixed some typos 2010-10-06 08:29:58 +08:00
Daniele Di Sarli
5074d2f8f2 Updated Italian translation 2010-10-06 08:25:29 +08:00
UserAd
1d0a4579f6 Add missing localization for aspect managment 2010-10-06 07:56:23 +08:00
UserAd
e7c153df4e Add translation support in profile ('or' between buttons). Fix Russian locale 2010-10-06 07:56:23 +08:00
Stig Johan Berggren
ff7c8c7a50 Added locale files for Norwegian (bokmål) 
Localization files for Norwegian bokmål (nm) inserted. They have been
tested a little locally and do not produce any errors.
 2010-09-29 17:58:25 +02:00
Kashif Rasul
330cf63599 Arabic locale fixes. 2010-09-29 17:13:27 +02:00
Kashif Rasul
08ddae0894 Added devise Arabic locales and moved locale to correct folder. 2010-09-29 16:54:33 +02:00
Kashif Rasul
0fed72d505 Added Arabic locales. 2010-09-28 13:57:40 +02:00
ilya
a8f05244ba localization should be fixed 2010-09-27 16:07:24 -07:00
ilya
50234b095b had to move translation around slightly, now the profile edit will be missing a template 2010-09-27 16:02:08 -07:00
Guillermo
1a876355d5 Some fixes in spanish locale 2010-09-28 03:02:47 +08:00
Daniele Di Sarli
6b9bcfda63 Corrected Italian translation 2010-09-28 02:41:59 +08:00
Raphael
2f31e036e3 Merge branch 'cz' of http://github.com/koo5/diaspora 2010-09-27 11:36:04 -07:00
Raphael
ef2647c188 Merge branch 'master' of http://github.com/yarons/diaspora 2010-09-27 10:52:32 -07:00
Raphael
139102e488 Merge branch 'master' of http://github.com/bastos/diaspora 2010-09-27 10:11:28 -07:00
Yaron Shahrabani
08c0c345f5 Updated Hebrew translation 2010-09-27 09:49:38 +02:00
Dorian
611852bb74 Use rake whitespace:cleanup 2010-09-26 12:53:22 -04:00
Dorian
e792344c0e Use improved whitespace:scrub_gratuitous_newlines 2010-09-26 12:52:39 -04:00
Dorian
6ffc03a4c9 Big clean up: delete trailing whitespace 2010-09-26 12:48:40 -04:00
Stephen Caudill
fd69f0201f User creates an aspect 2010-09-26 12:05:39 -04:00
koo5
28e925e40a More czech translation goodness. I've added distance_in_words translations, feel free to delete it if it belongs somewhere/sometime else. 2010-09-26 06:01:39 +02:00
Yuval Adam
f2ddb8a39c added Hebrew (he) locale files 2010-09-26 04:49:39 +08:00
Tiago Bastos
5a4f40591d Added missing translations. 2010-09-25 11:25:45 -03:00
danielvincent
d59330264d fixed syntax error in italian locale 2010-09-24 16:18:41 -07:00
sennewood
dcedc5d505 Added the missing lines of code and translated them. 2010-09-25 06:39:59 +08:00
sennewood
16e5f972d1 Translation correction 2010-09-25 06:39:59 +08:00
sennewood
e2db21d7b0 Use double quotes in locale files 2010-09-25 06:39:59 +08:00
Daniele Di Sarli
8323e7dcb2 Added Italian translation 2010-09-25 06:35:43 +08:00
Raphael
8690967509 defaults doesn't really make sense when there's nothing else 2010-09-23 14:58:17 -07:00
Raphael
972cb54828 Move locale files, fix syntax error in fr-informal 2010-09-23 14:52:06 -07:00
Raphael
82bc5b097d Use double quotes in locale files 2010-09-23 14:43:38 -07:00
UserAd
cfd3523030 Stupid error fix 2010-09-24 05:02:30 +08:00
UserAd
7a9e347b28 Improved russian locale 2010-09-24 05:02:30 +08:00
Maël Soucaze
49162a6ead The underscore (fr_informal) is replaced by the hyphen (fr-informal). 2010-09-24 04:51:49 +08:00
Maël Soucaze
4cd83f9ae9 Change the file organization, and Casual Honorifics is now Informal Honorifics. 2010-09-24 04:51:49 +08:00
Maël Soucaze
d7eb828064 Language fix. 2010-09-24 04:51:48 +08:00
Maël Soucaze
c243304c97 Welcome to the French Casual Honorifics localization thanks to the brainchild of michael-k! 2010-09-24 04:51:03 +08:00
danielvincent
5d0f4dd587 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-23 10:29:50 -07:00
danielvincent
e6d1b8b808 fixed syntax in welsch translation 2010-09-23 10:29:36 -07:00
Dan Cirnat
4be2fdef8f Removed "sample" message from Romanian locale 2010-09-24 01:26:31 +08:00
Dan Cirnat
3d1ca6adc8 Romanian locale added 2010-09-24 01:26:31 +08:00
mousey
b1dd054fdb More Welsh Localization 2010-09-24 01:14:33 +08:00
mousey
1625f6b131 Welsh Language Localization. 2010-09-24 01:14:33 +08:00
Raphael
1964bd5ecf Hit the right thing in aspects move friend 2010-09-22 21:57:00 -07:00
Raphael
2489f8503f Merge branch 'master' into HEAD 
Conflicts:
	app/controllers/albums_controller.rb
	app/controllers/aspects_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/registrations_controller.rb
	app/controllers/requests_controller.rb
	app/helpers/dashboards_helper.rb
	app/views/albums/show.html.haml
	app/views/aspects/manage.html.haml
	app/views/shared/_aspect_nav.haml
	app/views/shared/_sub_header.haml
	app/views/status_messages/_status_message.html.haml
	app/views/status_messages/show.html.haml
	config/locales/de.yml
	config/locales/en.yml
	config/locales/es.yml
	config/locales/fr.yml
 2010-09-22 21:32:03 -07:00
Diógenes
c87ad060ab Add translation (from English locale) to Brazilian Portuguese 2010-09-23 01:15:10 +08:00
Michael Kaeufl
3b59175f43 fix in header 2010-09-21 04:17:04 +08:00
Michael Kaeufl
12f667e1b6 de: Ausloggen -> Abmelden 2010-09-21 04:17:04 +08:00
Michael Kaeufl
3f12b8b675 de translation: abgemeldet -> gekündigt 2010-09-21 04:16:19 +08:00
Michael Kaeufl
782373cc51 de translation: wieder -> erneut 2010-09-21 04:16:18 +08:00
Michael Kaeufl
f28a96e356 fix in header 2010-09-20 22:00:44 +02:00
Michael Kaeufl
c78538fedf Merge branch 'arielo-i18n' of github.com:michael-k/diaspora into arielo-i18n 2010-09-20 21:40:38 +02:00
Michael Kaeufl
ac667e6ec9 de: Ausloggen -> Abmelden 2010-09-20 21:39:56 +02:00
Michael Kaeufl
1c79677c7c some more german translations 2010-09-20 21:38:13 +02:00
Michael Kaeufl
54c137fd6b Merge branch 'felgru-locale-de' into arielo-i18n 2010-09-20 20:36:20 +02:00
gattytto
813dfae059 just a few 's' missing. :) 2010-09-21 02:01:48 +08:00
Alec Leamas
5e69292954 Typo fix 2010-09-21 01:50:56 +08:00
Alec Leamas
d1822d3dc8 Swedish translation 2010-09-21 01:50:46 +08:00
Ariel Zavala
1f78c3400b Started Spanish Locale 2010-09-21 01:48:54 +08:00
MrBison
1e5fc556a3 oops, a stupid error fixed 2010-09-21 01:48:13 +08:00
MrBison
6294cf502d oops, a stupid error. 2010-09-21 01:48:13 +08:00
Felix Gruber
88bb50660a better translation from sennewood 2010-09-21 01:47:46 +08:00
Felix Gruber
83520f593c some corrections from sennewood 2010-09-21 01:46:50 +08:00
Felix Gruber
852022ca79 change 'en' to 'de' in devise.de.yml 2010-09-21 01:46:50 +08:00
Felix Gruber
4c9ac0e5f6 initial german translation 2010-09-21 01:46:15 +08:00
Claudius Coenen
b8dc20e4bb adding german translation 2010-09-21 01:42:16 +08:00
Michael Kaeufl
5533f30840 de translation: abgemeldet -> gekündigt 2010-09-20 19:41:14 +02:00
Mikhail Zubrov
718b0715b3 add a Russian translation 2010-09-21 01:41:01 +08:00
Michael Kaeufl
c8d3ceae61 de translation: wieder -> erneut 2010-09-20 19:40:37 +02:00
Maël Soucaze
c884a25da6 French localization updated with arielo's changes. 2010-09-21 01:40:25 +08:00
Maël Soucaze
77acb6268e English localization updated with arielo's changes. 2010-09-21 01:40:25 +08:00
Maël Soucaze
aff4d783a6 French localisation. 2010-09-21 01:39:25 +08:00
Marcin Karpezo
a0a7d28e6d fixed translation 2010-09-21 01:22:05 +08:00
Marcin Karpezo
9130c85718 Translated en.yml 2010-09-21 01:21:37 +08:00
Marcin Karpezo
445c6784eb Translated devise.en.yml 2010-09-21 01:21:37 +08:00
moziz
850961f22e Corrected a typo and switched a few words so that the it sounds more 'official' and not slang. 2010-09-21 01:20:20 +08:00
Daniele Di Sarli
5b75c1634d corrected some Italian phrases 2010-09-21 01:04:49 +08:00
Felix Gruber
0203b9317b better translation from sennewood 2010-09-20 14:04:09 +02:00
Pedro Silva
230865aaa2 Added Portuguese Portugal locale 2010-09-20 00:58:57 +08:00
Felix Gruber
c4f420ec59 some corrections from sennewood 2010-09-19 18:15:36 +02:00
Ariel Zavala
e9f74675e9 Merged with diaspora; fixed conflicts; only 2 red 2010-09-19 11:16:00 -04:00
kook
6c6c7be1e5 oopsie 2010-09-19 10:28:33 +08:00
kook
c34e4caafa czech translation 2010-09-19 10:28:20 +08:00
danielvincent
2efde8a841 added missing quote in finnish locale 2010-09-18 15:50:35 -07:00
Danillo César
ac09f48cf8 Added locales files for portuguese brazilian. 2010-09-19 06:42:36 +08:00
’Jarkko
6cf5f6c8c7 Finnish locales 2010-09-19 06:39:32 +08:00
danielvincent
f034b180c2 quotation fix in italian locale 2010-09-18 15:36:42 -07:00