From 58ef9c6c566ff317abca295ab0b0c349686435d8 Mon Sep 17 00:00:00 2001 From: Saivann Date: Wed, 19 Feb 2014 14:57:04 -0500 Subject: [PATCH] Handle redirections in _config.yml --- README.md | 2 +- _config.yml | 33 ++++++++++++++---- _layouts/base.html | 25 +------------- _plugins/redirects.rb | 40 +++++++++++++++++++++ _plugins/sitemap.rb | 31 +++-------------- _plugins/templates.rb | 46 ++----------------------- _redirects/about.yml | 11 ------ _redirects/bitcoin-for-enthusiasts.yml | 4 --- _templates/about.html | 40 --------------------- _templates/bitcoin-for-enthusiasts.html | 27 --------------- _templates/faq.html | 45 ++++++++++++++++++++++++ _translations/ar.yml | 12 +++---- _translations/bg.yml | 2 -- _translations/de.yml | 2 -- _translations/en.yml | 2 -- _translations/fa.yml | 12 +++---- _translations/fr.yml | 2 -- _translations/id.yml | 1 - _translations/it.yml | 7 ++-- _translations/nl.yml | 7 ++-- _translations/pl.yml | 7 ++-- _translations/ru.yml | 2 -- _translations/tr.yml | 7 ++-- _translations/zh_CN.yml | 7 ++-- _translations/zh_TW.yml | 7 ++-- about.html | 5 --- clients.html | 5 --- news.html | 5 --- 28 files changed, 152 insertions(+), 244 deletions(-) create mode 100644 _plugins/redirects.rb delete mode 100644 _redirects/about.yml delete mode 100644 _redirects/bitcoin-for-enthusiasts.yml delete mode 100755 _templates/about.html delete mode 100755 _templates/bitcoin-for-enthusiasts.html delete mode 100644 about.html delete mode 100644 clients.html delete mode 100644 news.html diff --git a/README.md b/README.md index 66dce4ab..4ba6869f 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Installing dependencies on older Ubuntu and Debian distributions ### Import translations -**Update translations**: You can overwrite each language files in _translations by their updated version from Transifex. You should make sure that each .html files (in _layouts, _templates and _redirects) don't serve outdated content for those languages. You should also make sure that no url has been changed by translators. +**Update translations**: You can overwrite each language files in _translations by their updated version from Transifex. You should make sure that each .html files (in _layouts, _templates) don't serve outdated content for those languages. You should also make sure that no url has been changed by translators. If one page has been replaced or moved, a redirection can be added in _config.yml. **Add a new language**: You can put the language file from Transifex in _translations and add the language in _config.yml in the right display order for the language bar. Make sure to review all pages and check all links. diff --git a/_config.yml b/_config.yml index 1fe0627d..6eeb1279 100644 --- a/_config.yml +++ b/_config.yml @@ -32,6 +32,33 @@ langs: zh_CN: ‪简体中文‬ zh_TW: ‪繁體中文‬ +redirects: + /news: /en/version-history + /clients: /en/choose-your-wallet + /about: /en/faq + /de/ueber: /de/faq + /en/about: /en/faq + /es/acerca-de: /es/faq + /fr/a-propos: /fr/faq + /ru/описание: /ru/faq + /ar/بت-كوين-للهواة: /ar/innovation + /de/bitcoin-fuer-enthusiasten: /de/innovation + /en/bitcoin-for-enthusiasts: /en/innovation + /es/bitcoin-para-entusiastas: /es/innovacion + /fa/بیت-کوین-برای-علاقه-مندان: /fa/innovation + /fr/bitcoin-pour-passionnes: /fr/innovation + /it/bitcoin-per-appassionati: /it/innovazione + /nl/bitcoin-voor-liefhebbers: /nl/innovatie + /pl/bitcoin-dla-entuzjastow: /pl/innowacje + /ru/биткоин-энтузиастам: /ru/innovation + /en/bitcoin-for-press: /en/press + +aliases: + s_nakamoto: Satoshi Nakamoto + --author=Satoshi Nakamoto: Satoshi Nakamoto + gavinandresen: Gavin Andresen + tcatm: Nils Schneider + safe: false auto: false server: false @@ -72,9 +99,3 @@ kramdown: coderay_tab_width: 4 coderay_bold_every: 10 coderay_css: style - -aliases: - s_nakamoto: Satoshi Nakamoto - --author=Satoshi Nakamoto: Satoshi Nakamoto - gavinandresen: Gavin Andresen - tcatm: Nils Schneider diff --git a/_layouts/base.html b/_layouts/base.html index 43abfcd1..7fa95f95 100644 --- a/_layouts/base.html +++ b/_layouts/base.html @@ -1,17 +1,3 @@ ---- -menufor: -- id: bitcoin-for-individuals -- id: bitcoin-for-businesses -- id: bitcoin-for-developers -- id: bitcoin-for-enthusiasts -menu: -- id: how-it-works -- id: vocabulary -- id: resources -- id: community -- id: development -- id: about ---- @@ -68,10 +54,7 @@ if(typeof(legacyIE)==='undefined'){ {% translate menu-bitcoin-for-businesses layout %} {% translate menu-bitcoin-for-developers layout %} {% case page.lang %} - {% when 'ar' or 'fa' %} - {% translate menu-bitcoin-for-enthusiasts layout %} - {% translate menu-choose-your-wallet layout %} - {% when 'pl' or 'zh_TW' %} + {% when 'ar' or 'fa' or 'pl' or 'zh_TW' %} {% translate menu-choose-your-wallet layout %} {% else %} {% translate menu-getting-started layout %} @@ -94,15 +77,9 @@ if(typeof(legacyIE)==='undefined'){ {% if page.lang == 'en' %}Press{% endif %} - {% case page.lang %} - {% when 'ar' or 'fa' %} - {% else %} {% translate menu-innovation layout %} - {% endcase %} {% translate menu-support-bitcoin layout %} {% case page.lang %} - {% when 'ar' or 'fa' or 'it' or 'nl' or 'pl' or 'tr' or 'zh_CN' or 'zh_TW' %} - {% translate menu-about layout %} {% when 'id' %} {% else %} {% translate menu-faq layout %} diff --git a/_plugins/redirects.rb b/_plugins/redirects.rb new file mode 100644 index 00000000..d1018a3d --- /dev/null +++ b/_plugins/redirects.rb @@ -0,0 +1,40 @@ +#redirects.rb generates all redirection pages +#from _config.yml . + +require 'yaml' +require 'cgi' + +module Jekyll + + class PageRedirect < Page + def initialize(site, base, srcdir, src, dst) + @site = site + @base = base + @dir = srcdir + @name = src + self.process(src) + self.read_yaml(File.join(base, '/'), 'index.html') + self.data['lang'] = 'en' + self.data['redirect'] = dst + self.data['layout'] = 'redirect' + end + end + + class RedirectPageGenerator < Generator + def generate(site) + #Load redirections + redirects = YAML.load_file("_config.yml")['redirects'] + #Generate each redirection page + if !File.directory?(site.dest) + Dir.mkdir(site.dest) + end + redirects.each do |src,dst| + srcar = src.split('/') + src = srcar.pop + '.html' + srcdir = srcar.join('/') + site.pages << PageRedirect.new(site, site.source, srcdir, src, dst) + end + end + end + +end diff --git a/_plugins/sitemap.rb b/_plugins/sitemap.rb index f27deb81..5a46e4de 100644 --- a/_plugins/sitemap.rb +++ b/_plugins/sitemap.rb @@ -21,15 +21,6 @@ module Jekyll lang=file.split('.')[0] locs[lang] = YAML.load_file('_translations/'+file)[lang] end - #Load redirections - redirects = {} - rredirects = {} - Dir.foreach('_redirects') do |file| - next if file == '.' or file == '..' - id = file.split('.')[0] - redirects[id] = YAML.load_file("_redirects/" + file) - rredirects[redirects[id]['dst']] = id - end #Create destination directory if does not exists if !File.directory?(site.dest) Dir.mkdir(site.dest) @@ -42,26 +33,16 @@ module Jekyll #Add translated pages with their alternative in each languages locs['en']['url'].each do |id,value| locs.each do |lang,value| - #Don't add a page if their url is not translated or if they are a redirection + #Don't add a page if their url is not translated next if locs[lang]['url'][id].nil? or locs[lang]['url'][id] == '' - next if redirects.has_key?(id) and ( !redirects[id].has_key?('except') or !redirects[id]['except'].has_key?(lang) ) sitemap.puts '' sitemap.puts ' https://bitcoin.org/'+lang+'/'+CGI::escape(locs[lang]['url'][id])+'' locs.each do |altlang,value| - altid = id - #If there is a redirection from this page, use the destination as alternate url - if redirects.has_key?(id) and ( !redirects[id].has_key?('except') or !redirects[id]['except'].has_key?(altlang) ) - altid = redirects[id]['dst'] - end - #If there is a disabled redirection to this page, point to the source as alternate url - if rredirects.has_key?(id) and redirects[rredirects[id]].has_key?('except') and redirects[rredirects[id]]['except'].has_key?(altlang) - altid = rredirects[id] - end - next if locs[altlang]['url'][altid].nil? or locs[altlang]['url'][altid] == '' or altlang == lang + next if locs[altlang]['url'][id].nil? or locs[altlang]['url'][id] == '' or altlang == lang sitemap.puts ' ' + sitemap.puts ' href="https://bitcoin.org/'+altlang+'/'+CGI::escape(locs[altlang]['url'][id])+'" />' end sitemap.puts '' end @@ -71,9 +52,7 @@ module Jekyll if /^[a-z]{2}(_[A-Z]{2})?$/.match(file1) and File.directory?(file1) Dir.foreach(file1) do |file2| next if !/\.html$/.match(file2) - #Ignore static redirect pages data = File.read(file1+'/'+file2) - next if !data.index('window.location.href=').nil? or !data.index('redirect:').nil? sitemap.puts '' sitemap.puts ' https://bitcoin.org/'+file1+'/'+file2.gsub('.html','')+'' sitemap.puts '' @@ -81,9 +60,9 @@ module Jekyll end next if !/\.html$/.match(file1) next if file1 == 'index.html' - #Ignore static redirect pages and google webmaster tools + #Ignore google webmaster tools data = File.read(file1) - next if !data.index('window.location.href=').nil? or !data.index('redirect:').nil? or !data.index('google-site-verification:').nil? + next if !data.index('google-site-verification:').nil? sitemap.puts '' sitemap.puts ' https://bitcoin.org/'+file1.gsub('.html','')+'' sitemap.puts '' diff --git a/_plugins/templates.rb b/_plugins/templates.rb index c046b8cc..90371e0c 100644 --- a/_plugins/templates.rb +++ b/_plugins/templates.rb @@ -2,9 +2,6 @@ #_templates. The final file name of each page is defined in #the url section of each translations in _translations. -#If a page is defined in _redirects, this plugin will -#generate a redirection instead of using the template. - require 'yaml' require 'cgi' @@ -21,21 +18,6 @@ module Jekyll self.data['lang'] = lang end end - - class PageRedirect < Page - def initialize(site, base, lang, srcdir, src, dstdir, dst, red) - @site = site - @base = base - @dir = '/'+dstdir - @name = dst - self.process(dst) - self.read_yaml(File.join(base, srcdir), src) - self.data['lang'] = lang - self.data['redirect'] = red - self.data['layout'] = 'redirect' - end - end - class TranslatePageGenerator < Generator def generate(site) #load translations files @@ -45,19 +27,14 @@ module Jekyll lang = file.split('.')[0] locs[lang] = YAML.load_file("_translations/"+file)[lang] end - #Load redirections files - redirects = {} - Dir.foreach('_redirects') do |file| - next if file == '.' or file == '..' - id = file.split('.')[0] - redirects[id] = YAML.load_file("_redirects/" + file) - end #Generate each translated page based on templates + if !File.directory?(site.dest) + Dir.mkdir(site.dest) + end locs.each do |lang,value| Dir.foreach('_templates') do |file| next if file == '.' or file == '..' id = file.split('.')[0] - next if redirects.has_key?(id) and ( !redirects[id].has_key?('except') or !redirects[id]['except'].has_key?(lang) ) dst = locs[lang]['url'][id] next if dst.nil? or dst == '' src = file @@ -65,23 +42,6 @@ module Jekyll site.pages << TranslatePage.new(site, site.source, lang, '_templates', src, lang, dst) end site.pages << TranslatePage.new(site, site.source, lang, '_templates', 'index.html', lang, 'index.html') - #Generate each redirection page based on _redirects.yml - if !File.directory?(site.dest) - Dir.mkdir(site.dest) - end - redirects.each do |id,redirect| - next if redirect.has_key?('except') and redirect['except'].has_key?(lang) - src = redirect['dst'] - src = src + '.html' - dst = locs[lang]['url'][id] - next if dst.nil? or dst == '' - dst = dst + '.html' - red = redirect['dst'] - red = locs[lang]['url'][red] - next if red.nil? or red == '' - red = '/' + lang + '/' + CGI::escape(red) - site.pages << PageRedirect.new(site, site.source, lang, '_templates', src, lang, dst, red) - end end end end diff --git a/_redirects/about.yml b/_redirects/about.yml deleted file mode 100644 index ddc76a5e..00000000 --- a/_redirects/about.yml +++ /dev/null @@ -1,11 +0,0 @@ -dst: faq -except: - ar: true - fa: true - id: true - it: true - nl: true - pl: true - tr: true - zh_CN: true - zh_TW: true diff --git a/_redirects/bitcoin-for-enthusiasts.yml b/_redirects/bitcoin-for-enthusiasts.yml deleted file mode 100644 index ca584607..00000000 --- a/_redirects/bitcoin-for-enthusiasts.yml +++ /dev/null @@ -1,4 +0,0 @@ -dst: innovation -except: - ar: true - fa: true diff --git a/_templates/about.html b/_templates/about.html deleted file mode 100755 index 0028d0c8..00000000 --- a/_templates/about.html +++ /dev/null @@ -1,40 +0,0 @@ ---- -layout: base -id: about ---- -

