replace zh_CN by zh

zh/cakephp-overview.rst

@@ -5,7 +5,7 @@ CakePHP 概述
 得轻而易举!
 
 本手册假定你了解 PHP，并且有面向对象编程(OOP)方面的基础知识。框架中的不同功能使用
-了不同的技术——例如 SQL、JavaScript 和 XML ——本手册不会讲解这些技术，而只是它们在 
+了不同的技术——例如 SQL、JavaScript 和 XML ——本手册不会讲解这些技术，而只是它们在
 CakePHP 框架中是如何应用的。
 
 .. toctree::
@@ -17,5 +17,5 @@ CakePHP 框架中是如何应用的。
 
 
 .. meta::
-    :title lang=zh_CN: CakePHP Overview
-    :keywords lang=zh_CN: web application framework,model view controller,object oriented programming,piece of cake,cookbook,functionality,xml,cakephp
+    :title lang=zh: CakePHP Overview
+    :keywords lang=zh: web application framework,model view controller,object oriented programming,piece of cake,cookbook,functionality,xml,cakephp

zh/cakephp-overview/understanding-model-view-controller.rst

@@ -79,5 +79,5 @@ CakePHP 创建了你的第一个应用程序，你将不会再考虑其他方法
 
 
 .. meta::
-    :title lang=zh_CN: Understanding Model-View-Controller
-    :keywords lang=zh_CN: model view controller,model layer,formatted result,model objects,music documents,business logic,text representation,first glance,retrieving data,software design,html page,videos music,new friends,interaction,cakephp,interface,photo,presentation,mvc,photos
+    :title lang=zh: Understanding Model-View-Controller
+    :keywords lang=zh: model view controller,model layer,formatted result,model objects,music documents,business logic,text representation,first glance,retrieving data,software design,html page,videos music,new friends,interaction,cakephp,interface,photo,presentation,mvc,photos

zh/cakephp-overview/what-is-cakephp-why-use-it.rst

@@ -49,5 +49,5 @@ CakePHP 有积极的 `开发团队 <https://github.com/cakephp?tab=members>`_ 
 
 
 .. meta::
-    :title lang=zh_CN: What is CakePHP? Why Use it?
-    :keywords lang=zh_CN: custom urls,php syntax,cookie security,database interaction,security session,rapid manner,developer team,free open source,javascript html,apache configuration,web site directory,html forms,code generation,development framework,monotony,rapid development,scaffolding,dispatcher,friendly community,crud
+    :title lang=zh: What is CakePHP? Why Use it?
+    :keywords lang=zh: custom urls,php syntax,cookie security,database interaction,security session,rapid manner,developer team,free open source,javascript html,apache configuration,web site directory,html forms,code generation,development framework,monotony,rapid development,scaffolding,dispatcher,friendly community,crud

zh/cakephp-overview/where-to-get-help.rst

@@ -85,6 +85,6 @@ Stackoverflow
 
 
 .. meta::
-    :title lang=zh_CN: Where to Get Help
-    :description lang=zh_CN: Where to get help with CakePHP: The official CakePHP website, The Cookbook, The Bakery, The API, in the test cases, the IRC channel, The CakePHP Google Group or CakePHP Questions.
-    :keywords lang=zh_CN: cakephp,cakephp help,help with cakephp,where to get help,cakephp irc,cakephp questions,cakephp api,cakephp test cases,open source projects,channel irc,code reference,irc channel,developer tools,test case,bakery
+    :title lang=zh: Where to Get Help
+    :description lang=zh: Where to get help with CakePHP: The official CakePHP website, The Cookbook, The Bakery, The API, in the test cases, the IRC channel, The CakePHP Google Group or CakePHP Questions.
+    :keywords lang=zh: cakephp,cakephp help,help with cakephp,where to get help,cakephp irc,cakephp questions,cakephp api,cakephp test cases,open source projects,channel irc,code reference,irc channel,developer tools,test case,bakery

zh/conf.py

@@ -19,4 +19,4 @@
 # Pull in all the configuration options defined in the global config file..
 from config.all import *
 
-language = 'zh_CN'
+language = 'zh'

zh/contents.rst

@@ -23,5 +23,5 @@ Contents
 .. todolist::
 
 .. meta::
