merge messages

2011-04-06 11:29:07 -04:00
parent 9f1bd89a0c
commit 340a1e3e3a
13 changed files with 543 additions and 18 deletions
@@ -96,6 +96,7 @@ limitations under the License.
  <!-- Common -->
  <string name="no">Não</string>
  <string name="yes">Sim</string>
+  <!-- KEEP_PARENT name="ok" rev="7cbb95c69f35" -->
  <string name="error">Erro</string>
  <string name="success">Successo</string>
  <string name="waypoint">Ponto de passagem</string>