Merge remote-tracking branch 'origin/master'

konradrenner · Mar 5, 2016 · 6dc4928 · 6dc4928
2 parents e507f1d + 8c65670
commit 6dc4928
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/app/app.iml b/app/app.iml
@@ -85,7 +85,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/release" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -166,13 +166,15 @@
     <!--Empty list-->
     <string name="no_tags">Нет меток</string>
     <string name="no_notes">Нет заметок</string>
-    <string name="title_activity_export">Экспорт ноутбуков</string>
-    <string name="title_activity_import"> Импорт ноутбуков</string>
-    <string name="exporting"> Экспорт</string>
-    <string name="export_canceled"> экспорт ноутбук отменен</string>
-    <string name="exported"> Ноутбук экспортируется</string>
-    <string name="importing"> Импорт</string>
-    <string name="import_canceled">Импорт отменен</string>
-    <string name="imported"> Ноутбук импортируется</string>
+
+    <!--Import/export notebook-->
+    <string name="title_activity_export">Экспорт блокнота</string>
+    <string name="title_activity_import">Импорт блокнота</string>
+    <string name="exporting">Экспорт</string>
+    <string name="export_canceled">Экспорт блокнота отменён</string>
+    <string name="exported">Блокнот экспортирован</string>
+    <string name="importing">Импорт</string>
+    <string name="import_canceled">Импорт блокнота отменён</string>
+    <string name="imported">Блокнот импортирован</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -182,13 +182,15 @@
     <!--Empty list-->
     <string name="no_tags">No tags</string>
     <string name="no_notes">No notes</string>
+
+    <!--Import/export notebook-->
     <string name="title_activity_export">Export notebook</string>
-    <string name="title_activity_import">Import Notebook</string>
+    <string name="title_activity_import">Import notebook</string>
     <string name="exporting">Exporting</string>
     <string name="export_canceled">Notebook export canceled</string>
     <string name="exported">Notebook exported</string>
     <string name="importing">Importing</string>
-    <string name="import_canceled">Import canceled</string>
+    <string name="import_canceled">Notebook import canceled</string>
     <string name="imported">Notebook imported</string>
 
 </resources>