-    :title lang=zh_CN: Contents
-    :keywords lang=zh_CN: core libraries,ref search,shells,deployment,appendices,glossary,models
+    :title lang=zh: Contents
+    :keywords lang=zh: core libraries,ref search,shells,deployment,appendices,glossary,models

zh/contributing.rst

@@ -16,5 +16,5 @@
 
 
 .. meta::
-    :title lang=zh_CN: Contributing
-    :keywords lang=zh_CN: coding conventions,documentation,maxdepth
+    :title lang=zh: Contributing
+    :keywords lang=zh: coding conventions,documentation,maxdepth

zh/contributing/cakephp-coding-conventions.rst

@@ -538,5 +538,5 @@ PHP 标签
 
 
 .. meta::
-    :title lang=zh_CN: Coding Standards
-    :keywords lang=zh_CN: curly brackets,indentation level,logical errors,control structures,control structure,expr,coding standards,parenthesis,foreach,readability,moose,new features,repository,developers
+    :title lang=zh: Coding Standards
+    :keywords lang=zh: curly brackets,indentation level,logical errors,control structures,control structure,expr,coding standards,parenthesis,foreach,readability,moose,new features,repository,developers

zh/contributing/code.rst

@@ -124,5 +124,5 @@ CakePHP 仓库的改动，保持与 CakePHP 仓库一致::
 
 
 .. meta::
-    :title lang=zh_CN: Code
-    :keywords lang=zh_CN: cakephp source code,code patches,test ref,descriptive name,bob barker,initial setup,global user,database connection,clone,repository,user information,enhancement,back patches,checkout
+    :title lang=zh: Code
+    :keywords lang=zh: cakephp source code,code patches,test ref,descriptive name,bob barker,initial setup,global user,database connection,clone,repository,user information,enhancement,back patches,checkout

zh/contributing/documentation.rst

@@ -438,5 +438,5 @@ one reference **without** ``:no-index:`` to still have the function referenced::
 
 
 .. meta::
-    :title lang=zh_CN: Documentation
-    :keywords lang=zh_CN: partial translations,translation efforts,html entities,text markup,asfd,asdf,structured text,english content,markdown,formatted text,dot org,repo,consistency,translator,freenode,textile,improvements,syntax,cakephp,submission
+    :title lang=zh: Documentation
+    :keywords lang=zh: partial translations,translation efforts,html entities,text markup,asfd,asdf,structured text,english content,markdown,formatted text,dot org,repo,consistency,translator,freenode,textile,improvements,syntax,cakephp,submission

zh/contributing/tickets.rst

@@ -43,5 +43,5 @@
 
 
 .. meta::
-    :title lang=zh_CN: Tickets
-    :keywords lang=zh_CN: bug reporting system,code snippet,reporting security,private mailing,release announcement,google,ticket system,core team,security issue,bug tracker,irc channel,test cases,support questions,bug report,security issues,bug reports,exploits,vulnerability,repository
+    :title lang=zh: Tickets
+    :keywords lang=zh: bug reporting system,code snippet,reporting security,private mailing,release announcement,google,ticket system,core team,security issue,bug tracker,irc channel,test cases,support questions,bug report,security issues,bug reports,exploits,vulnerability,repository

zh/controllers.rst

@@ -719,5 +719,5 @@ $components、$helpers 和 $uses
 
 
 .. meta::
-    :title lang=zh_CN: Controllers
-    :keywords lang=zh_CN: correct models,controller class,controller controller,core library,single model,request data,middle man,bakery,mvc,attributes,logic,recipes
+    :title lang=zh: Controllers
+    :keywords lang=zh: correct models,controller class,controller controller,core library,single model,request data,middle man,bakery,mvc,attributes,logic,recipes

zh/controllers/components.rst

@@ -252,5 +252,5 @@
 
 
 .. meta::
-    :title lang=zh_CN: Components
-    :keywords lang=zh_CN: array controller,core libraries,authentication request,array name,access control lists,public components,controller code,core components,cookiemonster,login cookie,configuration settings,functionality,logic,sessions,cakephp,doc
+    :title lang=zh: Components
+    :keywords lang=zh: array controller,core libraries,authentication request,array name,access control lists,public components,controller code,core components,cookiemonster,login cookie,configuration settings,functionality,logic,sessions,cakephp,doc

zh/controllers/pages-controller.rst

@@ -21,5 +21,5 @@ CakePHP 自带 ``PagesController.php`` 作为默认的控制器。这是一个
 
 
 .. meta::
