Commit 6201a48d authored by 信 赵's avatar 信 赵
Browse files

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/net/mingsoft/cms/action/web/MCmsAction.java
#	src/main/java/net/mingsoft/cms/biz/IArticleBiz.java
#	src/main/java/net/mingsoft/cms/biz/impl/ArticleBizImpl.java
#	src/main/java/net/mingsoft/cms/dao/IArticleDao.java
#	src/main/java/net/mingsoft/cms/dao/IArticleDao.xml
#	src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties
parents dfad56af 2d19a084
/**
* Bootstrap Table Spanish Spain translation
* Author: Marc Pina<iwalkalone69@gmail.com>
*/
(function ($) {
'use strict';
$.fn.bootstrapTable.locales['es-ES'] = {
formatLoadingMessage: function () {
return 'Por favor espere...';
},
formatRecordsPerPage: function (pageNumber) {
return pageNumber + ' resultados por página';
},
formatShowingRows: function (pageFrom, pageTo, totalRows) {
return 'Mostrando desde ' + pageFrom + ' hasta ' + pageTo + ' - En total ' + totalRows + ' resultados';
},
formatSearch: function () {
return 'Buscar';
},
formatNoMatches: function () {
return 'No se encontraron resultados';
},
formatPaginationSwitch: function () {
return 'Ocultar/Mostrar paginación';
},
formatRefresh: function () {
return 'Refrescar';
},
formatToggle: function () {
return 'Ocultar/Mostrar';
},
formatColumns: function () {
return 'Columnas';
},
formatAllRows: function () {
return 'Todos';
}
};
$.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['es-ES']);
})(jQuery);
/*
* bootstrap-table - v1.11.1 - 2017-02-22
* https://github.com/wenzhixin/bootstrap-table
* Copyright (c) 2017 zhixin wen
* Licensed MIT License
*/
!function(a){"use strict";a.fn.bootstrapTable.locales["es-ES"]={formatLoadingMessage:function(){return"Por favor espere..."},formatRecordsPerPage:function(a){return a+" resultados por página"},formatShowingRows:function(a,b,c){return"Mostrando desde "+a+" hasta "+b+" - En total "+c+" resultados"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron resultados"},formatPaginationSwitch:function(){return"Ocultar/Mostrar paginación"},formatRefresh:function(){return"Refrescar"},formatToggle:function(){return"Ocultar/Mostrar"},formatColumns:function(){return"Columnas"},formatAllRows:function(){return"Todos"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["es-ES"])}(jQuery);
\ No newline at end of file
/**
* Bootstrap Table Spanish (México) translation (Obtenido de traducción de Argentina)
* Author: Felix Vera (felix.vera@gmail.com)
* Copiado: Mauricio Vera (mauricioa.vera@gmail.com)
*/
(function ($) {
'use strict';
$.fn.bootstrapTable.locales['es-MX'] = {
formatLoadingMessage: function () {
return 'Cargando, espere por favor...';
},
formatRecordsPerPage: function (pageNumber) {
return pageNumber + ' registros por página';
},
formatShowingRows: function (pageFrom, pageTo, totalRows) {
return 'Mostrando ' + pageFrom + ' a ' + pageTo + ' de ' + totalRows + ' filas';
},
formatSearch: function () {
return 'Buscar';
},
formatNoMatches: function () {
return 'No se encontraron registros';
},
formatAllRows: function () {
return 'Todo';
}
};
$.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['es-MX']);
})(jQuery);
/*
* bootstrap-table - v1.11.1 - 2017-02-22
* https://github.com/wenzhixin/bootstrap-table
* Copyright (c) 2017 zhixin wen
* Licensed MIT License
*/
!function(a){"use strict";a.fn.bootstrapTable.locales["es-MX"]={formatLoadingMessage:function(){return"Cargando, espere por favor..."},formatRecordsPerPage:function(a){return a+" registros por página"},formatShowingRows:function(a,b,c){return"Mostrando "+a+" a "+b+" de "+c+" filas"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron registros"},formatAllRows:function(){return"Todo"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["es-MX"])}(jQuery);
\ No newline at end of file
/**
* Bootstrap Table Spanish (Nicaragua) translation
* Author: Dennis Hernández (http://djhvscf.github.io/Blog/)
*/
(function ($) {
'use strict';
$.fn.bootstrapTable.locales['es-NI'] = {
formatLoadingMessage: function () {
return 'Cargando, por favor espere...';
},
formatRecordsPerPage: function (pageNumber) {
return pageNumber + ' registros por página';
},
formatShowingRows: function (pageFrom, pageTo, totalRows) {
return 'Mostrando de ' + pageFrom + ' a ' + pageTo + ' registros de ' + totalRows + ' registros en total';
},
formatSearch: function () {
return 'Buscar';
},
formatNoMatches: function () {
return 'No se encontraron registros';
},
formatRefresh: function () {
return 'Refrescar';
},
formatToggle: function () {
return 'Alternar';
},
formatColumns: function () {
return 'Columnas';
},
formatAllRows: function () {
return 'Todo';
}
};
$.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['es-NI']);
})(jQuery);
/*
* bootstrap-table - v1.11.1 - 2017-02-22
* https://github.com/wenzhixin/bootstrap-table
* Copyright (c) 2017 zhixin wen
* Licensed MIT License
*/
!function(a){"use strict";a.fn.bootstrapTable.locales["es-NI"]={formatLoadingMessage:function(){return"Cargando, por favor espere..."},formatRecordsPerPage:function(a){return a+" registros por página"},formatShowingRows:function(a,b,c){return"Mostrando de "+a+" a "+b+" registros de "+c+" registros en total"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron registros"},formatRefresh:function(){return"Refrescar"},formatToggle:function(){return"Alternar"},formatColumns:function(){return"Columnas"},formatAllRows:function(){return"Todo"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["es-NI"])}(jQuery);
\ No newline at end of file
/**
* Bootstrap Table Spanish (España) translation
* Author: Antonio Pérez <anpegar@gmail.com>
*/
(function ($) {
'use strict';
$.fn.bootstrapTable.locales['es-SP'] = {
formatLoadingMessage: function () {
return 'Cargando, por favor espera...';
},
formatRecordsPerPage: function (pageNumber) {
return pageNumber + ' registros por p&#225;gina.';
},
formatShowingRows: function (pageFrom, pageTo, totalRows) {
return pageFrom + ' - ' + pageTo + ' de ' + totalRows + ' registros.';
},
formatSearch: function () {
return 'Buscar';
},
formatNoMatches: function () {
return 'No se han encontrado registros.';
},
formatRefresh: function () {
return 'Actualizar';
},
formatToggle: function () {
return 'Alternar';
},
formatColumns: function () {
return 'Columnas';
},
formatAllRows: function () {
return 'Todo';
}
};
$.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['es-SP']);
})(jQuery);
\ No newline at end of file
/*
* bootstrap-table - v1.11.1 - 2017-02-22
* https://github.com/wenzhixin/bootstrap-table
* Copyright (c) 2017 zhixin wen
* Licensed MIT License
*/
!function(a){"use strict";a.fn.bootstrapTable.locales["es-SP"]={formatLoadingMessage:function(){return"Cargando, por favor espera..."},formatRecordsPerPage:function(a){return a+" registros por p&#225;gina."},formatShowingRows:function(a,b,c){return a+" - "+b+" de "+c+" registros."},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se han encontrado registros."},formatRefresh:function(){return"Actualizar"},formatToggle:function(){return"Alternar"},formatColumns:function(){return"Columnas"},formatAllRows:function(){return"Todo"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["es-SP"])}(jQuery);
\ No newline at end of file
/**
* Bootstrap Table Estonian translation
* Author: kristjan@logist.it>
*/
(function ($) {
'use strict';
$.fn.bootstrapTable.locales['et-EE'] = {
formatLoadingMessage: function () {
return 'Päring käib, palun oota...';
},
formatRecordsPerPage: function (pageNumber) {
return pageNumber + ' rida lehe kohta';
},
formatShowingRows: function (pageFrom, pageTo, totalRows) {
return 'Näitan tulemusi ' + pageFrom + ' kuni ' + pageTo + ' - kokku ' + totalRows + ' tulemust';
},
formatSearch: function () {
return 'Otsi';
},
formatNoMatches: function () {
return 'Päringu tingimustele ei vastanud ühtegi tulemust';
},
formatPaginationSwitch: function () {
return 'Näita/Peida lehtedeks jagamine';
},
formatRefresh: function () {
return 'Värskenda';
},
formatToggle: function () {
return 'Lülita';
},
formatColumns: function () {
return 'Veerud';
},
formatAllRows: function () {
return 'Kõik';
}
};
$.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['et-EE']);
})(jQuery);
\ No newline at end of file
/*
* bootstrap-table - v1.11.1 - 2017-02-22
* https://github.com/wenzhixin/bootstrap-table
* Copyright (c) 2017 zhixin wen
* Licensed MIT License
*/
!function(a){"use strict";a.fn.bootstrapTable.locales["et-EE"]={formatLoadingMessage:function(){return"Päring käib, palun oota..."},formatRecordsPerPage:function(a){return a+" rida lehe kohta"},formatShowingRows:function(a,b,c){return"Näitan tulemusi "+a+" kuni "+b+" - kokku "+c+" tulemust"},formatSearch:function(){return"Otsi"},formatNoMatches:function(){return"Päringu tingimustele ei vastanud ühtegi tulemust"},formatPaginationSwitch:function(){return"Näita/Peida lehtedeks jagamine"},formatRefresh:function(){return"Värskenda"},formatToggle:function(){return"Lülita"},formatColumns:function(){return"Veerud"},formatAllRows:function(){return"Kõik"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["et-EE"])}(jQuery);
\ No newline at end of file
/**
* Bootstrap Table Persian translation
* Author: MJ Vakili <mjv.1989@Gmail.com>
*/
(function ($) {
'use strict';
$.fn.bootstrapTable.locales['fa-IR'] = {
formatLoadingMessage: function () {
return 'در حال بارگذاری, لطفا صبر کنید...';
},
formatRecordsPerPage: function (pageNumber) {
return pageNumber + ' رکورد در صفحه';
},
formatShowingRows: function (pageFrom, pageTo, totalRows) {
return 'نمایش ' + pageFrom + ' تا ' + pageTo + ' از ' + totalRows + ' ردیف';
},
formatSearch: function () {
return 'جستجو';
},
formatNoMatches: function () {
return 'رکوردی یافت نشد.';
},
formatPaginationSwitch: function () {
return 'نمایش/مخفی صفحه بندی';
},
formatRefresh: function () {
return 'به روز رسانی';
},
formatToggle: function () {
return 'تغییر نمایش';
},
formatColumns: function () {
return 'سطر ها';
},
formatAllRows: function () {
return 'همه';
}
};
$.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['fa-IR']);
})(jQuery);
\ No newline at end of file
/*
* bootstrap-table - v1.11.1 - 2017-02-22
* https://github.com/wenzhixin/bootstrap-table
* Copyright (c) 2017 zhixin wen
* Licensed MIT License
*/
!function(a){"use strict";a.fn.bootstrapTable.locales["fa-IR"]={formatLoadingMessage:function(){return"در حال بارگذاری, لطفا صبر کنید..."},formatRecordsPerPage:function(a){return a+" رکورد در صفحه"},formatShowingRows:function(a,b,c){return"نمایش "+a+" تا "+b+" از "+c+" ردیف"},formatSearch:function(){return"جستجو"},formatNoMatches:function(){return"رکوردی یافت نشد."},formatPaginationSwitch:function(){return"نمایش/مخفی صفحه بندی"},formatRefresh:function(){return"به روز رسانی"},formatToggle:function(){return"تغییر نمایش"},formatColumns:function(){return"سطر ها"},formatAllRows:function(){return"همه"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["fa-IR"])}(jQuery);
\ No newline at end of file
/**
* Bootstrap Table French (Belgium) translation
* Author: Julien Bisconti (julien.bisconti@gmail.com)
*/
(function ($) {
'use strict';
$.fn.bootstrapTable.locales['fr-BE'] = {
formatLoadingMessage: function () {
return 'Chargement en cours...';
},
formatRecordsPerPage: function (pageNumber) {
return pageNumber + ' entrées par page';
},
formatShowingRows: function (pageFrom, pageTo, totalRows) {
return 'Affiche de' + pageFrom + ' à ' + pageTo + ' sur ' + totalRows + ' lignes';
},
formatSearch: function () {
return 'Recherche';
},
formatNoMatches: function () {
return 'Pas de fichiers trouvés';
}
};
$.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['fr-BE']);
})(jQuery);
/*
* bootstrap-table - v1.11.1 - 2017-02-22
* https://github.com/wenzhixin/bootstrap-table
* Copyright (c) 2017 zhixin wen
* Licensed MIT License
*/
!function(a){"use strict";a.fn.bootstrapTable.locales["fr-BE"]={formatLoadingMessage:function(){return"Chargement en cours..."},formatRecordsPerPage:function(a){return a+" entrées par page"},formatShowingRows:function(a,b,c){return"Affiche de"+a+" à "+b+" sur "+c+" lignes"},formatSearch:function(){return"Recherche"},formatNoMatches:function(){return"Pas de fichiers trouvés"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["fr-BE"])}(jQuery);
\ No newline at end of file
/**
* Bootstrap Table French (France) translation
* Author: Dennis Hernández (http://djhvscf.github.io/Blog/)
* Modification: Tidalf (https://github.com/TidalfFR)
*/
(function ($) {
'use strict';
$.fn.bootstrapTable.locales['fr-FR'] = {
formatLoadingMessage: function () {
return 'Chargement en cours, patientez, s´il vous plaît ...';
},
formatRecordsPerPage: function (pageNumber) {
return pageNumber + ' lignes par page';
},
formatShowingRows: function (pageFrom, pageTo, totalRows) {
return 'Affichage des lignes ' + pageFrom + ' à ' + pageTo + ' sur ' + totalRows + ' lignes au total';
},
formatSearch: function () {
return 'Rechercher';
},
formatNoMatches: function () {
return 'Aucun résultat trouvé';
},
formatRefresh: function () {
return 'Rafraîchir';
},
formatToggle: function () {
return 'Alterner';
},
formatColumns: function () {
return 'Colonnes';
},
formatAllRows: function () {
return 'Tous';
}
};
$.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['fr-FR']);
})(jQuery);
/*
* bootstrap-table - v1.11.1 - 2017-02-22
* https://github.com/wenzhixin/bootstrap-table
* Copyright (c) 2017 zhixin wen
* Licensed MIT License
*/
!function(a){"use strict";a.fn.bootstrapTable.locales["fr-FR"]={formatLoadingMessage:function(){return"Chargement en cours, patientez, s´il vous plaît ..."},formatRecordsPerPage:function(a){return a+" lignes par page"},formatShowingRows:function(a,b,c){return"Affichage des lignes "+a+" à "+b+" sur "+c+" lignes au total"},formatSearch:function(){return"Rechercher"},formatNoMatches:function(){return"Aucun résultat trouvé"},formatRefresh:function(){return"Rafraîchir"},formatToggle:function(){return"Alterner"},formatColumns:function(){return"Colonnes"},formatAllRows:function(){return"Tous"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["fr-FR"])}(jQuery);
\ No newline at end of file
/**
* Bootstrap Table Hebrew translation
* Author: legshooter
*/
(function ($) {
'use strict';
$.fn.bootstrapTable.locales['he-IL'] = {
formatLoadingMessage: function () {
return 'טוען, נא להמתין...';
},
formatRecordsPerPage: function (pageNumber) {
return pageNumber + ' שורות בעמוד';
},
formatShowingRows: function (pageFrom, pageTo, totalRows) {
return 'מציג ' + pageFrom + ' עד ' + pageTo + ' מ-' + totalRows + ' שורות';
},
formatSearch: function () {
return 'חיפוש';
},
formatNoMatches: function () {
return 'לא נמצאו רשומות תואמות';
},
formatPaginationSwitch: function () {
return 'הסתר/הצג מספור דפים';
},
formatRefresh: function () {
return 'רענן';
},
formatToggle: function () {
return 'החלף תצוגה';
},
formatColumns: function () {
return 'עמודות';
},
formatAllRows: function () {
return 'הכל';
}
};
$.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['he-IL']);
})(jQuery);
/*
* bootstrap-table - v1.11.1 - 2017-02-22
* https://github.com/wenzhixin/bootstrap-table
* Copyright (c) 2017 zhixin wen
* Licensed MIT License
*/
!function(a){"use strict";a.fn.bootstrapTable.locales["he-IL"]={formatLoadingMessage:function(){return"טוען, נא להמתין..."},formatRecordsPerPage:function(a){return a+" שורות בעמוד"},formatShowingRows:function(a,b,c){return"מציג "+a+" עד "+b+" מ-"+c+" שורות"},formatSearch:function(){return"חיפוש"},formatNoMatches:function(){return"לא נמצאו רשומות תואמות"},formatPaginationSwitch:function(){return"הסתר/הצג מספור דפים"},formatRefresh:function(){return"רענן"},formatToggle:function(){return"החלף תצוגה"},formatColumns:function(){return"עמודות"},formatAllRows:function(){return"הכל"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["he-IL"])}(jQuery);
\ No newline at end of file
/**
* Bootstrap Table Croatian translation
* Author: Petra Štrbenac (petra.strbenac@gmail.com)
* Author: Petra Štrbenac (petra.strbenac@gmail.com)
*/
(function ($) {
'use strict';
$.fn.bootstrapTable.locales['hr-HR'] = {
formatLoadingMessage: function () {
return 'Molimo pričekajte ...';
},
formatRecordsPerPage: function (pageNumber) {
return pageNumber + ' broj zapisa po stranici';
},
formatShowingRows: function (pageFrom, pageTo, totalRows) {
return 'Prikazujem ' + pageFrom + '. - ' + pageTo + '. od ukupnog broja zapisa ' + totalRows;
},
formatSearch: function () {
return 'Pretraži';
},
formatNoMatches: function () {
return 'Nije pronađen niti jedan zapis';
},
formatPaginationSwitch: function () {
return 'Prikaži/sakrij stranice';
},
formatRefresh: function () {
return 'Osvježi';
},
formatToggle: function () {
return 'Promijeni prikaz';
},
formatColumns: function () {
return 'Kolone';
},
formatAllRows: function () {
return 'Sve';
}
};
$.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['hr-HR']);
})(jQuery);
/*
* bootstrap-table - v1.11.1 - 2017-02-22
* https://github.com/wenzhixin/bootstrap-table
* Copyright (c) 2017 zhixin wen
* Licensed MIT License
*/
!function(a){"use strict";a.fn.bootstrapTable.locales["hr-HR"]={formatLoadingMessage:function(){return"Molimo pričekajte ..."},formatRecordsPerPage:function(a){return a+" broj zapisa po stranici"},formatShowingRows:function(a,b,c){return"Prikazujem "+a+". - "+b+". od ukupnog broja zapisa "+c},formatSearch:function(){return"Pretraži"},formatNoMatches:function(){return"Nije pronađen niti jedan zapis"},formatPaginationSwitch:function(){return"Prikaži/sakrij stranice"},formatRefresh:function(){return"Osvježi"},formatToggle:function(){return"Promijeni prikaz"},formatColumns:function(){return"Kolone"},formatAllRows:function(){return"Sve"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["hr-HR"])}(jQuery);
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment