diff options
author | Dan McGee <dan@archlinux.org> | 2010-12-13 02:53:20 +0100 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2010-12-13 02:53:20 +0100 |
commit | a35610beba1b12c37ec26ec878d3701dd669db42 (patch) | |
tree | 62928bff67d6f63166da6a7736ab958f54297179 /po/ru.po | |
parent | 4fb3cfc48f626f84329c78351d6a8710255a35e3 (diff) | |
parent | 5c8083baa4a831b16adcc3c1c35d7438f5bdcc3e (diff) | |
download | pacman-a35610beba1b12c37ec26ec878d3701dd669db42.tar.gz pacman-a35610beba1b12c37ec26ec878d3701dd669db42.tar.xz |
Merge branch 'maint'
Conflicts:
lib/libalpm/be_local.c
lib/libalpm/trans.c
Diffstat (limited to 'po/ru.po')
-rw-r--r-- | po/ru.po | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -60,7 +60,7 @@ msgstr "применение дельт...\n" #, c-format msgid "generating %s with %s... " -msgstr "создание %s с помощью %s..." +msgstr "создание %s из %s..." #, c-format msgid "success!\n" |