kyy/swagger-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
Francisco Guimarães
2015-07-23 01:06:40 -03:00
parent 04a3fd4c81
commit 675b6c5c77
2 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dist/lang/pt.js vendored
View File

@@ -25,13 +25,8 @@ window.SwaggerTranslator.learn({
"Show/Hide":"Mostrar/Esconder", "Show/Hide":"Mostrar/Esconder",
"List Operations":"Listar operações", "List Operations":"Listar operações",
"Expand Operations":"Expandir operações", "Expand Operations":"Expandir operações",
<<<<<<< HEAD
"Raw":"Cru", "Raw":"Cru",
"can't parse JSON. Raw result":"Falha ao analisar JSON. Resulto cru", "can't parse JSON. Raw result":"Falha ao analisar JSON. Resulto cru",
=======
"Raw":"Raw",
"can't parse JSON. Raw result":"can't parse JSON. Raw result",
>>>>>>> stable
"Model Schema":"Modelo esquema", "Model Schema":"Modelo esquema",
"Model":"Modelo", "Model":"Modelo",
"apply":"Aplicar", "apply":"Aplicar",

5
lang/pt.js
View File

@@ -25,13 +25,8 @@ window.SwaggerTranslator.learn({
"Show/Hide":"Mostrar/Esconder", "Show/Hide":"Mostrar/Esconder",
"List Operations":"Listar operações", "List Operations":"Listar operações",
"Expand Operations":"Expandir operações", "Expand Operations":"Expandir operações",
<<<<<<< HEAD
"Raw":"Cru", "Raw":"Cru",
"can't parse JSON. Raw result":"Falha ao analisar JSON. Resulto cru", "can't parse JSON. Raw result":"Falha ao analisar JSON. Resulto cru",
=======
"Raw":"Raw",
"can't parse JSON. Raw result":"can't parse JSON. Raw result",
>>>>>>> stable
"Model Schema":"Modelo esquema", "Model Schema":"Modelo esquema",
"Model":"Modelo", "Model":"Modelo",
"apply":"Aplicar", "apply":"Aplicar",