{% translate pagetitle %}

- -

{% translate history %}

-

{% translate historytxt1 %}

-

{% translate historytxt2 %}

-

{% translate historytxt3 %}

-

{% translate historytxt4 %}

- -

{% translate technical %}

-

{% translate technicalintro %}

-
    -
  • {% translate technicaltxt1 %}
    • -
  • {% translate technicaltxt2 %}
    • -
  • {% translate technicaltxt3 %}
    • -
  • {% translate technicaltxt4 %}
    • -
  • {% translate technicaltxt5 %}
    • -
  • {% translate technicaltxt6 %}
    • -
- -

{% translate economics %}

-

{% translate economicsintro %}

-
    -
  • {% translate economicstxt1 %}
    • -
  • {% translate economicstxt2 %}
    • -
  • {% translate economicstxt3 %}
    • -
- -

{% translate stats %}

-

{% translate statsintro %}

-
    -
  • {% translate statstxt1 %}
    • -
  • {% translate statstxt2 %}
    • -
  • {% translate statstxt3 %}
    • -
  • {% translate statstxt4 %}
    • -
  • {% translate statstxt5 %}
    • -
diff --git a/_templates/bitcoin-for-enthusiasts.html b/_templates/bitcoin-for-enthusiasts.html deleted file mode 100755 index 758aeb87..00000000 --- a/_templates/bitcoin-for-enthusiasts.html +++ /dev/null @@ -1,27 +0,0 @@ ---- -layout: base -id: bitcoin-for-enthusiasts ---- -