-    :title lang=zh_CN: The Pages Controller
-    :keywords lang=zh_CN: pages controller,default controller,lib,cakephp,ships,php,file folder
+    :title lang=zh: The Pages Controller
+    :keywords lang=zh: pages controller,default controller,lib,cakephp,ships,php,file folder

zh/controllers/request-response.rst

@@ -775,5 +775,5 @@ CakeResponse API
     .. versionadded:: 2.3
 
 .. meta::
-    :title lang=zh_CN: Request and Response objects
-    :keywords lang=zh_CN: request controller,request parameters,array indexes,purpose index,response objects,domain information,request object,request data,interrogating,params,previous versions,introspection,dispatcher,rout,data structures,arrays,ip address,migration,indexes,cakephp
+    :title lang=zh: Request and Response objects
+    :keywords lang=zh: request controller,request parameters,array indexes,purpose index,response objects,domain information,request object,request data,interrogating,params,previous versions,introspection,dispatcher,rout,data structures,arrays,ip address,migration,indexes,cakephp

zh/controllers/scaffolding.rst

@@ -111,5 +111,5 @@ User 表单中显示来自 Group 表的 ID 或者名字构成的下拉列表::
 
 
 .. meta::
-    :title lang=zh_CN: Scaffolding
-    :keywords lang=zh_CN: database schemas,loose structure,scaffolding,scaffold,php class,database tables,web developer,downside,web application,logic,developers,cakephp,running,current,delete,database application
+    :title lang=zh: Scaffolding
+    :keywords lang=zh: database schemas,loose structure,scaffolding,scaffold,php class,database tables,web developer,downside,web application,logic,developers,cakephp,running,current,delete,database application

zh/core-libraries.rst

@@ -69,5 +69,5 @@ CakePHP 自带丰富的内置函数和类。这些类和函数尽力涵盖网络
 
 
 .. meta::
-    :title lang=zh_CN: Core Libraries
-    :keywords lang=zh_CN: core libraries,global constants,cookie,access control lists,number,text,time,security component,core components,general purpose,web applications,markup,authentication,api,cakephp,functionality,sessions,collections,events
+    :title lang=zh: Core Libraries
+    :keywords lang=zh: core libraries,global constants,cookie,access control lists,number,text,time,security component,core components,general purpose,web applications,markup,authentication,api,cakephp,functionality,sessions,collections,events

zh/core-libraries/caching.rst

@@ -400,5 +400,5 @@ CacheEngine必需的API为
 
 
 .. meta::
-    :title lang=zh_CN: Caching
-    :keywords lang=zh_CN: uniform api,xcache,cache engine,cache system,atomic operations,php class,disk storage,static methods,php extension,consistent manner,similar features,apc,memcache,queries,cakephp,elements,servers,memory
+    :title lang=zh: Caching
+    :keywords lang=zh: uniform api,xcache,cache engine,cache system,atomic operations,php class,disk storage,static methods,php extension,consistent manner,similar features,apc,memcache,queries,cakephp,elements,servers,memory

zh/core-libraries/helpers/html.rst

@@ -1054,6 +1054,6 @@ HtmlHelper助件的一些方法及如何使用它们。
 
 
 .. meta::
-    :title lang=zh_CN: HtmlHelper
-    :description lang=zh_CN: The role of the HtmlHelper in CakePHP is to make HTML-related options easier, faster, and more resilient to change.
-    :keywords lang=zh_CN: html helper,cakephp css,cakephp script,content type,html image,html link,html tag,script block,script start,html url,cakephp style,cakephp crumbs
+    :title lang=zh: HtmlHelper
+    :description lang=zh: The role of the HtmlHelper in CakePHP is to make HTML-related options easier, faster, and more resilient to change.
+    :keywords lang=zh: html helper,cakephp css,cakephp script,content type,html image,html link,html tag,script block,script start,html url,cakephp style,cakephp crumbs

zh/development.rst

@@ -17,5 +17,5 @@
     development/dispatch-filters
 
 .. meta::
-    :title lang=zh_CN: Development
-    :keywords lang=zh_CN: development sessions,debugging,exceptions
+    :title lang=zh: Development
+    :keywords lang=zh: development sessions,debugging,exceptions

zh/development/configuration.rst

@@ -749,5 +749,5 @@ CakePHP 知道如何把这些联结在一起，是通过单词的单数和复数
 
 
 .. meta::
