projects
/
platform
/
upstream
/
pulseaudio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
88d5749
0aca5ad
)
Merge branch 'master-tx'
author
Lennart Poettering
<lennart@poettering.net>
Thu, 23 Jul 2009 13:32:33 +0000
(15:32 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 23 Jul 2009 13:32:33 +0000
(15:32 +0200)
Conflicts:
po/ca.po
po/cs.po
po/de.po
po/es.po
po/pl.po
1
2
po/es.po
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
po/es.po
index
8af1c73
,
0a06a39
..
596f693
---
1
/
po/es.po
---
2
/
po/es.po
+++ b/
po/es.po
@@@
-2600,9
-2416,8
+2416,7
@@@
msgstr "Servidor de Sonido PulseAudio
#~ "Tipo: %s\n"
#~ "Módulo: %s\n"
#~ "Argumento: %s\n"
-
#~ msgid "sink"
#~ msgstr "destino"
-
#~ msgid "source"
#~ msgstr "fuente"
-