{% translate pagetitle %}

-

{% translate summary %}

- -

Icon{% translate consensus %}

-

{% translate consensustext %}

- -

Icon{% translate network %}

-

{% translate networktext %}

- -

Icon{% translate freedom %}

-

{% translate freedomtext %}

- -

Icon{% translate global %}

-

{% translate globaltext %}

- -

Icon{% translate transparency %}

-

{% translate transparencytext %}

- -

Icon{% translate secure %}

-

{% translate securetext %}

- -

Icon{% translate trust %}

-

{% translate trusttext %}

diff --git a/_templates/faq.html b/_templates/faq.html index 049486c5..f9c5af1d 100755 --- a/_templates/faq.html +++ b/_templates/faq.html @@ -2,6 +2,49 @@ layout: base id: faq --- + +{% case page.lang %} +{% when 'ar' or 'es' or 'fa' or 'id' or 'it' or 'nl' or 'pl' or 'tr' or 'zh_CN' or 'zh_TW' %} + +

{% translate pagetitle %}

+ +

{% translate history %}

+

{% translate historytxt1 %}

+

{% translate historytxt2 %}

+

{% translate historytxt3 %}

+

{% translate historytxt4 %}

+ +

{% translate technical %}

+

{% translate technicalintro %}

+
    +
  • {% translate technicaltxt1 %}
    • +
  • {% translate technicaltxt2 %}
    • +
  • {% translate technicaltxt3 %}
    • +
  • {% translate technicaltxt4 %}
    • +
  • {% translate technicaltxt5 %}
    • +
  • {% translate technicaltxt6 %}
    • +