-    :title lang=zh_CN: Configuration
-    :keywords lang=zh_CN: finished configuration,legacy database,database configuration,value pairs,default connection,optional configuration,example database,php class,configuration database,default database,configuration steps,index database,configuration details,class database,host localhost,inflections,key value,database connection,piece of cake,basic web
+    :title lang=zh: Configuration
+    :keywords lang=zh: finished configuration,legacy database,database configuration,value pairs,default connection,optional configuration,example database,php class,configuration database,default database,configuration steps,index database,configuration details,class database,host localhost,inflections,key value,database connection,piece of cake,basic web

zh/development/debugging.rst

@@ -183,6 +183,6 @@ Xdebug
 
 
 .. meta::
-    :title lang=zh_CN: Debugging
-    :description lang=zh_CN: Debugging CakePHP with the Debugger class, logging, basic debugging and using the DebugKit plugin.
-    :keywords lang=zh_CN: code excerpt,stack trace,default output,error link,default error,web requests,error report,debugger,arrays,different ways,excerpt from,cakephp,ide,options
+    :title lang=zh: Debugging
+    :description lang=zh: Debugging CakePHP with the Debugger class, logging, basic debugging and using the DebugKit plugin.
+    :keywords lang=zh: code excerpt,stack trace,default output,error link,default error,web requests,error report,debugger,arrays,different ways,excerpt from,cakephp,ide,options

zh/development/dispatch-filters.rst

@@ -206,6 +206,6 @@ CakePHP 内部的路由系统这样的核心过滤器中的逻辑了。虽然并
 
 
 .. meta::
-    :title lang=zh_CN: Dispatcher Filters
-    :description lang=zh_CN: Dispatcher filters are a middleware layer for CakePHP allowing to alter the request or response before it is sent
-    :keywords lang=zh_CN: middleware, filters, dispatcher, request, response, rack, application stack, events, beforeDispatch, afterDispatch, router
+    :title lang=zh: Dispatcher Filters
+    :description lang=zh: Dispatcher filters are a middleware layer for CakePHP allowing to alter the request or response before it is sent
+    :keywords lang=zh: middleware, filters, dispatcher, request, response, rack, application stack, events, beforeDispatch, afterDispatch, router

zh/development/errors.rst

@@ -101,5 +101,5 @@
 若要保持默认的致命错误行为，可以自定义处理中调用 ``ErrorHandler::handleFatalError()``。
 
 .. meta::
-    :title lang=zh_CN: Error Handling
-    :keywords lang=zh_CN: stack traces,error constants,error array,default displays,anonymous functions,error handlers,default error,error level,exception handler,php error,error handler,write error,core classes,exception handling,configuration error,application code,callback,custom error,exceptions,bitmasks,fatal error
+    :title lang=zh: Error Handling
+    :keywords lang=zh: stack traces,error constants,error array,default displays,anonymous functions,error handlers,default error,error level,exception handler,php error,error handler,write error,core classes,exception handling,configuration error,application code,callback,custom error,exceptions,bitmasks,fatal error

zh/development/exceptions.rst

@@ -395,5 +395,5 @@ RESTful 响应。
 
 
 .. meta::
-    :title lang=zh_CN: Exceptions
-    :keywords lang=zh_CN: uncaught exceptions,stack traces,logic errors,anonymous functions,renderer,html page,error messages,flexibility,lib,array,cakephp,php
+    :title lang=zh: Exceptions
+    :keywords lang=zh: uncaught exceptions,stack traces,logic errors,anonymous functions,renderer,html page,error messages,flexibility,lib,array,cakephp,php

zh/development/rest.rst

@@ -209,5 +209,5 @@ CakePHP 中，:php:class:`RequestHandlerComponent` 有助于实现这一点。
 
 
 .. meta::
-    :title lang=zh_CN: REST
-    :keywords lang=zh_CN: application programmers,default routes,core functionality,result format,mashups,recipe database,request method,easy access,config,soap,recipes,logic,audience,cakephp,running,api
+    :title lang=zh: REST
+    :keywords lang=zh: application programmers,default routes,core functionality,result format,mashups,recipe database,request method,easy access,config,soap,recipes,logic,audience,cakephp,running,api

zh/development/routing.rst

@@ -957,5 +957,5 @@ connectNamed() 方法支持一些选项：
 
 
 .. meta::
