From 7cd26684e1a649d2756ff5fcec9637c85a35914f Mon Sep 17 00:00:00 2001 From: goobertron Date: Tue, 13 Aug 2013 13:45:17 +0100 Subject: [PATCH] Updated branding to diaspora* (text and logo) Plus minor corrections and fixes. --- app/assets/images/logo.png | Bin 4172 -> 1820 bytes app/assets/stylesheets/main.css.scss | 5 +- app/views/layouts/application.html.erb | 7 +- app/views/pages/get_involved.html.erb | 43 ++++----- app/views/pages/index.html.erb | 14 ++- config/locales/devise.en.yml | 34 +++---- config/locales/en.yml | 117 +++++++++++++------------ 7 files changed, 114 insertions(+), 106 deletions(-) diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png index fd7767260af21065e484df64624691cf02706aa5..9f111e98d7ceaf45b24b30cfa97cd6940b15bb44 100644 GIT binary patch literal 1820 zcmaKtX*Ao37Qp|!ax4=qT1%6neVnS+D2WhCM1U9BLJuH_^=40v$3I35k3*2 z;mJ4NMmPX~a@$$7)1{=z{teBIK+%6GmuAiEXoinmvm z(zjk)Q0POF>`T@_b>t(cF#tRKzc&4aK*hCaZO7Rc6?o=GMO)=YC6(*VZessrEY0 z^8V-20eJJO6}5Lcql3!`XpcbU$Ar}FPnErqNG7M5aqVwqaB&Y?SvqrsKSGuAO0rHsn!_lUR<-q!xCTVizLCm(+fuopdgMS_ zd%r-hz~qV>Rf`2i*?rru=MfbYXg{x5NWq(i&g+JTKyIH z3lrA05be1i49-31M$JMvg*x^)dZ7_O=?;8vr9mVd$6wq)=1gu69P$UxacTO5oWj~h z*nm#vJjc0|Xne;@?fkx?@-yD3(bT(=9pCec+KUHr73+pq`ZmYaITvPN;S6avV>~T! zN2x;T>4HvjgGby?cAk7&3peP{^peX2OlNDEvcCv?+Eg}gJ_;EPJE{Lz4*GeOc`^_z z`r)QPypAlJlIw*%8Yfi6?x&D+y38&j`XCUd?p&WmGiR+4)po?5G-=#!jDI zJ@i;{v@GP5DcnFvD#gkg6NSqr$clob5pq&aX!kK3czvU_riR!3(TT=B4O;QVoVFQP z6H8{?l~$H@%8#8Wa}nuB?7=3Cq^QKXLmX>F=Ss$G;UQa*g^u+>G~1M|E$eElMs_)T zU56ibv{G$Ow*`32H!Bluw*h1*?i%41ucKFekHZ}TLd4ad` zY=7!}{H9os7IzxY3gJ2s3(d4h-`m!?k19e6sd~7)2Fl^9C(=iE}q%NQv292 zS~@gYFU?GOpuq;A;q$6XaIpb->Jv}Byd=6i!@p+SdV_~4kE^1KAC5`U`w9FbhUSAK zq_^vc0Q04BGvX=kMj!RX?b&EcK|X5|e+c2g*FGG*)2a-Hov7LiHCH_LX+|41fhLTv zvge}I^Q_?7+0yQAdo}lL7zI^IeE&oVNK^g)hWPtye`^zBpurH&_W;lV`NlOJ3362n ZAits^pe@C~Y*%-{Sr-p<^_eU8{tMY1Uj+aF literal 4172 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 If?!eq0Rd;vY5)KL diff --git a/app/assets/stylesheets/main.css.scss b/app/assets/stylesheets/main.css.scss index a3d20ff..7178a68 100644 --- a/app/assets/stylesheets/main.css.scss +++ b/app/assets/stylesheets/main.css.scss @@ -24,7 +24,6 @@ header nav a { color: #ddd; font-size: 14px; - text-transform: uppercase; text-decoration: none; padding: 5px 8px; } header nav a:hover { @@ -43,6 +42,10 @@ #mainnav.pull-right { margin-top: 12px; + + ul.nav { + text-transform: lowercase; + } a.btn { margin-top: 2px; diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index accfdec..3df8d04 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -17,7 +17,7 @@
<%= link_to root_path, class: 'brand' do %> - <%= image_tag 'logo.png', alt: t('title'), title: t('title'), id: 'header-logo' %> + <%= image_tag 'logo.png', alt: t('title'), title: t('title'), id: 'header-logo', height: '65', width: '228' %> <% end %>
diff --git a/app/views/pages/get_involved.html.erb b/app/views/pages/get_involved.html.erb index 90cb998..d58502b 100644 --- a/app/views/pages/get_involved.html.erb +++ b/app/views/pages/get_involved.html.erb @@ -50,8 +50,7 @@
  • - <%= t 'pages.get_involved.code_ex2' %> - . + <%= t 'pages.get_involved.code_ex2' %>.
  • <%= t 'pages.get_involved.code_ex3' %>
    • @@ -67,8 +66,7 @@ <%= t 'pages.get_involved.code_ex7' %> - <%= t 'pages.get_involved.code_ex8' %> - . + <%= t 'pages.get_involved.code_ex8' %>.

    @@ -93,8 +91,7 @@
  • <%= t 'pages.get_involved.bugs_ex2' %> - <%= t 'pages.get_involved.bugs_ex3' %> - . + <%= t 'pages.get_involved.bugs_ex3' %>.
    • @@ -108,8 +105,7 @@
  • <%= t 'pages.get_involved.translate_ex1' %> - <%= t 'pages.get_involved.translate_ex2' %> - . + <%= t 'pages.get_involved.translate_ex2' %>.
  • <%= t 'pages.get_involved.translate_ex3' %> @@ -130,8 +126,7 @@
  • <%= t 'pages.get_involved.voice_ex1' %> - <%= t 'pages.get_involved.voice_ex2' %> - . + <%= t 'pages.get_involved.voice_ex2' %>.
  • <%= t 'pages.get_involved.voice_ex3' %> @@ -152,14 +147,12 @@
  • <%= t 'pages.get_involved.support_ex1' %> - <%= t 'pages.get_involved.support_ex2' %> - + <%= t 'pages.get_involved.support_ex2' %>.
  • <%= t 'pages.get_involved.support_ex3' %> - <%= t 'pages.get_involved.support_ex4' %> - + <%= t 'pages.get_involved.support_ex4' %>.
  • <%= t 'pages.get_involved.support_ex5' %> @@ -171,8 +164,7 @@
  • <%= t 'pages.get_involved.support_ex8' %> - <%= t 'pages.get_involved.support_ex9' %> - . + <%= t 'pages.get_involved.support_ex9' %>.
    • @@ -186,8 +178,7 @@
  • <%= t 'pages.get_involved.run_ex1' %> - <%= t 'pages.get_involved.run_ex2' %> - . + <%= t 'pages.get_involved.run_ex2' %>.
  • <%= t 'pages.get_involved.run_ex3' %>
  • @@ -228,7 +219,7 @@

    - Daniel is responsible for Diaspora*'s good looks and + Daniel is responsible for diaspora*'s good looks and product cohesiveness. His pants are tight and his v-necks are deep.

    @@ -275,7 +266,7 @@

    - Raphael is the young-wise soul of Diaspora*. He currently is headed + Raphael is the young-wise soul of diaspora*. He currently is headed back to NYU, but he can still be seen trolling our list servs and IRC room.

    @@ -473,7 +464,7 @@

    - Vittorio is Italian, and he started coding for Diaspora* + Vittorio is Italian, and he started coding for diaspora* with his GSoC project about implementing XMPP IM and videochat. He is writing his thesis about it, while fixing some bugs.

    @@ -572,10 +563,10 @@

    - Sean is Diaspora*'s community manager. An aspiring web developer + Sean is diaspora*'s community manager. An aspiring web developer and independent tech journalist based in Illinois, he likes writing - about Diaspora*, making usability designs, and interacting with the - Diaspora* developer community. + about diaspora*, making usability designs, and interacting with the + diaspora* developer community.

    @@ -714,7 +705,7 @@ The Diaspune guy, Debian guru, free software advocate and contributor, Chamba Open Movie Project coordinator, Swathanthra Malayalam Computing - admin. Runs Diaspora*'s Debian packaging team. + admin. Runs diaspora*'s Debian packaging team. j4v4m4n.in.

    @@ -819,7 +810,7 @@

    Just another Italian girl, studying social psychology and loving - computers, open-source and Diaspora*. Loves her town, living + computers, open-source and diaspora*. Loves her town, living abroad and speaking French.

    diff --git a/app/views/pages/index.html.erb b/app/views/pages/index.html.erb index 584e092..501d8b9 100644 --- a/app/views/pages/index.html.erb +++ b/app/views/pages/index.html.erb @@ -3,7 +3,7 @@

    <%= t 'pages.home.headline' %>

    -

    <%= t 'pages.home.welcome_paragraph' %>

    +

    <%= t 'pages.home.byline' %>

    @@ -71,6 +71,11 @@ <%= t 'pages.home.choose_pod_exp' %> Pod Uptime.

    +

    + + <%= t 'pages.home.find_more' %> + +

    <%= t 'pages.home.sign_up' %>

    @@ -80,7 +85,7 @@ <%= t 'pages.home.sign_up_ex2' %>

    - + <%= t 'pages.home.register' %>

    @@ -92,6 +97,11 @@

    <%= t 'pages.home.join_convo_ex' %>

    +
    diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml index d01f375..e92fd43 100644 --- a/config/locales/devise.en.yml +++ b/config/locales/devise.en.yml @@ -8,45 +8,45 @@ en: send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes." failure: already_authenticated: "You are already signed in." - inactive: "Your account was not activated yet." + inactive: "Your account has not yet been activated." invalid: "Invalid email or password." invalid_token: "Invalid authentication token." locked: "Your account is locked." not_found_in_database: "Invalid email or password." - timeout: "Your session expired, please sign in again to continue." + timeout: "Your session has expired; please sign in again to continue." unauthenticated: "You need to sign in or sign up before continuing." - unconfirmed: "You have to confirm your account before continuing." + unconfirmed: "You need to confirm your account before continuing." mailer: confirmation_instructions: subject: "Confirmation instructions" reset_password_instructions: subject: "Reset password instructions" unlock_instructions: - subject: "Unlock Instructions" + subject: "Unlock instructions" omniauth_callbacks: failure: "Could not authenticate you from %{kind} because \"%{reason}\"." success: "Successfully authenticated from %{kind} account." passwords: - no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided." - send_instructions: "You will receive an email with instructions about how to reset your password in a few minutes." - send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes." - updated: "Your password was changed successfully. You are now signed in." - updated_not_active: "Your password was changed successfully." + no_token: "You can only access this page by clicking the link provided in a password reset email. If you have copied the link from a password reset email, please make sure you copied the entire URL provided." + send_instructions: "You will receive an email in a few minutes with instructions about how to reset your password." + send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link in your inbox in a few minutes." + updated: "Your password has successfully been changed. You are now signed in." + updated_not_active: "Your password has successfully been changed." registrations: - destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon." + destroyed: "Bye! Your account has successfully been deleted. We hope to see you again soon." signed_up: "Welcome! You have signed up successfully." - signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated." - signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked." + signed_up_but_inactive: "You have successfully signed up. However, we could not sign you in because your account is not yet activated." + signed_up_but_locked: "You have successfully signed up. However, we could not sign you in because your account is locked." signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please open the link to activate your account." - update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address." - updated: "You updated your account successfully." + update_needs_confirmation: "You have successfully updated your account, but we need to verify your new email address. Please check your inbox and click on the confirm link to finalise confirmation of your new email address." + updated: "You have successfully updated your account." sessions: signed_in: "Signed in successfully." signed_out: "Signed out successfully." unlocks: - send_instructions: "You will receive an email with instructions about how to unlock your account in a few minutes." - send_paranoid_instructions: "If your account exists, you will receive an email with instructions about how to unlock it in a few minutes." - unlocked: "Your account has been unlocked successfully. Please sign in to continue." + send_instructions: "You will receive an email in a few minutes containing instructions about how to unlock your account." + send_paranoid_instructions: "If your account exists, you will receive an email in a few minutes containing instructions about how to unlock it." + unlocked: "Your account has successfully been unlocked. Please sign in to continue." errors: messages: already_confirmed: "was already confirmed, please try signing in" diff --git a/config/locales/en.yml b/config/locales/en.yml index 26ea972..09ef2c7 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,25 +1,25 @@ en: buttons: - host_yourself: 'Host yourself' - join_diaspora: 'Join Diaspora*' + host_pod: 'Host a pod' + join_diaspora: 'Join us!' meta: footer: - copyleft: 'CC-BY The Diaspora* Foundation' - title: 'The Diaspora* Project' + copyleft: 'CC-BY The diaspora* Foundation' + title: 'The diaspora* Project' pages: home: - headline: 'Welcome to Diaspora*' - welcome_paragraph: 'The online social world where you are in control.' + headline: 'Welcome to diaspora*' + byline: 'The online social world where you are in control.' find_more: "Find out more »" register: "Sign up »" - key_philosophies: 'Diaspora* is based on three key philosophies:' + key_philosophies: 'diaspora* is based on three key philosophies:' decentralization: 'Decentralization' - decentralization_about: 'Instead of everyone’s data being contained on huge central servers owned by a large organization, local servers (‘pods’) can be set up anywhere in the world. You choose which pod to register with - perhaps your local pod - and seamlessly connect with the Diaspora* community worldwide.' + decentralization_about: 'Instead of everyone’s data being contained on huge central servers owned by a large organization, local servers (‘pods’) can be set up anywhere in the world. You choose which pod to register with - perhaps your local pod - and seamlessly connect with the diaspora* community worldwide.' freedom: 'Freedom' - freedom_about: "You can be whoever you want to be in Diaspora*. Unlike some networks, you don't have to use your real identity. You can interact with whomever you choose in whatever way you want. The only limit is your imagination. Diaspora* is also Free Software, giving you liberty to use it as you wish." + freedom_about: "You can be whoever you want to be in diaspora*. Unlike some networks, you don't have to use your real identity. You can interact with whomever you choose in whatever way you want. The only limit is your imagination. diaspora* is also Free Software, giving you liberty to use it as you wish." privacy: 'Privacy' - privacy_about: "In Diaspora* you own your data. You do not sign over any rights to a corporation or other interest who could use it. With Diaspora*, your friends, your habits, and your content is your business...not ours! In addition, you choose who sees what you share, using Aspects." + privacy_about: "In diaspora* you own your data. You do not sign over any rights to a corporation or other interest who could use it. With diaspora*, your friends, your habits, and your content is your business...not ours! In addition, you choose who sees what you share, using Aspects." get_started: 'Want to get started?' get_started_sub: "It's as easy as 1, 2, 3 ..." choose_pod: "1. Choose a pod" @@ -28,54 +28,54 @@ en: sign_up_ex1: "Once you've decided which pod is right for you, based on the ratings and information at " sign_up_ex2: "and maybe recommendations from people you trust, sign up there and create a profile with as much or as little personal information as you like. You are in control about how much you share." join_convo: "3. Join the conversation!" - join_convo_ex: "Start following some #tags related to your interests: it could be #music, #photography, #privacy or #linux - whatever you're into. Post a message with the #newhere tag to introduce yourself, and away you go. You're now part of the vibrant Diaspora* community." + join_convo_ex: "Start following some #tags related to your interests: it could be #music, #photography, #privacy or #linux - whatever you're into. Post a message with the #newhere tag to introduce yourself, and away you go. You're now part of the vibrant diaspora* community." aspects: "Aspects" - aspects_ex: "Diaspora* pioneered the concept of aspects, which enables you to organise your contacts according to their role in your life. This means you can share something just with family members or work colleagues, knowing that no one you don't want to will be able to see what you post." + aspects_ex: "diaspora* pioneered the concept of aspects, which enables you to organise your contacts according to their role in your life. This means you can share something just with family members or work colleagues, knowing that no one you don't want to will be able to see what you post." features: "Features" - features_ex: "Hashtags give you the freedom to label and follow your interests with ease. You can catch people's attention by @-mentioning them. Reshare posts you love so others can enjoy and comment on them too. And show your love for other people's work by ♥-ing it." + features_ex: "Hashtags give you the freedom to label and follow your interests with ease. You can catch people's attention by @mentioning them. Reshare posts you love so others can enjoy and comment on them too. And show your love for other people's work by ♥ing it." help: "Want to help?" - help_ex: "Diaspora* needs people to write and test code, welcome and help new members, set up and maintain community pods, and spread the word about the benefits of Diaspora* to others who might want to take part. Think you'd like to contribute to the project?" + help_ex: "diaspora* needs people to write and test code, welcome and help new members, set up and maintain community pods, and spread the word about the benefits of diaspora* to others who might want to take part. Think you'd like to contribute to the project?" socialint: "Social network integration" - socialint_ex: "Diaspora* lets you stay connected with your friends, even if they're not yet on Diaspora*. Simply connect your account to other major services, then use Diaspora* as your home base to post to your profiles on these other services too. Diaspora* currently supports cross-posting to your Facebook, Twitter, and Tumblr accounts, with more to come soon. " + socialint_ex: "diaspora* lets you stay connected with your friends, even if they're not yet on diaspora*. Simply connect your account to other major services, then use diaspora* as your home base to post to your profiles on these other services too. diaspora* currently supports cross-posting to your Facebook, Twitter, and Tumblr accounts, with more to come soon. " about: - headline: 'How does Diaspora* work?' - byline: "Diaspora* is simple to use. Here's how." + headline: 'How does diaspora* work?' + byline: "diaspora* is simple to use. Here's how." menu_title: 'About' decentralize: "What is decentralization?" - decentralize_ex: "Diaspora* is completely different from most networks that you use. It is completely decentralized, with no central 'hub'. Even so, it's very easy to connect and communicate with people. Here's how." + decentralize_ex: "diaspora* is completely different from most networks that you use. It is completely decentralized, with no central 'hub'. Even so, it's very easy to connect and communicate with people. Here's how." this: "THIS" - this_ex: "Diaspora* is a true network, with no central base. There are servers (‘pods’) all over the world, each containing the data of those users who have chosen to register with it. These pods communicate with each other seamlessly, so that you can register with any pod and communicate freely with your contacts, wherever they are on the network." + this_ex: "diaspora* is a true network, with no central base. There are servers (‘pods’) all over the world, each containing the data of those users who have chosen to register with it. These pods communicate with each other seamlessly, so that you can register with any pod and communicate freely with your contacts, wherever they are on the network." notthis: "NOT THIS" notthis_ex: "Most social networks are run from centralized servers owned and run by a corporation. These store all the private data of their users. This information can be lost or hacked, and like any system with a bottleneck, any problem at the central servers can make the whole network run very slowly, or not at all. It is also more easy for governments to 'listen in'." - discl1: "(Diaspora* uses open web standards such as " + discl1: "(diaspora* uses open web standards such as " discl2: " and " discl3: " to make this kind of connection possible.) " connect: "How do I connect?" - connect_ex: "Even though Diaspora* is made up of many pods all over the world, you will experience it as one integrated network. You don't need to be on the same pod as your contacts in order to communicate freely with each other - communication happens seamlessly across all the pods in the Diaspora* universe. When you're using Diaspora*, you can easily forget that it's actually made up of many pods. Connecting with someone in Diaspora* is actually really simple: " + connect_ex: "Even though diaspora* is made up of many pods all over the world, you will experience it as one integrated network. You don't need to be on the same pod as your contacts in order to communicate freely with each other - communication happens seamlessly across all the pods in the diaspora* universe. When you're using diaspora*, you can easily forget that it's actually made up of many pods. Connecting with someone in diaspora* is actually really simple: " find: "1. Find them" - find_ex: "All you need to do to connect to someone is find them and add them to an aspect. (See below for more on aspects.) Find them using the search field in the black bar, or hover over their name in your stream and a hovercard will appear. If you know their Diaspora* handle (yourname@podname.com), you can use that." + find_ex: "All you need to do to connect to someone is find them and add them to an aspect. (See below for more on aspects.) Find them using the search field in the black bar, or hover over their name in your stream and a hovercard will appear. If you know their diaspora* ID (yourname@podname.com), you can use that." add: "2. Add them" add_ex: "Then it's just a matter of clicking the 'Add contact' button and choose which aspect you want them to be part of. You're now connected and can share with them as you would on any other network. Or, if they're part of different aspects of your life, add them to multiple aspects. You're now connected. It's as easy as that. " freedom: "Freedom" - freedom_byline: "Diaspora* doesn't try to limit you" + freedom_byline: "diaspora* doesn't try to limit you" fdm1: "Be who you want to be" - fdm1_ex: "A lot of networks insist that you use your real identity. Not Diaspora*. Here you can choose who you want to be, and share as much or as little about yourself as you want. It really is up to you how you want to interact with other people." + fdm1_ex: "A lot of networks insist that you use your real identity. Not diaspora*. Here you can choose who you want to be, and share as much or as little about yourself as you want. It really is up to you how you want to interact with other people." fdm2: "Be creative" fdm2_ex: "You're not limited to how you can interact. You can just follow fascinating people to see what they have to say, or you can share world with everyone. Share your photos, artwork, videos, music, words - whatever you want. Let yourself fly." fdm3: "Free as in freedom" - fdm3_ex: "Diaspora* is completely Free Software. This means there are no limits on how it can be used. You can even take the source code and change it to make it work in the way you want to, and help us improve the network. We'd love to have you on board." + fdm3_ex: "diaspora* is completely Free Software. This means there are no limits on how it can be used. You can even take the source code and change it to make it work in the way you want to, and help us improve the network. We'd love to have you on board." privacy: "Privacy" privacy_byline: "Total control over what is yours " priv1: "Own your own data" - priv1_ex: "Many networks use your data to make money by analysing your interactions and using this information to advertise things to you. Diaspora* doesn't use your data for any purpose other than allowing you to connect and share with others." + priv1_ex: "Many networks use your data to make money by analysing your interactions and using this information to advertise things to you. diaspora* doesn't use your data for any purpose other than allowing you to connect and share with others." priv2: "Host it yourself" priv2_ex: "Choose where your data are stored by choosing a pod you're happy with. If you want to be really secure, you can set up and host your own pod on servers you control, so no one can get at your personal data." priv3: "Choose your audience" - priv3_ex: "Diaspora*'s aspects allow you to share with just those people you want to. You can be as public or as private as you like. Share a funny photo with the whole world, or a deep secret just with your closest friends. You're in control." + priv3_ex: "diaspora*'s aspects allow you to share with just those people you want to. You can be as public or as private as you like. Share a funny photo with the whole world, or a deep secret just with your closest friends. You're in control." aspects: "All about aspects" - aspects_byline: "The key to privacy in Diaspora*" + aspects_byline: "The key to privacy in diaspora*" asp1: "Aspects of your life" - asp1_ex: "Your life is made up of lots of different aspects, involving different people. Why should your online life be any different? With Diaspora*'s aspects you can organize your online life as much as you want and share things only with the people you want to." + asp1_ex: "Your life is made up of lots of different aspects, involving different people. Why should your online life be any different? With diaspora*'s aspects you can organize your online life as much as you want and share things only with the people you want to." asp2: "Organize your life" asp2_ex: "For example, you might have aspects for your family, for your closest friends, for work colleagues and for a sport or hobby you're involved in. Your work colleagues don't need to know about your family reunion, do they? With aspects, they won't." asp3: "Tell the whole world" @@ -83,16 +83,16 @@ en: features: "Features our community loves" features_byline: "We think you'll love 'em too" hashtags: "Hashtags" - hashtags_ex: "Hashtags allow you to flag and follow your interests, and help your posts reach like-minded people. They're also a great way to meet fun and interesting new people on Diaspora*." + hashtags_ex: "Hashtags allow you to flag and follow your interests, and help your posts reach like-minded people. They're also a great way to meet fun and interesting new people on diaspora*." reshare: "Reshare" - reshare_ex: "Why not reshare a post you love with others? Diaspora* makes it easy to spread ideas via reshare. Just press the button to share the message." + reshare_ex: "Why not reshare a post you love with others? diaspora* makes it easy to spread ideas via reshare. Just press the button to share the message." mentions: "Mentions" - mentions_ex: "Want to get someone's attention? Just @-mention them! It's an easy way to alert one of your contacts to something you think they need to know about." + mentions_ex: "Want to get someone's attention? Just @mention them! It's an easy way to alert one of your contacts to something you think they need to know about." love: "Love" - love_ex: "Show your appreciation for something you love by ♥-ing it. Because sometimes words just aren't enough to say what you feel." + love_ex: "Show your appreciation for something you love by ♥ing it. Because sometimes words just aren't enough to say what you feel." host: "Host a community pod" - host_byline: "Be one of Diaspora*'s stars" - host_ex: "Diaspora* depends on its community members to host and run pods which are open to anyone who wants to take part. If you have some server space and a little bit of technical knowledge, we'd love it if you'd set up a community pod. The more pods, the better Diaspora* works - be part of the future of the decentralized social web!" + host_byline: "Be one of diaspora*'s stars" + host_ex: "diaspora* depends on its community members to host and run pods which are open to anyone who wants to take part. If you have some server space and a little bit of technical knowledge, we'd love it if you'd set up a community pod. The more pods, the better diaspora* works - be part of the future of the decentralized social web!" hostinst1: "Read the " hostinst2: "Pod installation instructions" hostinst3: "and set up your own community pod." @@ -102,15 +102,15 @@ en: byline: "The future of the social web starts with you" menu_title: 'Get involved' community: "Community powered" - community_byline: "Diaspora* belongs to you" + community_byline: "diaspora* belongs to you" meaning: "What does it all mean?" - meaning_ex1: "Free Software is about individuality, transparency, creativity, and destiny. It is about having an idea, and making it reality. Diaspora* was founded to fulfill a passion for fun, and to make the internet a better place. Free Software is what enables us to change the world for ourselves, and lets our friends across the web benefit from our exploration." - meaning_ex2: "Free Software communities are amazing things. At Diaspora*, we believe that people should be valued for what they do. It doesn't matter whether you're an elite coder or have never contributed to a project before. Contributing to Diaspora* means that you get to work on hard problems, with a focus on solutions that work for users." - meaning_ex3: "This is why if you contribute something meaningful to Diaspora*, we will give you core commit access. We are in this together, and we want to give excited people the chance to make huge changes." + meaning_ex1: "Free Software is about individuality, transparency, creativity, and destiny. It is about having an idea, and making it reality. diaspora* was founded to fulfill a passion for fun, and to make the internet a better place. Free Software is what enables us to change the world for ourselves, and lets our friends across the web benefit from our exploration." + meaning_ex2: "Free Software communities are amazing things. At diaspora*, we believe that people should be valued for what they do. It doesn't matter whether you're an elite coder or have never contributed to a project before. Contributing to diaspora* means that you get to work on hard problems, with a focus on solutions that work for users." + meaning_ex3: "This is why if you contribute something meaningful to diaspora*, we will give you core commit access. We are in this together, and we want to give excited people the chance to make huge changes." whereyou: "Where you come in" - whereyou_ex1: "We all make Diaspora*. We might not know you just yet, but we'd love to meet you and find how you can fit into the team that's building the future of the web. We all have the potential to change the world, given the right opportunity." - whereyou_ex2: "Contributing to Diaspora* comes in all different shapes and sizes. Whether you're a user helping us find bugs, providing feedback on our mailing lists, or contributing code or design, we need you." - gi_header: "Ways to get involved with Diaspora*" + whereyou_ex1: "We all make diaspora*. We might not know you just yet, but we'd love to meet you and find how you can fit into the team that's building the future of the web. We all have the potential to change the world, given the right opportunity." + whereyou_ex2: "Contributing to diaspora* comes in all different shapes and sizes. Whether you're a user helping us find bugs, providing feedback on our mailing lists, or contributing code or design, we need you." + gi_header: "Ways to get involved with diaspora*" code_header: "Contribute code" code_byline: "Grabbing the source code is simple." code_ex1: "Clone the repository and poke around: " @@ -120,23 +120,23 @@ en: code_ex5: "Getting started guide" code_ex6: "join our mailing list" code_ex7: "and come and meet us in the " - code_ex8: "Diaspora* IRC room" + code_ex8: "diaspora* IRC room" code_gh: "View the source on GitHub" bugs_header: "Squash bugs" bugs_ex1: "Our project makes use of Code Triage, a volunteer service where users and developers can work together to tackle bugs in our GitHub Issue Tracker." - bugs_ex2: "Squashing small bugs helps everyone, and it can give a newcomer a better working knowledge of how parts of Diaspora* works." - bugs_ex3: "Help us clean up our code." + bugs_ex2: "Squashing small bugs helps everyone, and it can give a newcomer a better working knowledge of how parts of diaspora* works." + bugs_ex3: "Help us clean up our code" translate_header: "Help translate" - translate_ex1: "You can help translate Diaspora* into other languages by joining the " + translate_ex1: "You can help translate diaspora* into other languages by joining the " translate_ex2: "Translations Group" translate_ex3: "Read our " translate_ex4: "translation instructions " translate_ex5: "on how to get started." voice_header: "Provide your voice" voice_ex1: "Our project is run entirely by community volunteers. We use a tool called Loomio to gauge how our contributors feel about ideas and proposals for the project. " - voice_ex2: "Join us there." - voice_ex3: "Persuade your friends and family to join Diaspora* by organizing your own real-life Diaspora* " - voice_ex4: "meetup" + voice_ex2: "Join us there" + voice_ex3: "Persuade your friends and family to join diaspora* by organizing your own real-life diaspora* " + voice_ex4: "meetup " voice_ex5: "in your own community." support_header: "Provide support" support_ex1: "Help new users feel welcome!" @@ -145,21 +145,24 @@ en: support_ex4: "Diasporial" support_ex5: "Answer users' questions on our " support_ex6: " IRC channel " - support_ex7: "or answer users' questions on Diaspora* itself by following the #help, #question and #feedback hashtags" + support_ex7: "or answer users' questions on diaspora* itself by following the #help, #question and #feedback hashtags." support_ex8: "Contribute to " - support_ex9: "Diaspora's Wiki" + support_ex9: "diaspora*'s wiki" run_header: "Run a community pod" - run_ex1: "Now you don't have to settle for having your data on someone else's server. Since Diaspora* is completely free software, " - run_ex2: "We're constantly making it easier for individuals to host their own pods on Diaspora*. " - run_ex3: "you can host it wherever you want." + run_ex1: "Now you don't have to settle for having your data on someone else's server. Since diaspora* is completely free software, we're constantly making it easier for individuals to " + run_ex2: "host their own pods on diaspora*" + run_ex3: "You can host it wherever you want." run_ex4: "Add your pod to the list of community pods at " - contributors_header: "Diaspora*'s contributors" - contributors_byline: "The people who make Diaspora* what it is" + contributors_header: "diaspora*'s contributors" + contributors_byline: "The people who make diaspora* what it is" blog: - headline: 'The Diaspora* Blog' + headline: 'The diaspora* blog' subline: 'official announcements' menu_title: 'Blog' planet: headline: 'Planet' menu_title: 'Planet' + + +