projects
/
drnoksnes
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8f1b9d6
8faf2ee
)
Merge branch 'master' of https://git.maemo.org/projects/drnoksnes
author
Javier S. Pedro
<maemo@javispedro.com>
Sat, 3 Apr 2010 15:56:19 +0000
(17:56 +0200)
committer
Javier S. Pedro
<maemo@javispedro.com>
Sat, 3 Apr 2010 15:56:19 +0000
(17:56 +0200)
Conflicts:
gui/i18n/pl.po
gui/i18n/sv.po
1
2
gui/i18n/pl.po
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
gui/i18n/pl.po
index
5ffa03c
,
d56419e
..
a14bc83
---
1
/
gui/i18n/pl.po
---
2
/
gui/i18n/pl.po
+++ b/
gui/i18n/pl.po
@@@
-255,6
-273,7
+273,3
@@@
msgstr "Szybkie wczytanie 2
#: buttons.inc:27
msgid "Quick Save 2"
msgstr "Szybki zapis 2"
--
--#~ msgid "Controls…"
--#~ msgstr "Sterowanie..."
-