-    :title lang=zh_CN: Routing
-    :keywords lang=zh_CN: controller actions,default routes,mod rewrite,code index,string url,php class,incoming requests,dispatcher,url url,meth,maps,match,parameters,array,config,cakephp,apache,router
+    :title lang=zh: Routing
+    :keywords lang=zh: controller actions,default routes,mod rewrite,code index,string url,php class,incoming requests,dispatcher,url url,meth,maps,match,parameters,array,config,cakephp,apache,router

zh/development/sessions.rst

@@ -319,5 +319,5 @@ IO 的好处，而不必担心缓存满了时会话会逐渐丢失。
 
 
 .. meta::
-    :title lang=zh_CN: Sessions
-    :keywords lang=zh_CN: session defaults,session classes,utility features,session timeout,session ids,persistent data,session key,session cookie,session data,last session,core database,security level,useragent,security reasons,session id,attr,countdown,regeneration,sessions,config
+    :title lang=zh: Sessions
+    :keywords lang=zh: session defaults,session classes,utility features,session timeout,session ids,persistent data,session key,session cookie,session data,last session,core database,security level,useragent,security reasons,session id,attr,countdown,regeneration,sessions,config

zh/development/testing.rst

@@ -1229,5 +1229,5 @@ step)*，包含如下代码::
 
 
 .. meta::
-    :title lang=zh_CN: Testing
-    :keywords lang=zh_CN: web runner,phpunit,test database,database configuration,database setup,database test,public test,test framework,running one,test setup,de facto standard,pear,runners,array,databases,cakephp,php,integration
+    :title lang=zh: Testing
+    :keywords lang=zh: web runner,phpunit,test database,database configuration,database setup,database test,public test,test framework,running one,test setup,de facto standard,pear,runners,array,databases,cakephp,php,integration

zh/epub-contents.rst

@@ -19,5 +19,5 @@ Contents
 .. todolist::
 
 .. meta::
-    :title lang=zh_CN: Contents
-    :keywords lang=zh_CN: core libraries,ref search,shells,deployment,appendices,glossary,models
+    :title lang=zh: Contents
+    :keywords lang=zh: core libraries,ref search,shells,deployment,appendices,glossary,models

zh/getting-started.rst

@@ -28,5 +28,5 @@ CakePHP 框架为应用程序提供了坚实的基础。它可以处理任何事
 
 
 .. meta::
-    :title lang=zh_CN: Getting Started
-    :keywords lang=zh_CN: folder structure,table names,initial request,database table,organizational structure,rst,filenames,conventions,mvc,web page,sit
+    :title lang=zh: Getting Started
+    :keywords lang=zh: folder structure,table names,initial request,database table,organizational structure,rst,filenames,conventions,mvc,web page,sit

zh/getting-started/a-typical-cakephp-request.rst

@@ -25,5 +25,5 @@ Figure: 2. 典型的 CakePHP 请求。
 
 
 .. meta::
-    :title lang=zh_CN: A Typical CakePHP Request
-    :keywords lang=zh_CN: optional element,model usage,controller class,custom cake,business logic,request example,request url,flow diagram,basic ingredients,datasources,sending emails,callback,cakes,manipulation,authentication,router,web server,parameters,cakephp,models
+    :title lang=zh: A Typical CakePHP Request
+    :keywords lang=zh: optional element,model usage,controller class,custom cake,business logic,request example,request url,flow diagram,basic ingredients,datasources,sending emails,callback,cakes,manipulation,authentication,router,web server,parameters,cakephp,models

zh/getting-started/cakephp-conventions.rst

@@ -150,5 +150,5 @@ PeopleController 控制器的 index() 方法的调用，并自动加载 Person 
 
 
 .. meta::
-    :title lang=zh_CN: CakePHP Conventions
-    :keywords lang=zh_CN: web development experience,maintenance nightmare,index method,legacy systems,method names,php class,uniform system,config files,tenets,apples,conventions,conventional controller,best practices,maps,visibility,news articles,functionality,logic,cakephp,developers
+    :title lang=zh: CakePHP Conventions
+    :keywords lang=zh: web development experience,maintenance nightmare,index method,legacy systems,method names,php class,uniform system,config files,tenets,apples,conventions,conventional controller,best practices,maps,visibility,news articles,functionality,logic,cakephp,developers