summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmoenig <jens@moenig.org>2013-03-20 11:49:55 +0100
committerjmoenig <jens@moenig.org>2013-03-20 11:49:55 +0100
commitbdd258850da202e1180411813f6998acc64b60ab (patch)
tree7673f1f69f11062ac7e48e9fb78304f549088821
parent38a3f078b18c93ad24fb0fb7adecf636e6cc418b (diff)
downloadsnap-byow-bdd258850da202e1180411813f6998acc64b60ab.tar.gz
snap-byow-bdd258850da202e1180411813f6998acc64b60ab.zip
Portuguese translation update, 2nd try
trying to come to grips with Github...
-rw-r--r--lang-pt.js8
1 files changed, 0 insertions, 8 deletions
diff --git a/lang-pt.js b/lang-pt.js
index 656cbc5..5f14a22 100644
--- a/lang-pt.js
+++ b/lang-pt.js
@@ -185,11 +185,7 @@ SnapTranslator.dict.pt = {
'translator_e-mail':
'mmsequeira@gmail.com',
'last_changed':
-<<<<<<< HEAD
- '2013-03-19',
-=======
'2013-03-20',
->>>>>>> Portuguese translation update
// GUI
// control bar:
@@ -291,11 +287,7 @@ SnapTranslator.dict.pt = {
// movimento:
'Stage selected:\nno motion primitives':
-<<<<<<< HEAD
- 'Palco seleccionado:\sem primitivas de movimento',
-=======
'Palco seleccionado:\nsem primitivas de movimento',
->>>>>>> Portuguese translation update
'move %n steps':