Merge pull request #1 from Tranz5/master

Extend fWalletUnlockMintOnly to GUI

diff --git a/src/makefile.mingw b/src/makefile.mingw
index 6802420..cd28284 100644 (file)
--- a/src/makefile.mingw
+++ b/src/makefile.mingw
@@ -104,7 +104,7 @@ DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
 OBJS += obj/txdb-leveldb.o
 leveldb/libleveldb.a:
        cd leveldb; make; cd ..
-obj/txdb-leveldb.o: leveldb/libleveldb.lib
+obj/txdb-leveldb.o: leveldb/libleveldb.a
 
 obj/%.o: %.cpp $(HEADERS)
        g++ -c $(CFLAGS) -o $@ $<

diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts
index ea2f3b0..e7bbe33 100644 (file)
--- a/src/qt/locale/bitcoin_ru.ts
+++ b/src/qt/locale/bitcoin_ru.ts
@@ -573,7 +573,7 @@ This product includes software developed by the OpenSSL Project for use in the O
     <message>
         <location line="+6"/>
         <source>Up to date</source>
-        <translation>Синхронизированно</translation>
+        <translation>Синхронизировано</translation>
     </message>
     <message>
         <location line="+7"/>