+ +

{% translate economics %}

+

{% translate economicsintro %}

+
    +
  • {% translate economicstxt1 %}
    • +
  • {% translate economicstxt2 %}
    • +
  • {% translate economicstxt3 %}
    • +
+ +

{% translate stats %}

+

{% translate statsintro %}

+
    +
  • {% translate statstxt1 %}
    • +
  • {% translate statstxt2 %}
    • +
  • {% translate statstxt3 %}
    • +
  • {% translate statstxt4 %}
    • +
  • {% translate statstxt5 %}
    • +
+ +{% else %} +

{% translate pagetitle %}

{% translate summary %}

@@ -284,3 +327,5 @@ id: faq

{% translate morehelp %}

{% translate morehelptxt1 %}

+ +{% endcase %} diff --git a/_translations/ar.yml b/_translations/ar.yml index fa7581f0..1b50029d 100644 --- a/_translations/ar.yml +++ b/_translations/ar.yml @@ -1,5 +1,5 @@ ar: - about: + faq: title: "عن - بت كوين" pagetitle: "عن ألبت كوين" history: "نبذة تاريخية" @@ -65,7 +65,7 @@ ar: instanttext: "عادة معاملات ألبت كوين يتم إستلامها بغضون ثواني قليلة و يتم تأكيدها خلال 10 دقائق. قبل هذا, عملية ألدفع ممكن إعتبارها موثّقة لكن قابلة للعكس. إذا كنت تتطلب بشدة عمليات دفع فورية, من ألمفضل أن تسأل لرسوم نقل بسيطة و تستخدم نظام لكشف ألدفع ألمزدوج." micro: "مدفوعات مصغرة رخيصة" microtext: "ألبت كوين يوفر أقل رسوم لمعالجة ألمدفوعات لأي نوع من عمليات ألتبادل, بضمنها ألمدفوعات ألمصغرة. معنى ذلك أنه ممكن أيضا إستخدامها لتصميم و إنجاز خدمات مبدعة جديدة على ألإنترنت لم تكن ممكنة قبلا لمجرد سبب حدود ألتمويل." - bitcoin-for-enthusiasts: + innovation: title: "بت كوين للهواة" pagetitle: "بت كوين للهواة" summary: "يقوم ألبت كوين ألأن بتغيير عالم ألتمويل, عن طريق منحك قدرة ألتحكم بنقودك." @@ -435,7 +435,7 @@ ar: menu-bitcoin-for-individuals: "أفراد" menu-bitcoin-for-businesses: "أعمال" menu-bitcoin-for-developers: "مطورين" - menu-bitcoin-for-enthusiasts: "هواة" + menu-innovation: "ابتكار" menu-bitcoin-for-press: "" menu-how-it-works: "كيف يعمل" menu-vocabulary: "مفردات" @@ -444,14 +444,14 @@ ar: menu-development: "تطوير" menu-support-bitcoin: "شارك" menu-foundation: "مؤسسة" - menu-about: "عن" + menu-faq: "عن" menu-choose-your-wallet: "إختر محفظتك" menu-you-need-to-know: "تحتاج أن تعلم" footer: "Released under the MIT license" url: - about: "عن" + faq: "عن" bitcoin-for-developers: "بت-كوين-للمطورين" - bitcoin-for-enthusiasts: "بت-كوين-للهواة" + innovation: innovation bitcoin-for-individuals: "بت-كوين-للأفراد" bitcoin-for-businesses: "بت-كوين-للأعمال" bitcoin-for-press: "" diff --git a/_translations/bg.yml b/_translations/bg.yml index 9a0e2f3b..6b5dab30 100644 --- a/_translations/bg.yml +++ b/_translations/bg.yml @@ -557,10 +557,8 @@ bg: footer: "разпространен под лиценза на Масачузетския технологичен институт" getstarted: "Първи стъпки в Биткойн" url: - about: about about-us: about-us bitcoin-for-developers: bitcoin-for-developers - bitcoin-for-enthusiasts: bitcoin-for-enthusiasts bitcoin-for-individuals: bitcoin-for-individuals bitcoin-for-businesses: bitcoin-for-businesses choose-your-wallet: choose-your-wallet diff --git a/_translations/de.yml b/_translations/de.yml index 6703b2c1..681324f2 100644 --- a/_translations/de.yml +++ b/_translations/de.yml @@ -557,10 +557,8 @@ de: footer: "Veröffentlicht unter der MIT Lizenz" getstarted: "Legen Sie los mit Bitcoin" url: - about: ueber about-us: ueber-uns bitcoin-for-developers: bitcoin-fuer-entwickler - bitcoin-for-enthusiasts: bitcoin-fuer-enthusiasten bitcoin-for-individuals: bitcoin-fuer-einzelpersonen bitcoin-for-businesses: bitcoin-fuer-unternehmen choose-your-wallet: waehlen-sie-ihre-wallet diff --git a/_translations/en.yml b/_translations/en.yml index 4bd8fe3f..fe0d9ff7 100644 --- a/_translations/en.yml +++ b/_translations/en.yml @@ -561,10 +561,8 @@ en: footer: "Released under the MIT license" getstarted: "Get started with Bitcoin" url: - about: about about-us: about-us bitcoin-for-developers: bitcoin-for-developers - bitcoin-for-enthusiasts: bitcoin-for-enthusiasts bitcoin-for-individuals: bitcoin-for-individuals bitcoin-for-businesses: bitcoin-for-businesses choose-your-wallet: choose-your-wallet diff --git a/_translations/fa.yml b/_translations/fa.yml index cffc810c..1244fa3b 100644 --- a/_translations/fa.yml +++ b/_translations/fa.yml @@ -1,5 +1,5 @@ fa: - about: + faq: title: "درباره - بیت کوین" pagetitle: "درباره-بیت-کوین" history: "کمی از تاریخچه" @@ -65,7 +65,7 @@ fa: instanttext: "یک تراکنش بیت کوین معمولاً در چند ثانیه می رسد و در حدود 10 دقیقه تایید می شود. قبل از آن ، تراکنش می تواند موفق اما قابل بازگشت در نظر گرفته شود. اگر واقعاً به تراکنش های مستقیم نیاز دارید ، پیشنهاد می شود که یک هزینه ی کم تراکنش درخواست کرده و از یک سیستم تشخیض پرداخت دوباره یا به عبارتی تکراری استفاده کنید." micro: "پرداخت های خرد ارزان" microtext: "بیت کوین پایین ترین هزینه های پردازش پرداخت را برای هر نوع از تراکنش ارائه می دهد ، که شامل پرداخت های مایکرو یا خرد هم می شود. این به معنای این است که می تواند برای طراحی و پیاده سازی سرویس های آنلاین سازنده ی جدیدی که قبلاً به دلیل محدودیت های مالی نمی توانستند وجود داشته باشند ، استفاده شود." - bitcoin-for-enthusiasts: + innovation: title: "بیت کوین برای علاقه مندان - بیت کوین" pagetitle: "بیت کوین برای علاقه مندان" summary: "بیت کوین با دادن قابلیت کنترل روی پولتان به شما، در حال تغییر دنیای سرمایه گذاری است." @@ -340,8 +340,8 @@ fa: menu-bitcoin-for-individuals: افراد menu-bitcoin-for-businesses: کسب و کارها menu-bitcoin-for-developers: توسعه دهندگان - menu-bitcoin-for-enthusiasts: علاقه مندان menu-bitcoin-for-press: + menu-innovation: بدعت menu-how-it-works: "چگونه کار می کند" menu-vocabulary: واژگان menu-resources: منابع @@ -349,14 +349,14 @@ fa: menu-development: توسعه menu-support-bitcoin: شرکت کردن menu-foundation: بنیاد - menu-about: درباره + menu-faq: درباره menu-choose-your-wallet: "انتخاب کیف پول" menu-you-need-to-know: "آن چه باید بدانید" footer: "منتشر شده تحت MIT گواهینامه" url: - about: درباره + faq: درباره bitcoin-for-developers: بیت-کوین-برای-توسعه-دهندگان - bitcoin-for-enthusiasts: بیت-کوین-برای-علاقه-مندان + innovation: innovation bitcoin-for-individuals: بیت-کوین-برای-افراد bitcoin-for-businesses: بیت-کوین-برای-کسب-و-کار bitcoin-for-press: diff --git a/_translations/fr.yml b/_translations/fr.yml index 32fac66b..3192c9aa 100644 --- a/_translations/fr.yml +++ b/_translations/fr.yml @@ -560,10 +560,8 @@ fr: footer: "Publié sous la licence MIT" getstarted: "Débuter avec Bitcoin" url: - about: a-propos about-us: a-propos-de-nous bitcoin-for-developers: bitcoin-pour-developpeurs - bitcoin-for-enthusiasts: bitcoin-pour-passionnes bitcoin-for-individuals: bitcoin-pour-particuliers bitcoin-for-businesses: bitcoin-pour-entreprises choose-your-wallet: choisir-votre-porte-monnaie diff --git a/_translations/id.yml b/_translations/id.yml index 183f490f..1922a76e 100644 --- a/_translations/id.yml +++ b/_translations/id.yml @@ -382,7 +382,6 @@ id: url: about-us: mengenai-kami bitcoin-for-developers: bitcoin-untuk-para-pengembang - bitcoin-for-enthusiasts: bitcoin-untuk-penggemar bitcoin-for-individuals: bitcoin-untuk-perorangan bitcoin-for-businesses: bitcoin-untuk-bisnis choose-your-wallet: pilih-dompet-anda diff --git a/_translations/it.yml b/_translations/it.yml index d59c9607..72c8b5f1 100644 --- a/_translations/it.yml +++ b/_translations/it.yml @@ -1,5 +1,5 @@ it: - about: + faq: title: "A proposito - Bitcoin" pagetitle: "A proposito di Bitcoin" history: "Un po' di storia" @@ -391,7 +391,7 @@ it: blockchain: la Blockchain blockchaintxt: (un registro delle transazioni pubblico e condiviso) layout: - menu-about: A proposito + menu-faq: A proposito menu-about-us: "A proposito di Bitcoin" menu-bitcoin-for-businesses: Imprese menu-bitcoin-for-developers: Sviluppatori @@ -411,10 +411,9 @@ it: footer: "Rilasciato sotto licenza MIT" getstarted: "Come iniziare con Bitcoin" url: - about: a-proposito + faq: a-proposito about-us: chi-siamo bitcoin-for-developers: bitcoin-per-sviluppatori - bitcoin-for-enthusiasts: bitcoin-per-appassionati bitcoin-for-individuals: bitcoin-per-privati bitcoin-for-businesses: bitcoin-per-imprese choose-your-wallet: scegli-il-tuo-portafoglio diff --git a/_translations/nl.yml b/_translations/nl.yml index 9046dfa5..b4b7c326 100644 --- a/_translations/nl.yml +++ b/_translations/nl.yml @@ -1,5 +1,5 @@ nl: - about: + faq: title: "Over Bitcoin - Bitcoin" pagetitle: "Over Bitcoin" history: "Eerst wat geschiedenis" @@ -391,7 +391,7 @@ nl: blockchain: de blokketen blockchaintxt: (een gedeelde, openbare transactiegeschiedenis) layout: - menu-about: "Over Bitcoin" + menu-faq: "Over Bitcoin" menu-about-us: "Over bitcoin.org" menu-bitcoin-for-businesses: Bedrijven menu-bitcoin-for-developers: Ontwikkelaars @@ -411,10 +411,9 @@ nl: footer: "Beschikbaar onder de MIT-licentie" getstarted: "Ga aan de slag met Bitcoin" url: - about: over-bitcoin + faq: over-bitcoin about-us: over-ons bitcoin-for-developers: bitcoin-voor-ontwikkelaars - bitcoin-for-enthusiasts: bitcoin-voor-liefhebbers bitcoin-for-individuals: bitcoin-voor-particulieren bitcoin-for-businesses: bitcoin-voor-bedrijven choose-your-wallet: kies-uw-portemonnee diff --git a/_translations/pl.yml b/_translations/pl.yml index ca904f81..93451d19 100644 --- a/_translations/pl.yml +++ b/_translations/pl.yml @@ -1,5 +1,5 @@ pl: - about: + faq: title: "O Bitcoin" pagetitle: "O Bitcoin" history: "Kawałek historii" @@ -384,16 +384,15 @@ pl: menu-innovation: Innowacje menu-support-bitcoin: Uczestniczyć menu-foundation: Fundacja - menu-about: O bitcoinie + menu-faq: O bitcoinie menu-about-us: "O bitcoin.org" menu-choose-your-wallet: "Wybierz swój portfel" menu-you-need-to-know: "Powinieneś wiedzieć" footer: "Dostępny w ramach licencji MIT" url: - about: o + faq: o about-us: o-nas bitcoin-for-developers: bitcoin-dla-deweloperow - bitcoin-for-enthusiasts: bitcoin-dla-entuzjastow bitcoin-for-individuals: bitcoin-dla-osob-fizycznych bitcoin-for-businesses: bitcoin-dla-biznesu bitcoin-for-press: diff --git a/_translations/ru.yml b/_translations/ru.yml index ff347f01..e29e97d7 100644 --- a/_translations/ru.yml +++ b/_translations/ru.yml @@ -557,10 +557,8 @@ ru: footer: "Программное обеспечение распространяется под лицензией MIT" getstarted: "Начало работы с Биткоин" url: - about: описание about-us: about-us bitcoin-for-developers: биткоин-разработчикам - bitcoin-for-enthusiasts: биткоин-энтузиастам bitcoin-for-individuals: биткоин-частным-лицам bitcoin-for-businesses: биткоин-бизнесу choose-your-wallet: выберите-свой-кошелек diff --git a/_translations/tr.yml b/_translations/tr.yml index e2b735b1..4c30459d 100644 --- a/_translations/tr.yml +++ b/_translations/tr.yml @@ -1,5 +1,5 @@ tr: - about: + faq: title: "Hakkında - Bitcoin" pagetitle: "Bitcoin Hakkında" history: "Biraz tarih" @@ -391,7 +391,7 @@ tr: blockchain: Blok zinciri blockchaintxt: (paylaşılan halka açık işlem günlüğü) layout: - menu-about: Hakkında + menu-faq: Hakkında menu-about-us: "Bitcoin.org hakkında" menu-bitcoin-for-businesses: İşletmeler menu-bitcoin-for-developers: Geliştiriciler @@ -411,10 +411,9 @@ tr: footer: "MIT lisansı altında yayılmaktadır" getstarted: "Bitcoin'e başlayın" url: - about: hakkinda + faq: hakkinda about-us: hakkimizda bitcoin-for-developers: gelistiriciler-icin-bitcoin - bitcoin-for-enthusiasts: hevesliler-icin-bitcoin bitcoin-for-individuals: bireyler-icin-bitcoin bitcoin-for-businesses: isletmeler-icin-bitcoin choose-your-wallet: cuzdaninizi-secin diff --git a/_translations/zh_CN.yml b/_translations/zh_CN.yml index ca76e573..3c24b9eb 100644 --- a/_translations/zh_CN.yml +++ b/_translations/zh_CN.yml @@ -1,5 +1,5 @@ zh_CN: - about: + faq: title: "关于 － 比特币" pagetitle: "关于比特币" history: "历史背景" @@ -389,7 +389,7 @@ zh_CN: blockchain: 块链 blockchaintxt: (一个公开共享的交易记录) layout: - menu-about: 关于我们 + menu-faq: 关于我们 menu-about-us: "关于bitcoin.org" menu-bitcoin-for-businesses: 商家 menu-bitcoin-for-developers: 开发者 @@ -409,10 +409,9 @@ zh_CN: footer: "基于MIT协议授权发布" getstarted: "比特币入门指南" url: - about: about + faq: about about-us: about-us bitcoin-for-developers: bitcoin-for-developers - bitcoin-for-enthusiasts: bitcoin-for-enthusiasts bitcoin-for-individuals: bitcoin-for-individuals bitcoin-for-businesses: bitcoin-for-businesses choose-your-wallet: choose-your-wallet diff --git a/_translations/zh_TW.yml b/_translations/zh_TW.yml index e5da5a4b..0fbfccb1 100644 --- a/_translations/zh_TW.yml +++ b/_translations/zh_TW.yml @@ -1,5 +1,5 @@ zh_TW: - about: + faq: title: "關於 - Bitcoin" pagetitle: "關於 Bitcoin" history: "Bitcoin 簡史" @@ -384,16 +384,15 @@ zh_TW: menu-innovation: 創新 menu-foundation: 基金會 menu-support-bitcoin: 參與 - menu-about: 關於 + menu-faq: 關於 menu-about-us: "關於 bitcoin.org" menu-choose-your-wallet: "選擇你的錢包" menu-you-need-to-know: "Bitcoin 使用須知" footer: "以 MIT 授權發佈" url: - about: about + faq: about about-us: about-us bitcoin-for-developers: bitcoin-for-developers - bitcoin-for-enthusiasts: bitcoin-for-enthusiasts bitcoin-for-individuals: bitcoin-for-individuals bitcoin-for-businesses: bitcoin-for-businesses bitcoin-for-press: diff --git a/about.html b/about.html deleted file mode 100644 index 6808fba9..00000000 --- a/about.html +++ /dev/null @@ -1,5 +0,0 @@ ---- -layout: redirect -redirect: /en/faq -lang: en ---- diff --git a/clients.html b/clients.html deleted file mode 100644 index b739fb5b..00000000 --- a/clients.html +++ /dev/null @@ -1,5 +0,0 @@ ---- -layout: redirect -redirect: /en/choose-your-wallet -lang: en ---- diff --git a/news.html b/news.html deleted file mode 100644 index b2ebd202..00000000 --- a/news.html +++ /dev/null @@ -1,5 +0,0 @@ ---- -layout: redirect -redirect: /en/version-history -lang: en ----