Sort paths for each key as os.walk might return files in different order

This makes sure the same source file will own a key if it appears
in multiple files.
Also some cleanup and make code more pythonic

lang/sv_SV.lang

@@ -124,6 +124,12 @@ msg: CPUn är för långsam för att spela upp videon
 #
 # ./glwthemes/mono/popups/auth.view
 #
+id: Cancel
+msg: Avbryt
+
+id: OK
+msg: OK
+
 id: Password
 msg: Lösenord
 
@@ -133,15 +139,6 @@ msg: Kom ihåg mig
 id: Username
 msg: Användarnamn
 
-#
-# ./glwthemes/mono/popups/message.view
-#
-id: Cancel
-msg: Avbryt
-
-id: OK
-msg: OK
-
 #
 # ./glwthemes/mono/screensaver.view
 #

support/update_lang.py

@@ -5,23 +5,11 @@
 import re
 import json
 
-M = re.compile('_p{0,1}\("([^"]*)"\)')
-
+M = re.compile('_p?\("([^"]*)"\)')
 
 def scanfile(path, p):
- f = open(path)
- s = f.read()
- l = re.findall(M, s)
- if len(l) > 0:
- for w in l:
- if w in p:
- if path not in p:
- p[w].append(path)
- else:
- p[w] = [path]
- f.close()
-
-
+ for w in re.findall(M, open(path).read()):
+ p.setdefault(w, []).append(path)
 
 def buildphrases(rootpath):
  p = {}
@@ -92,9 +80,8 @@ def buildphrases(rootpath):
  print "Processing %s (%s / %s) maintained by %s" % \
  (path, language, native, maintainer)
 
- for x in sorted(phraselist, key=lambda x: '%s %s' % (x[1][0], x[0])):
- key = x[0]
- source = x[1][0]
+ for key, sources in sorted(phraselist, key=lambda (w, sources): '%s %s' % (sources[0], w)):
+ source = sources[0]
 
  if source != last: 
  last = source