Merge pull request #50 from fsb4000/Build-date-+-translation

Build date + translation

diff --git a/src/qt/forms/rpcconsole.ui b/src/qt/forms/rpcconsole.ui
index 098b3cd..30d9ab2 100644 (file)
--- a/src/qt/forms/rpcconsole.ui
+++ b/src/qt/forms/rpcconsole.ui
@@ -579,7 +579,7 @@
               <item>
                <widget class="QLabel" name="label_16">
                 <property name="text">
-                 <string>Received</string>
+                 <string>Received:</string>
                 </property>
                </widget>
               </item>
@@ -659,7 +659,7 @@
               <item>
                <widget class="QLabel" name="label_17">
                 <property name="text">
-                 <string>Sent</string>
+                 <string>Sent:</string>
                 </property>
                </widget>
               </item>

diff --git a/src/qt/locale/bitcoin_ru.ts b/src/qt/locale/bitcoin_ru.ts
index dbdcb97..b147093 100644 (file)
--- a/src/qt/locale/bitcoin_ru.ts
+++ b/src/qt/locale/bitcoin_ru.ts
@@ -3,6 +3,25 @@
 <TS version="2.0" language="ru">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
+  <name>QObject</name>
+  <message>
+    <source>%1 d</source>
+    <translation>%1 д</translation>
+  </message>
+  <message>
+    <source>%1 h</source>
+    <translation>%1 ч</translation>
+  </message>
+  <message>
+    <source>%1 m</source>
+    <translation>%1 мин</translation>
+  </message>
+  <message>
+    <source>%1 s</source>
+    <translation>%1 сек</translation>
+  </message>
+</context>
+<context>
     <name>AboutDialog</name>
     <message>
         <location filename="../forms/aboutdialog.ui" line="+14"/>
@@ -1598,6 +1617,31 @@ This label turns red, if the priority is smaller than &quot;medium&quot;.
 <context>
     <name>RPCConsole</name>
     <message>
+        <location filename="../forms/rpcconsole.ui" line="+582"/>
+        <source>Received:</source>
+        <translation>Получено:</translation>
+    </message>
+    <message>
+        <location filename="../forms/rpcconsole.ui" line="+662"/>
+        <source>Sent:</source>
+        <translation>Отправлено:</translation>
+    </message>
+    <message>
+        <location filename="../forms/rpcconsole.ui" line="+518"/>
+        <source>Totals</source>
+        <translation>Всего</translation>
+    </message>
+    <message>
+        <location filename="../forms/rpcconsole.ui" line="+450"/>
+        <source>&amp;Network Traffic</source>
+        <translation>&amp;Сетевой трафик</translation>
+    </message>
+    <message>
+        <location filename="../forms/rpcconsole.ui" line="+502"/>
+        <source>&amp;Clear</source>
+        <translation>&amp;Очистить</translation>
+    </message>
+    <message>
         <location filename="../forms/rpcconsole.ui" line="+46"/>
         <source>Client name</source>
         <translation>Имя клиента</translation>

diff --git a/src/version.cpp b/src/version.cpp
index 5e5a3bd..b1398ce 100644 (file)
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -54,6 +54,10 @@ const std::string CLIENT_NAME("Satoshi");
 #    endif
 #endif
 
+#ifdef _MSC_VER
+#undef GIT_COMMIT_DATE
+#endif
+
 #ifndef BUILD_DATE
 #    ifdef GIT_COMMIT_DATE
 #        define BUILD_DATE GIT_COMMIT_DATE