Hi,
Meld 1.8,3 crashes with the following stacktrace with LANG=it_IT.utf8 .
Traceback (most recent call last):
File "/usr/bin/meld", line 173, in <module>
main()
File "/usr/bin/meld", line 155, in main
import meld.meldapp
File "/usr/lib/meld/meld/meldapp.py", line 32, in <module>
from . import preferences
File "/usr/lib/meld/meld/preferences.py", line 30, in <module>
from . import vc
File "/usr/lib/meld/meld/vc/__init__.py", line 26, in <module>
from . import _null
File "/usr/lib/meld/meld/vc/_null.py", line 24, in <module>
from meld.vc import _vc
File "/usr/lib/meld/meld/vc/_vc.py", line 60, in <module>
class Entry(object):
File "/usr/lib/meld/meld/vc/_vc.py", line 64, in Entry
assert len(states) == STATE_MAX
AssertionError
master branch is not affected.
The attached patch fixes the problem, please consider applying it on 1.8 branch.
Thanks,
Balint
From 4c476e8ceabe4453b1f1f374c6ba469c9bc524f3 Mon Sep 17 00:00:00 2001
From: Balint Reczey <[email protected]>
Date: Thu, 26 Dec 2013 20:23:52 +0100
Subject: [PATCH] Fix crash with Italian (it_IT.utf8) locale
---
po/it.po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/po/it.po b/po/it.po
index ba1647b..d3e0d63 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1752,7 +1752,7 @@ msgid ""
"Not present"
msgstr ""
"Ignorato:Non in revisione:::Errore::Aggiunto recentemente:Modificato:"
-"Conflitto:Rimosso:Mancante"
+"Conflitto:Rimosso:Mancante:Non presente"
#: ../meld/vc/cvs.py:231
#, python-format
--
1.7.10.4
_______________________________________________
meld-list mailing list
[email protected]
https://mail.gnome.org/mailman/listinfo/meld-list
