Browse Source

Fix merge

bubble
Francisco Guimarães 9 years ago
parent
commit
675b6c5c77
2 changed files with 0 additions and 10 deletions
  1. +0
    -5
      dist/lang/pt.js
  2. +0
    -5
      lang/pt.js

+ 0
- 5
dist/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",


+ 0
- 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",


Loading…
Cancel
Save