diff --git a/app/components/elements/ReplyEditor.jsx b/app/components/elements/ReplyEditor.jsx index 5850f01e71eabe3695cbbdcbc6faf55515ae1419..5cc37ebf3d05b9faf526177c68a2143942c7afa1 100644 --- a/app/components/elements/ReplyEditor.jsx +++ b/app/components/elements/ReplyEditor.jsx @@ -502,9 +502,9 @@ export default formId => reduxForm( return } - if(meta.tags.length > 5) { + if(meta.tags.length > 4) { const includingCategory = isEdit ? ` (including the category '${rootCategory}')` : '' - errorCallback(`You have ${meta.tags.length} tags total${includingCategory}. Please use only 5 in your post and category line.`) + errorCallback(`You have ${meta.tags.length} tags total${includingCategory}. Please use only 4 in your post and category line.`) return } // loadingCallback starts the loading indicator diff --git a/app/components/modules/Header.jsx b/app/components/modules/Header.jsx index 7451d9e842b8ee3d49c314a5298c1bb45f4cd598..b2751978799d8d48fe017fb635833f7fe77988de 100644 --- a/app/components/modules/Header.jsx +++ b/app/components/modules/Header.jsx @@ -127,7 +127,7 @@ class Header extends React.Component { page_title = `Author rewards by ${user_name} `; } if(route.params[1] === "recent-replies"){ - page_title = `Replies by ${user_name} `; + page_title = `Replies to ${user_name} `; } // @user/"posts" is deprecated in favor of "comments" as of oct-2016 (#443) if(route.params[1] === "posts" || route.params[1] === "comments"){ diff --git a/app/components/pages/RecoverAccountStep1.jsx b/app/components/pages/RecoverAccountStep1.jsx index 889465f6eacdd5a0ab40c43d425217dbf75be97d..7e3abedafe42bfe31f0b00b2017fc97601799899 100644 --- a/app/components/pages/RecoverAccountStep1.jsx +++ b/app/components/pages/RecoverAccountStep1.jsx @@ -192,7 +192,7 @@ class RecoverAccountStep1 extends React.Component { <div className="column large-4"> {show_social_login === 'both' ? <p>{translate('login_with_facebook_or_reddit_media_to_verify_identity')}.</p> : <p>{translate('login_with_social_media_to_verify_identity', { - provider: show_social_login + provider: show_social_login.charAt(0).toUpperCase() + show_social_login.slice(1) })}.</p>} </div> </div> @@ -211,7 +211,7 @@ class RecoverAccountStep1 extends React.Component { </div> {(show_social_login === 'both' || show_social_login === 'reddit') && <div className="row"> - <div className="column large-4"> + <div className="column large-4 shrink"> <SvgImage name="reddit" width="64px" height="64px" /> </div> <div className="column large-8"> diff --git a/app/locales/en.js b/app/locales/en.js index 5f0bfb4bc9dbf2540c7c1d71a14a65e9a89acbe0..88fa52079d9de63c7c9cf7eecf3bf426724ffd73 100644 --- a/app/locales/en.js +++ b/app/locales/en.js @@ -258,7 +258,7 @@ const en = { request_already_submitted_contact_support: 'Your request has been already submitted and we are working on it. Please contact t@cyber.fund for the status of your request.', recover_account_intro: "From time to time, a Steemian’s owner key may be compromised. Stolen Account Recovery gives the rightful account owner 30 days to recover their account from the moment the thief changed their owner key. Stolen Account Recovery can only be used on " + APP_URL + " if the account owner had perviously listed ‘" + APP_NAME + "’ as their account trustee and complied with " + APP_NAME + "’s Terms of Service.", login_with_facebook_or_reddit_media_to_verify_identity: 'Please login with Facebook or Reddit to verify your identity', - login_with_social_media_to_verify_identity: 'Please login with {show_social_login} to verify you identity', + login_with_social_media_to_verify_identity: 'Please login with {provider} to verify your identity', enter_email_toverify_identity: 'We need to verify your identity. Please enter your email address below to begin the verification.', email: 'Email', continue_with_email: "Continue with Email", @@ -498,7 +498,7 @@ const en = { tokens_worth_about_AMOUNT_of_LIQUID_TOKEN: 'Tokens worth about {amount} of ' + LIQUID_TOKEN + '.', influence_tokens_which_earn_more_power_by_holding_long_term: 'Influence tokens which earn more power by holding long term.', the_more_you_hold_the_more_you_influence_post_rewards: 'The more you hold the more you influence post rewards and earn for accurate voting.', - the_estimated_value_is_based_on_a_7_day_average_value_of_LIQUID_TOKEN_in_currency: 'The estimated value is based on a 7 day average value of ' + LIQUID_TOKEN + ' in US Dollars.', + the_estimated_value_is_based_on_an_average_value_of_steem_in_US_dollars: 'The estimated value is based on an average value of ' + LIQUID_TOKEN + ' in US dollars.', VESTING_TOKEN_is_non_transferrable_and_requires_convert_back_to_LIQUID_TOKEN: VESTING_TOKEN + ' is non-transferrable and requires 3 months (13 payments) to convert back to ' + LIQUID_TOKEN + '.', converted_VESTING_TOKEN_can_be_sent_to_yourself_but_can_not_transfer_again: 'Converted ' + VESTING_TOKEN + ' can be sent to yourself or someone else but can not transfer again without converting back to ' + LIQUID_TOKEN + '.', profile: 'Profile', diff --git a/app/locales/es.js b/app/locales/es.js index 69c6f77674db1c4b6048c89aa6eb55c7f22e2190..6c0aa4dc32902d6866e9e2cf2219a7a9b7a9e0e7 100644 --- a/app/locales/es.js +++ b/app/locales/es.js @@ -239,7 +239,7 @@ const es = { request_already_submitted_contact_support: 'Your request has been already submitted and we are working on it. Please contact support@steemit.com for the status of your request.', recover_account_intro: "From time to time, a Steemian’s owner key may be compromised. Stolen Account Recovery gives the rightful account owner 30 days to recover their account from the moment the thief changed their owner key. Stolen Account Recovery can only be used on steemit.com if the account owner had perviously listed ‘Steemit’ as their account trustee and complied with Steemit’s Terms of Service.", login_with_facebook_or_reddit_media_to_verify_identity: 'Please login with Facebook or Reddit to verify your identity', - login_with_social_media_to_verify_identity: 'Please login with {show_social_login} to verify you identity', + login_with_social_media_to_verify_identity: 'Please login with {provider} to verify your identity', enter_email_toverify_identity: 'We need to verify your identity. Please enter your email address below to begin the verification.', email: 'Correo electrónico', continue_with_email: "Continuar con correo", diff --git a/app/locales/es_AR.js b/app/locales/es_AR.js index 0d95799887f4409d31eeb088e8341626127ef217..999b1444221fc552ef8694ef9074822c03288804 100644 --- a/app/locales/es_AR.js +++ b/app/locales/es_AR.js @@ -239,7 +239,7 @@ const es_AR = { request_already_submitted_contact_support: 'Your request has been already submitted and we are working on it. Please contact support@steemit.com for the status of your request.', recover_account_intro: "From time to time, a Steemian’s owner key may be compromised. Stolen Account Recovery gives the rightful account owner 30 days to recover their account from the moment the thief changed their owner key. Stolen Account Recovery can only be used on steemit.com if the account owner had perviously listed ‘Steemit’ as their account trustee and complied with Steemit’s Terms of Service.", login_with_facebook_or_reddit_media_to_verify_identity: 'Please login with Facebook or Reddit to verify your identity', - login_with_social_media_to_verify_identity: 'Please login with {show_social_login} to verify you identity', + login_with_social_media_to_verify_identity: 'Please login with {provider} to verify your identity', enter_email_toverify_identity: 'We need to verify your identity. Please enter your email address below to begin the verification.', email: 'Correo electrónico', continue_with_email: "Continuar con correo", diff --git a/app/locales/fr.js b/app/locales/fr.js index 97875c170c34d3e450ac8b74d998e9f41955c0af..fc15a365696056358321599f8e2ea28a7a298d62 100644 --- a/app/locales/fr.js +++ b/app/locales/fr.js @@ -239,7 +239,7 @@ const fr = { request_already_submitted_contact_support: 'Votre demande a déjà été soumise et nous travaillons dessus. Veuillez contacter support@steemit.com à propos du status de votre demande.', recover_account_intro: "From time to time, a Steemian’s owner key may be compromised. Stolen Account Recovery gives the rightful account owner 30 days to recover their account from the moment the thief changed their owner key. Stolen Account Recovery can only be used on steemit.com if the account owner had perviously listed ‘Steemit’ as their account trustee and complied with Steemit’s Terms of Service.", login_with_facebook_or_reddit_media_to_verify_identity: 'Veuillez vous connecter avec Facebook ou Reddit pour verifier votre identité', - login_with_social_media_to_verify_identity: 'Veuillez vous connecter avec {show_social_login} pour verifier votre identité', + login_with_social_media_to_verify_identity: 'Veuillez vous connecter avec {provider} pour verifier votre identité', enter_email_toverify_identity: 'Nous devons verifier votre identité. Veuillez entrer votre addresse email ci-dessous pour commencer la verification.', email: 'Email', continue_with_email: "Continuer par Email", diff --git a/app/locales/it.js b/app/locales/it.js index 0ea98e11107b69e2d38c831e8550471060901474..d15e0db2392c0e76eb242cf92a7601f8c82ec16d 100644 --- a/app/locales/it.js +++ b/app/locales/it.js @@ -239,7 +239,7 @@ const it = { request_already_submitted_contact_support: 'La tua richiesta è stata aggiunta e ci stiamo lavorando. Per cortesia contatta support@steemit.com per richiede lo stato della tua richiesta.', recover_account_intro: "Di volta in volta, una chiave proprietaria di uno Steemian’s può essere compromessa. Stolen Account Recovery dà al proprietario dell'account legittimo 30 giorni per recuperarlo dal momento in cui il ladro ha cambiato la chiave proprietaria. Stolen Account Recovery può essere usata su steemit.com if se il proprietario dell\'account ha precedentemente legato ‘Steemit’ tramite account fiduciario e rispettato i termini di servizio.", login_with_facebook_or_reddit_media_to_verify_identity: 'Per cortesia effettua un login con Facebook o Reddit per verificare la tua identità ', - login_with_social_media_to_verify_identity: 'Per cortesia effettua un login con {show_social_login} per verificare la tua identità ', + login_with_social_media_to_verify_identity: 'Per cortesia effettua un login con {provider} per verificare la tua identità ', enter_email_toverify_identity: 'Abbiamo bisogono di verificare la tua identità . Per cortesia inserisci il tuo indirizzo email di seguito per iniziare la procedura di verifica.', email: 'Email', continue_with_email: "Continua con Email", diff --git a/app/locales/jp.js b/app/locales/jp.js index 2546dc4013be626957670de79bb74fe9c57f1fb3..9fd4b1ecc9479d156d25db361469d672dcfd7412 100644 --- a/app/locales/jp.js +++ b/app/locales/jp.js @@ -239,7 +239,7 @@ const jp = { request_already_submitted_contact_support: 'ã‚ãªãŸã®è¦æœ›ã¯ã™ã§ã«æå‡ºã•れã¦ãŠã‚Šã€ãŸã ã„ã¾Steemitメンãƒãƒ¼ã§å¯¾å¿œä¸ã§ã™ã€‚状æ³ã‚’確èªã—ãŸã„å ´åˆã¯ã€support@steemit.com ã«ã‚³ãƒ³ã‚¿ã‚¯ãƒˆã‚’ã—ã¦ãã ã•ã„。', recover_account_intro: "From time to time, a Steemian’s owner key may be compromised. Stolen Account Recovery gives the rightful account owner 30 days to recover their account from the moment the thief changed their owner key. Stolen Account Recovery can only be used on steemit.com if the account owner had perviously listed ‘Steemit’ as their account trustee and complied with Steemit’s Terms of Service.", login_with_facebook_or_reddit_media_to_verify_identity: 'èªè¨¼ã®ãŸã‚ã€Faccebookã¾ãŸã¯Redditアカウントã§ãƒã‚°ã‚¤ãƒ³ã—ã¦ãã ã•ã„。', - login_with_social_media_to_verify_identity: 'èªè¨¼ã®ãŸã‚〠{show_social_login} ã§ãƒã‚°ã‚¤ãƒ³ã—ã¦ãã ã•ã„。', + login_with_social_media_to_verify_identity: 'èªè¨¼ã®ãŸã‚〠{provider} ã§ãƒã‚°ã‚¤ãƒ³ã—ã¦ãã ã•ã„。', enter_email_toverify_identity: 'èªè¨¼ã™ã‚‹å¿…è¦ãŒã‚りã¾ã™ã€‚èªè¨¼ã‚’é–‹å§‹ã™ã‚‹ç‚ºã«ã€ä¸‹è¨˜ã«ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’記入ã—ã¦ãã ã•ã„。', email: 'Email', continue_with_email: "メールアドレスã§ç¶šè¡Œ", diff --git a/app/locales/ru.js b/app/locales/ru.js index 23449da5ba3e18cf27a3856ee44ff160323734c9..e99d0e549b99a71262888835fd118711d1dcb15f 100644 --- a/app/locales/ru.js +++ b/app/locales/ru.js @@ -502,8 +502,8 @@ const ru = { tokens_worth_about_AMOUNT_of_LIQUID_TOKEN: 'Перемещаемые цифровые токены, цена которых вÑегда равна ~1 мг золота в ' + LIQUID_TOKEN + '.', influence_tokens_which_earn_more_power_by_holding_long_term: 'Ðеперемещаемые цифровые токены, их количеÑтво увеличиваетÑÑ Ð¿Ñ€Ð¸ долгоÑрочном хранении.', the_more_you_hold_the_more_you_influence_post_rewards: 'Чем их больше, тем Ñильней вы влиÑете на Ð²Ð¾Ð·Ð½Ð°Ð³Ñ€Ð°Ð¶Ð´ÐµÐ½Ð¸Ñ Ð·Ð° поÑÑ‚ и тем больше зарабатываете за голоÑование.', - the_estimated_value_is_based_on_a_7_day_average_value_of_LIQUID_TOKEN_in_currency: 'ÐžÑ†ÐµÐ½Ð¾Ñ‡Ð½Ð°Ñ ÑтоимоÑть раÑÑчитываетÑÑ Ð¸Ð· 7-ми дневной Ñредней ÑтоимоÑти ' + LIQUID_TOKEN + '.', - VESTING_TOKEN_is_non_transferrable_and_requires_convert_back_to_LIQUID_TOKEN: VESTING_TOKEN + ' Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿ÐµÑ€ÐµÐ´Ð°Ð²Ð°Ñ‚ÑŒ и потребуетÑÑ 3 меÑÑца и 13 выплаты чтобы перевеÑти обратно в ' + LIQUID_TOKEN + '.', + the_estimated_value_is_based_on_an_average_value_of_steem_in_US_dollars: 'Ð¡Ð¼ÐµÑ‚Ð½Ð°Ñ ÑтоимоÑть оÑнована на Ñреднем значении ' + LIQUID_TOKEN + ' в долларах СШÐ', + VESTING_TOKEN_is_non_transferrable_and_requires_convert_back_to_LIQUID_TOKEN: VESTING_TOKEN + ' Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿ÐµÑ€ÐµÐ´Ð°Ð²Ð°Ñ‚ÑŒ и потребуетÑÑ 3 меÑÑца и 13 выплаты чтобы перевеÑти обратно в ' + LIQUID_TOKEN + '.', // TODO converted_VESTING_TOKEN_can_be_sent_to_yourself_but_can_not_transfer_again: 'ÐšÐ¾Ð½Ð²ÐµÑ€Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ ' + VESTING_TOKEN + ' может быть отправлена Ñебе или кому-то еще, но не может быть передана вновь без ÐºÐ¾Ð½Ð²ÐµÑ€Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð½Ð°Ð·Ð°Ð´ в ' + LIQUID_TOKEN + '.', profile: 'Профиль', diff --git a/app/utils/DMCAList.js b/app/utils/DMCAList.js index 9f6e5324cad0500751ddd7254d057cca3c8e3aa6..a5c8adb41d6ad9e25822af1eaaea6f587726574a 100644 --- a/app/utils/DMCAList.js +++ b/app/utils/DMCAList.js @@ -29,5 +29,6 @@ export default ` /food/@outchemy/5-top-countries-you-need-to-visit-if-you-are-a-chocolate-addict /travel/@outchemy/broken-relationships-the-museum-of-zagreb-that-celebrates-heartache /travel/@outchemy/get-rid-of-the-toxins-see-these-amazing-detox-vacations +/photography/@maxmalini/the-dark-hedges `.trim().split("\n") diff --git a/app/utils/Tips.js b/app/utils/Tips.js index 339ef8b31197ad28cc784e03d2ef276a2579176e..cd3785a3756888967d03d7f9427e2815d98fea80 100644 --- a/app/utils/Tips.js +++ b/app/utils/Tips.js @@ -13,6 +13,6 @@ export const transferTips = { export const steemTip = translate('tradeable_tokens_that_may_be_transferred_anywhere_at_anytime') + ' ' + translate('LIQUID_TOKEN_can_be_converted_to_VESTING_TOKEN_in_a_process_called_powering_up') export const powerTip = 'Influence tokens which give you more control over post payouts and allow you to earn on curation rewards.' //export const powerTip = translate('influence_tokens_which_earn_more_power_by_holding_long_term') + ' ' + translate('the_more_you_hold_the_more_you_influence_post_rewards') //TODO: this text is outdated -export const valueTip = translate('the_estimated_value_is_based_on_a_7_day_average_value_of_LIQUID_TOKEN_in_currency') +export const valueTip = translate('the_estimated_value_is_based_on_an_average_value_of_steem_in_US_dollars') export const powerTip2 = translate('VESTING_TOKEN_is_non_transferrable_and_requires_convert_back_to_LIQUID_TOKEN') export const powerTip3 = translate('converted_VESTING_TOKEN_can_be_sent_to_yourself_but_can_not_transfer_again') diff --git a/doc/CONTRIBUTORS.md b/doc/CONTRIBUTORS.md index 6db738a5df144de7eb0f0cc171b26b22fde93d97..430f2ab78b82e2bedd45f9401cfb3428868f78f2 100644 --- a/doc/CONTRIBUTORS.md +++ b/doc/CONTRIBUTORS.md @@ -8,7 +8,7 @@ large contributions to the Steemit.com codebase. ## Internationalization - - @hipster + - @Undeadlol1 (Mihail Paley) - @ekitcho - @heimindanger - @fernando-sanz