Merge lp:~pafosdfkapos/eidete/translations into lp:eidete

[pafosdfkapos]

Translation fixes and UI improvements.

Fixes to translations, layout and buttons.

=== modified file 'po/cs.po' (properties changed: -x to +x)
=== modified file 'po/eidete.pot'
--- po/eidete.pot	2012-08-05 00:55:04 +0000
+++ po/eidete.pot	2013-05-18 07:55:30 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-04 19:54-0500\n"
+"POT-Creation-Date: 2013-05-17 23:02+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,137 +17,183 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: /home/codygarver/eidete/po/../src/savedialog.vala:8
-#: /home/codygarver/eidete/po/../src/Widgets/end_dialog.vala:66
-#: /home/codygarver/eidete/po/../src/Widgets/end_dialog.vala:103
+#: /home/kristjan/translations/po/../src/desktop_launcher.vala:5
+msgid "Record screencasts"
+msgstr ""
+
+#: /home/kristjan/translations/po/../src/desktop_launcher.vala:6
+msgid "Screencaster"
+msgstr ""
+
+#: /home/kristjan/translations/po/../src/videobin_uploader.vala:45
+msgid "Upload"
+msgstr ""
+
+#: /home/kristjan/translations/po/../src/savedialog.vala:8
+#: /home/kristjan/translations/po/../src/Widgets/end_dialog.vala:28
+#: /home/kristjan/translations/po/../src/Widgets/end_dialog.vala:64
+#: /home/kristjan/translations/po/../src/Widgets/end_dialog.vala:100
 msgid "Save"
 msgstr ""
 
-#: /home/codygarver/eidete/po/../src/Widgets/countdown.vala:27
-msgid "Recording starts in"
-msgstr ""
-
-#: /home/codygarver/eidete/po/../src/Widgets/countdown.vala:33
-msgid "Focus Eidete to stop recording"
-msgstr ""
-
-#: /home/codygarver/eidete/po/../src/Widgets/end_dialog.vala:24
-msgid "Recording done"
-msgstr ""
-
-#: /home/codygarver/eidete/po/../src/Widgets/end_dialog.vala:27
-msgid "And now?"
-msgstr ""
-
-#: /home/codygarver/eidete/po/../src/Widgets/end_dialog.vala:31
-msgid "Go"
-msgstr ""
-
-#: /home/codygarver/eidete/po/../src/Widgets/end_dialog.vala:64
-msgid "Could not contact Contractor. Click Save to save the file"
-msgstr ""
-
-#: /home/codygarver/eidete/po/../src/videobin_uploader.vala:45
-msgid "Upload"
-msgstr ""
-
-#: /home/codygarver/eidete/po/../src/eidete.vala:139
+#: /home/kristjan/translations/po/../src/eidete.vala:138
 msgid "Monitor"
 msgstr ""
 
-#: /home/codygarver/eidete/po/../src/eidete.vala:154
+#: /home/kristjan/translations/po/../src/eidete.vala:158
 msgid "Fullscreen"
 msgstr ""
 
-#: /home/codygarver/eidete/po/../src/eidete.vala:155
+#: /home/kristjan/translations/po/../src/eidete.vala:159
 msgid "Custom"
 msgstr ""
 
-#: /home/codygarver/eidete/po/../src/eidete.vala:175
-msgid "Record"
+#: /home/kristjan/translations/po/../src/eidete.vala:170
+msgid "Default"
 msgstr ""
 
-#: /home/codygarver/eidete/po/../src/eidete.vala:187
+#: /home/kristjan/translations/po/../src/eidete.vala:179
 msgid "Sound"
 msgstr ""
 
-#: /home/codygarver/eidete/po/../src/eidete.vala:188
+#: /home/kristjan/translations/po/../src/eidete.vala:182
+msgid "Video"
+msgstr ""
+
+#: /home/kristjan/translations/po/../src/eidete.vala:185
+msgid "Keyboard"
+msgstr ""
+
+#: /home/kristjan/translations/po/../src/eidete.vala:188
+msgid "Mouse"
+msgstr ""
+
+#: /home/kristjan/translations/po/../src/eidete.vala:191
+msgid "Start Recording"
+msgstr ""
+
+#: /home/kristjan/translations/po/../src/eidete.vala:197
+msgid "About"
+msgstr ""
+
+#: /home/kristjan/translations/po/../src/eidete.vala:210
 msgid "Record Computer Sounds"
 msgstr ""
 
-#: /home/codygarver/eidete/po/../src/eidete.vala:190
+#: /home/kristjan/translations/po/../src/eidete.vala:212
 msgid "Record from Microphone"
 msgstr ""
 
-#: /home/codygarver/eidete/po/../src/eidete.vala:192
-msgid "Video"
-msgstr ""
-
-#: /home/codygarver/eidete/po/../src/eidete.vala:193
+#: /home/kristjan/translations/po/../src/eidete.vala:215
 msgid "Record from Monitor"
 msgstr ""
 
-#: /home/codygarver/eidete/po/../src/eidete.vala:195
+#: /home/kristjan/translations/po/../src/eidete.vala:217
 msgid "Recording Area"
 msgstr ""
 
-#: /home/codygarver/eidete/po/../src/eidete.vala:197
+#: /home/kristjan/translations/po/../src/eidete.vala:219
 msgid "Width"
 msgstr ""
 
-#: /home/codygarver/eidete/po/../src/eidete.vala:199
+#: /home/kristjan/translations/po/../src/eidete.vala:221
 msgid "Height"
 msgstr ""
 
-#: /home/codygarver/eidete/po/../src/eidete.vala:218
-msgid "Show pressed keys on screen"
-msgstr ""
-
-#: /home/codygarver/eidete/po/../src/eidete.vala:220
-msgid "Show clicks on screen"
-msgstr ""
-
-#: /home/codygarver/eidete/po/../src/eidete.vala:222
-msgid "Show circle behind mouse"
-msgstr ""
-
-#: /home/codygarver/eidete/po/../src/eidete.vala:228
+#: /home/kristjan/translations/po/../src/eidete.vala:245
+msgid "Pressed keys on screen"
+msgstr ""
+
+#: /home/kristjan/translations/po/../src/eidete.vala:248
+msgid "Mouse clicks on screen"
+msgstr ""
+
+#: /home/kristjan/translations/po/../src/eidete.vala:250
+msgid "Circle around the cursor"
+msgstr ""
+
+#: /home/kristjan/translations/po/../src/eidete.vala:256
 msgid "Behavior"
 msgstr ""
 
-#: /home/codygarver/eidete/po/../src/eidete.vala:229
+#: /home/kristjan/translations/po/../src/eidete.vala:257
 msgid "Appearance"
 msgstr ""
 
-#: /home/codygarver/eidete/po/../src/eidete.vala:424
+#: /home/kristjan/translations/po/../src/eidete.vala:449
+#: /home/kristjan/translations/po/../src/eidete.vala:456
+#: /home/kristjan/translations/po/../src/eidete.vala:641
+msgid "Recording paused"
+msgstr ""
+
+#: /home/kristjan/translations/po/../src/eidete.vala:459
+msgid "You can continue or finish the recording now"
+msgstr ""
+
+#: /home/kristjan/translations/po/../src/eidete.vala:468
+msgid "Continue"
+msgstr ""
+
+#: /home/kristjan/translations/po/../src/eidete.vala:469
+msgid "Continue recording"
+msgstr ""
+
+#: /home/kristjan/translations/po/../src/eidete.vala:472
 msgid "Finish"
 msgstr ""
 
-#: /home/codygarver/eidete/po/../src/eidete.vala:425
-msgid "Finish recording"
-msgstr ""
-
-#: /home/codygarver/eidete/po/../src/eidete.vala:427
-msgid "Record more"
-msgstr ""
-
-#: /home/codygarver/eidete/po/../src/eidete.vala:441
-#: /home/codygarver/eidete/po/../src/eidete.vala:588
-msgid "Recording paused"
-msgstr ""
-
-#: /home/codygarver/eidete/po/../src/eidete.vala:442
-msgid "You can continue or finish the recording now."
-msgstr ""
-
-#: /home/codygarver/eidete/po/../src/eidete.vala:598
+#: /home/kristjan/translations/po/../src/eidete.vala:473
+msgid "Stop the recording and save the file"
+msgstr ""
+
+#: /home/kristjan/translations/po/../src/eidete.vala:476
+msgid "Cancel"
+msgstr ""
+
+#: /home/kristjan/translations/po/../src/eidete.vala:477
+msgid "Cancel the recording without saving the file"
+msgstr ""
+
+#: /home/kristjan/translations/po/../src/eidete.vala:651
 msgid "Pause recording"
 msgstr ""
 
-#: /home/codygarver/eidete/po/../src/desktop_launcher.vala:5
-msgid "Record screencasts"
-msgstr ""
-
-#: /home/codygarver/eidete/po/../src/desktop_launcher.vala:6
-msgid "Screencaster"
+#: /home/kristjan/translations/po/../src/eidete.vala:671
+msgid "Pause Recording"
+msgstr ""
+
+#: /home/kristjan/translations/po/../src/eidete.vala:672
+msgid "Finish Recording"
+msgstr ""
+
+#: /home/kristjan/translations/po/../src/Widgets/end_dialog.vala:24
+msgid "Recording complete"
+msgstr ""
+
+#: /home/kristjan/translations/po/../src/Widgets/end_dialog.vala:33
+msgid "Don't save"
+msgstr ""
+
+#: /home/kristjan/translations/po/../src/Widgets/end_dialog.vala:62
+msgid "Could not contact Contractor. Click the Save button to save the file."
+msgstr ""
+
+#: /home/kristjan/translations/po/../src/Widgets/keyview.vala:48
+msgid "Left"
+msgstr ""
+
+#: /home/kristjan/translations/po/../src/Widgets/keyview.vala:51
+msgid "Middle"
+msgstr ""
+
+#: /home/kristjan/translations/po/../src/Widgets/keyview.vala:54
+msgid "Right"
+msgstr ""
+
+#: /home/kristjan/translations/po/../src/Widgets/countdown.vala:27
+msgid "Recording starts in"
+msgstr ""
+
+#: /home/kristjan/translations/po/../src/Widgets/countdown.vala:34
+msgid "Focus Eidete to stop recording"
 msgstr ""

=== modified file 'po/et.po'
--- po/et.po	2013-03-17 05:13:08 +0000
+++ po/et.po	2013-05-18 07:55:30 +0000
@@ -6,149 +6,196 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eidete\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-08-04 19:54-0500\n"
-"PO-Revision-Date: 2012-09-21 23:01+0000\n"
-"Last-Translator: Kristjan Vool <Unknown>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-17 03:41+0300\n"
+"PO-Revision-Date: 2013-05-17 03:42+0300\n"
+"Last-Translator: Kristjan Vool <[e-mail]>\n"
 "Language-Team: Estonian <[e-mail]>\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2013-03-17 05:13+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
-#: /home/codygarver/eidete/po/../src/savedialog.vala:8
-#: /home/codygarver/eidete/po/../src/Widgets/end_dialog.vala:66
-#: /home/codygarver/eidete/po/../src/Widgets/end_dialog.vala:103
+#: /home/kristjan/translations/po/../src/desktop_launcher.vala:5
+msgid "Record screencasts"
+msgstr "Screencast'ide filmimine"
+
+#: /home/kristjan/translations/po/../src/desktop_launcher.vala:6
+msgid "Screencaster"
+msgstr "Screencaster"
+
+#: /home/kristjan/translations/po/../src/videobin_uploader.vala:45
+msgid "Upload"
+msgstr "Laadi üles"
+
+#: /home/kristjan/translations/po/../src/savedialog.vala:8
+#: /home/kristjan/translations/po/../src/Widgets/end_dialog.vala:28
+#: /home/kristjan/translations/po/../src/Widgets/end_dialog.vala:64
+#: /home/kristjan/translations/po/../src/Widgets/end_dialog.vala:100
 msgid "Save"
 msgstr "Salvesta"
 
-#: /home/codygarver/eidete/po/../src/Widgets/countdown.vala:27
-msgid "Recording starts in"
-msgstr "Lindistamine algab"
-
-#: /home/codygarver/eidete/po/../src/Widgets/countdown.vala:33
-msgid "Focus Eidete to stop recording"
-msgstr "Lindistamise lõpetamiseks fokuseeri Eidete"
-
-#: /home/codygarver/eidete/po/../src/Widgets/end_dialog.vala:24
-msgid "Recording done"
-msgstr "Lindistamine valmis"
-
-#: /home/codygarver/eidete/po/../src/Widgets/end_dialog.vala:27
-msgid "And now?"
-msgstr "Ja nüüd?"
-
-#: /home/codygarver/eidete/po/../src/Widgets/end_dialog.vala:31
-msgid "Go"
-msgstr "Mine"
-
-#: /home/codygarver/eidete/po/../src/Widgets/end_dialog.vala:64
-msgid "Could not contact Contractor. Click Save to save the file"
-msgstr ""
-"Ühenduse loomine Contractoriga nurjus. Faili salvestamiseks vali Salvesta."
-
-#: /home/codygarver/eidete/po/../src/videobin_uploader.vala:45
-msgid "Upload"
-msgstr "Laadi üles"
-
-#: /home/codygarver/eidete/po/../src/eidete.vala:139
+#: /home/kristjan/translations/po/../src/eidete.vala:138
 msgid "Monitor"
 msgstr "Kuvar"
 
-#: /home/codygarver/eidete/po/../src/eidete.vala:154
+#: /home/kristjan/translations/po/../src/eidete.vala:158
 msgid "Fullscreen"
 msgstr "Täisekraan"
 
-#: /home/codygarver/eidete/po/../src/eidete.vala:155
+#: /home/kristjan/translations/po/../src/eidete.vala:159
 msgid "Custom"
 msgstr "Kohandatud"
 
-#: /home/codygarver/eidete/po/../src/eidete.vala:175
-msgid "Record"
-msgstr "Lindista"
+#: /home/kristjan/translations/po/../src/eidete.vala:171
+msgid "Default"
+msgstr "Vaikimisi"
 
-#: /home/codygarver/eidete/po/../src/eidete.vala:187
+#: /home/kristjan/translations/po/../src/eidete.vala:180
 msgid "Sound"
 msgstr "Heli"
 
-#: /home/codygarver/eidete/po/../src/eidete.vala:188
+#: /home/kristjan/translations/po/../src/eidete.vala:183
+msgid "Video"
+msgstr "Video"
+
+#: /home/kristjan/translations/po/../src/eidete.vala:186
+msgid "Keyboard"
+msgstr "Klaviatuur"
+
+#: /home/kristjan/translations/po/../src/eidete.vala:189
+msgid "Mouse"
+msgstr "Hiir"
+
+#: /home/kristjan/translations/po/../src/eidete.vala:192
+msgid "Start Recording"
+msgstr "Alusta filmimist"
+
+#: /home/kristjan/translations/po/../src/eidete.vala:198
+msgid "About"
+msgstr "Programmist…"
+
+#: /home/kristjan/translations/po/../src/eidete.vala:211
 msgid "Record Computer Sounds"
-msgstr "Arvuti helide lindistamine"
+msgstr "Arvuti helide salvestamine"
 
-#: /home/codygarver/eidete/po/../src/eidete.vala:190
+#: /home/kristjan/translations/po/../src/eidete.vala:213
 msgid "Record from Microphone"
-msgstr "Mikrofoni lindistamine"
-
-#: /home/codygarver/eidete/po/../src/eidete.vala:192
-msgid "Video"
-msgstr "Video"
-
-#: /home/codygarver/eidete/po/../src/eidete.vala:193
+msgstr "Mikrofoni salvestamine"
+
+#: /home/kristjan/translations/po/../src/eidete.vala:216
 msgid "Record from Monitor"
-msgstr "Kuvari lindistamine"
+msgstr "Kuvari filmimine"
 
-#: /home/codygarver/eidete/po/../src/eidete.vala:195
+#: /home/kristjan/translations/po/../src/eidete.vala:218
 msgid "Recording Area"
-msgstr "Lindistamise ala"
+msgstr "Filmimise ala"
 
-#: /home/codygarver/eidete/po/../src/eidete.vala:197
+#: /home/kristjan/translations/po/../src/eidete.vala:220
 msgid "Width"
 msgstr "Laius"
 
-#: /home/codygarver/eidete/po/../src/eidete.vala:199
+#: /home/kristjan/translations/po/../src/eidete.vala:222
 msgid "Height"
 msgstr "Kõrgus"
 
-#: /home/codygarver/eidete/po/../src/eidete.vala:218
-msgid "Show pressed keys on screen"
-msgstr "Vajutatud klahvide näitamine eknraanil"
-
-#: /home/codygarver/eidete/po/../src/eidete.vala:220
-msgid "Show clicks on screen"
-msgstr "Klõpsude näitamine ekraanil"
-
-#: /home/codygarver/eidete/po/../src/eidete.vala:222
-msgid "Show circle behind mouse"
-msgstr "Ringi näitamine kursori taga"
-
-#: /home/codygarver/eidete/po/../src/eidete.vala:228
+#: /home/kristjan/translations/po/../src/eidete.vala:246
+msgid "Pressed keys on screen"
+msgstr "Vajutatud klahvid ekraanil"
+
+#: /home/kristjan/translations/po/../src/eidete.vala:249
+msgid "Mouse clicks on screen"
+msgstr "Hiire klõpsud ekraanil"
+
+#: /home/kristjan/translations/po/../src/eidete.vala:251
+msgid "Circle around the cursor"
+msgstr "Ring ümber kursori"
+
+#: /home/kristjan/translations/po/../src/eidete.vala:257
 msgid "Behavior"
 msgstr "Käitumine"
 
-#: /home/codygarver/eidete/po/../src/eidete.vala:229
+#: /home/kristjan/translations/po/../src/eidete.vala:258
 msgid "Appearance"
 msgstr "Välimus"
 
-#: /home/codygarver/eidete/po/../src/eidete.vala:424
+#: /home/kristjan/translations/po/../src/eidete.vala:451
+msgid "Recording paused"
+msgstr "Filmimine peatatud"
+
+#: /home/kristjan/translations/po/../src/eidete.vala:459
+msgid "Continue"
+msgstr "Jätka"
+
+#: /home/kristjan/translations/po/../src/eidete.vala:460
+msgid "Continue recording"
+msgstr "Jätka filmimist"
+
+#: /home/kristjan/translations/po/../src/eidete.vala:463
 msgid "Finish"
 msgstr "Lõpeta"
 
-#: /home/codygarver/eidete/po/../src/eidete.vala:425
-msgid "Finish recording"
-msgstr "Lõpeta lindistamine"
-
-#: /home/codygarver/eidete/po/../src/eidete.vala:427
-msgid "Record more"
-msgstr "Lindista veel"
-
-#: /home/codygarver/eidete/po/../src/eidete.vala:441
-#: /home/codygarver/eidete/po/../src/eidete.vala:588
-msgid "Recording paused"
-msgstr "Videolindistamine pausil"
-
-#: /home/codygarver/eidete/po/../src/eidete.vala:442
+#: /home/kristjan/translations/po/../src/eidete.vala:464
+msgid "Stop the recording and save the file"
+msgstr "Peata filmimine ning salvesta video"
+
+#: /home/kristjan/translations/po/../src/eidete.vala:467
+msgid "Cancel"
+msgstr "Katkesta"
+
+#: /home/kristjan/translations/po/../src/eidete.vala:468
+msgid "Cancel the recording without saving the file"
+msgstr "Katkesta filmimine ilma videot salvestamata"
+
+#: /home/kristjan/translations/po/../src/eidete.vala:481
 msgid "You can continue or finish the recording now."
-msgstr "Sa saad jätkata või lõpetada lindistamise kohe."
+msgstr "Sul on võimalus filmimine peatada ning salvestada või jätkata filmimise jätkamist."
 
-#: /home/codygarver/eidete/po/../src/eidete.vala:598
+#: /home/kristjan/translations/po/../src/eidete.vala:636
 msgid "Pause recording"
-msgstr "Peata lindistamine"
-
-#: /home/codygarver/eidete/po/../src/desktop_launcher.vala:5
-msgid "Record screencasts"
-msgstr "Kaardrite lindistamine"
-
-#: /home/codygarver/eidete/po/../src/desktop_launcher.vala:6
-msgid "Screencaster"
-msgstr "Kaadristaja"
+msgstr "Peata filmimine"
+
+#: /home/kristjan/translations/po/../src/eidete.vala:656
+msgid "Pause Recording"
+msgstr "Peata filmimine"
+
+#: /home/kristjan/translations/po/../src/eidete.vala:657
+msgid "Finish Recording"
+msgstr "Lõpeta filmimine"
+
+#: /home/kristjan/translations/po/../src/Widgets/end_dialog.vala:24
+msgid "Recording complete"
+msgstr "Filmimine lõpetatud"
+
+#: /home/kristjan/translations/po/../src/Widgets/end_dialog.vala:33
+msgid "Don't save"
+msgstr "Ära salvesta"
+
+#: /home/kristjan/translations/po/../src/Widgets/end_dialog.vala:62
+msgid "Could not contact Contractor. Click the Save button to save the file."
+msgstr "Contractor'iga polnud võimalik ühendust saada. Faili salvestamiseks vajuta salvestamise nupule."
+
+#: /home/kristjan/translations/po/../src/Widgets/keyview.vala:48
+msgid "Left"
+msgstr "Vasak"
+
+#: /home/kristjan/translations/po/../src/Widgets/keyview.vala:51
+msgid "Middle"
+msgstr "Keskmine"
+
+#: /home/kristjan/translations/po/../src/Widgets/keyview.vala:54
+msgid "Right"
+msgstr "Parem"
+
+#: /home/kristjan/translations/po/../src/Widgets/countdown.vala:27
+msgid "Recording starts in"
+msgstr "Filmimine algab"
+
+#: /home/kristjan/translations/po/../src/Widgets/countdown.vala:33
+msgid "Focus Eidete to stop recording"
+msgstr "Filmimise lõpetamiseks fokuseeri Eidete"
+
+#~ msgid "Close without saving"
+#~ msgstr "Sulge salvestamata"

=== modified file 'src/Widgets/countdown.vala'
--- src/Widgets/countdown.vala	2012-05-22 17:19:03 +0000
+++ src/Widgets/countdown.vala	2013-05-18 07:55:30 +0000
@@ -3,15 +3,15 @@
 
 
 namespace Eidete.Widgets{
-	
+
 	public class Countdown : Granite.Widgets.CompositedWindow {
-		
+
 		public Label count;
 		public int time;
-		
+
 		public Countdown (){
 			this.time = 5;
-			
+
 			this.set_default_size (300, 200);
 			this.window_position = WindowPosition.CENTER;
 			this.set_keep_above (true);
@@ -19,27 +19,29 @@
 			this.type_hint = Gdk.WindowTypeHint.SPLASHSCREEN;
 			this.skip_pager_hint = true;
 			this.skip_taskbar_hint = true;
-			
+
 			var box = new Box (Orientation.VERTICAL, 0);
 			box.margin = 40;
 			box.margin_left = box.margin_right = 60;
-			
-			var title = new Label ("<span size='20000' color='#fbfbfb'>"+_("Recording starts in")+"</span>");
+
+			var title = new Label ("<span size='20000' color='#fbfbfb'>"+_("Recording starts in")+"…"+"</span>");
 			title.use_markup = true;
-			
+			title.margin_bottom = 20;
+
 			this.count = new Label ("<span size='40000' color='#fbfbfb'>"+time.to_string ()+"</span>");
 			this.count.use_markup = true;
-			
-			var tipp = new Label("<span size='10000' color='#fbfbfb'>"+_("Focus Eidete to stop recording")+"</span>");
+
+			var tipp = new Label("<span size='10000' color='#fbfbfb' font-style='italic'>"+_("Focus Eidete to stop recording")+"</span>");
 			tipp.use_markup = true;
-			
+			tipp.margin_top = 20;
+
 			box.pack_start (title);
 			box.pack_start (count);
 			box.pack_start (tipp);
-			
+
 			this.add (box);
 		}
-		
+
 		public override bool draw (Cairo.Context ctx){
 			int w = this.get_allocated_width  ();
 			int h = this.get_allocated_height ();
@@ -48,9 +50,9 @@
 			ctx.fill ();
 			return base.draw (ctx);
 		}
-		
+
 		public void start (EideteApp app){
-			
+
 			this.show_all ();
 			Timeout.add (1000, () => {
 				this.time --;
@@ -68,10 +70,10 @@
 				return true;
 			});
 		}
-		
+
 	}
-	
-	
+
+
 }
 
 

=== modified file 'src/Widgets/end_dialog.vala'
--- src/Widgets/end_dialog.vala	2012-08-05 00:55:04 +0000
+++ src/Widgets/end_dialog.vala	2013-05-18 07:55:30 +0000
@@ -2,66 +2,64 @@
 
 
 namespace Eidete.Widgets {
-	
+
 	private bool contractor;
-	
+
 	public class EndDialog : Window {
 		public EndDialog (EideteApp app){
 			this.set_default_size (400, 200);
-			
+
 			this.set_application (app);
-			
+
 			if (app.selectionarea != null)
 				app.selectionarea.destroy ();
 			if (app.keyview != null)
 				app.keyview.destroy ();
 			this.window_position = WindowPosition.CENTER;
 			this.icon_name = "eidete";
-			
+
 			var grid = new Grid ();
 			grid.margin = 12;
-			
-			var title = new Label ("<span size='30000'>"+_("Recording done")+"</span>");
+
+			var title = new Label ("<span size='30000'>"+_("Recording complete")+"</span>");
 			title.use_markup = true;
 			title.halign = Align.START;
-			var sub_title = new Label ("<span size='15000'>"+_("And now?")+"</span>");
-			sub_title.use_markup = true;
-			sub_title.halign = Align.START;
-			
-			var export = new Button.with_label (_("Go"));
-			export.image = new Image.from_stock (Stock.YES, IconSize.BUTTON);
+
+			var export = new Button.with_label (_("Save"));
+			export.image = new Image.from_stock (Stock.SAVE, IconSize.BUTTON);
 			export.can_default = true;
 			this.set_default (export);
-			
-			var cancel = new Button.from_stock (Stock.CANCEL);
+
+			var cancel = new Button.with_label (_("Don't save"));
+			cancel.image = new Image.from_stock (Stock.DELETE, IconSize.BUTTON);
 			cancel.halign = Align.END;
-			
+
 			var bbox = new ButtonBox (Orientation.HORIZONTAL);
 			bbox.pack_end (cancel, false, true, 0);
 			bbox.pack_end (export, false, true, 0);
 			bbox.layout_style = ButtonBoxStyle.END;
-			
+
 			//contractor
 			var list = new ListStore (2, typeof (Gdk.Pixbuf), typeof (string));
 			var t = new TreeView.with_model (list);
 			t.headers_visible = false;
 			t.hexpand = true;
-			
+
 			var cell1 = new CellRendererPixbuf ();
 			cell1.set_padding (5, 15);
 			t.insert_column_with_attributes (-1, "", cell1, "pixbuf", 0);
 			var cell2 = new CellRendererText ();
 			cell2.set_padding (2, 15);
 			t.insert_column_with_attributes (-1, "", cell2, "markup", 1);
-			
-			
+
+
 			var c = Granite.Services.Contractor.get_contract (app.settings.destination, "video");
 			if (c == null || c.length <= 1){
 				warning ("You should install and/or run contractor");
 				contractor = false;
 				var info = new InfoBar ();
 				info.message_type = MessageType.WARNING;
-				info.pack_start (new Label (_("Could not contact Contractor. Click Save to save the file")));
+				info.pack_start (new Label (_("Could not contact Contractor. Click the Save button to save the file.")));
 				grid.attach (info, 0, 3, 2, 1);
 				export.label = _("Save");
 			}else{
@@ -73,19 +71,18 @@
 					try{
 						icon = IconTheme.get_default ().load_icon (c[i].lookup ("IconName"), 32, 0);
 					}catch (Error e){warning (e.message);}
-					list.set (it, 0, icon, 1, 
+					list.set (it, 0, icon, 1,
 					    "<b>"+c[i].lookup ("Name")+"</b>\n"+c[i].lookup ("Description"));
 				}
 				t.set_cursor (new TreePath.from_string ("0"), null, false);
 			}
-			
+
 			grid.attach (title, 0, 0, 2, 1);
-			grid.attach (sub_title, 0, 1, 2, 1);
 			grid.attach (new Label (""), 0, 2, 1, 1);
 			grid.attach (t, 0, 4, 1, 1);
 			grid.attach (new Label (""), 0, 5, 1, 1);
 			grid.attach (bbox, 0, 6, 1, 1);
-			
+
 			if (contractor){
 				export.clicked.connect ( () => {
 					TreePath path;
@@ -109,7 +106,7 @@
 						try{
 							source.copy (destination, FileCopyFlags.OVERWRITE);
 						}catch (GLib.Error e){stderr.printf ("Error: %s\n", e.message);}
-						
+
 						file.destroy ();
 						this.destroy ();
 					}else{
@@ -118,7 +115,7 @@
 				});
 			}
 			cancel.clicked.connect ( () => {this.destroy  ();});
-			
+
 			this.add (grid);
 		}
 	}

=== modified file 'src/Widgets/keyview.vala'
--- src/Widgets/keyview.vala	2012-04-18 15:35:01 +0000
+++ src/Widgets/keyview.vala	2013-05-18 07:55:30 +0000
@@ -3,9 +3,9 @@
 
 
 namespace Eidete.Widgets {
-    
+
     public class YellowCircle : Granite.Widgets.CompositedWindow {
-        
+
         public YellowCircle (Gdk.RGBA color) {
             this.skip_pager_hint = true;
             this.skip_taskbar_hint = true;
@@ -13,26 +13,26 @@
             this.stick ();
             this.type_hint = Gdk.WindowTypeHint.SPLASHSCREEN;
             this.accept_focus = false;
-            
+
             this.draw.connect ( (ctx) => {
-                ctx.arc (this.get_allocated_width () / 2, this.get_allocated_height () / 2, 
+                ctx.arc (this.get_allocated_width () / 2, this.get_allocated_height () / 2,
                          this.get_allocated_width () / 2, 0, 6.28318);
                 ctx.set_source_rgba (color.red, color.green, color.blue, color.alpha);
                 ctx.fill ();
                 return false;
             });
-            
+
             this.set_size_request (70, 70);
             this.realize ();
             this.get_window ().input_shape_combine_region (new Cairo.Region.rectangle ({0, 0, 1, 1}), 0, 0);
             this.show_all ();
         }
-        
+
         public new void move (int x, int y) {
             base.move (x - (int)(this.get_allocated_width ()/2), y - (int)(this.get_allocated_height ()/2));
         }
     }
-    
+
     public class ClickWindow : Granite.Widgets.CompositedWindow {
         public ClickWindow (int x, int y, int button) {
             this.skip_pager_hint = true;
@@ -41,17 +41,17 @@
             this.stick ();
             this.type_hint = Gdk.WindowTypeHint.SPLASHSCREEN;
             this.accept_focus = false;
-            
+
             string label = "";
             switch (button) {
                 case 1:
-                    label = "Left";
+                    label = _("Left");
                     break;
                 case 2:
-                    label = "Middle";
+                    label = _("Middle");
                     break;
                 case 3:
-                    label = "Right";
+                    label = _("Right");
                     break;
                 default:
                     break;
@@ -65,12 +65,12 @@
                 css.load_from_data ("*{color:#fff; text-shadow:1 1 #000;}", -1);
             } catch (Error e) { warning (e.message); }
             lbl.get_style_context ().add_provider (css, 20000);
-            
+
             this.realize ();
             this.get_window ().input_shape_combine_region (new Cairo.Region.rectangle ({0, 0, 1, 1}), 0, 0);
             this.show_all ();
             this.move (x + 5, y + 5);
-            
+
             Timeout.add (10, () => {
                 this.opacity -= 0.007;
                 if (this.opacity < 0.1) //prevent flickering
@@ -83,10 +83,10 @@
             });
         }
     }
-    
-    
+
+
     public class Key : Label {
-        
+
         public string key;
         public bool ctrl;
         public bool shift;
@@ -94,7 +94,7 @@
         public bool super;
         public bool iso_level3_shift;
         public int count;
-        
+
         public Key (string key, bool ctrl, bool shift, bool alt, bool super, bool iso_level3_shift){
             this.key = key;
             this.ctrl = ctrl;
@@ -105,45 +105,45 @@
             this.count = 1;
         }
     }
-    
-    
+
+
     public class KeyView : Granite.Widgets.CompositedWindow {
-        
+
 		public int key_size;
 		public int fade_duration;
-		
-		
-		
+
+
+
 		private bool ctrl;
 		private bool shift;
 		private bool alt;
 		private bool super;
 		private bool iso_level3_shift;
-		
+
 		private int screen_h;
-		
+
 		public Queue<Key> keys;
-		
+
 		public YellowCircle circle;
-		
+
 		public Cairo.ImageSurface key_bg;
-		
+
 		[CCode (cname = "intercept_key_thread")]
 		public extern void *intercept_key_thread ();
-		
+
 		public signal void captured (string keyvalue, bool released);
 		public signal void captured_mouse (int x, int y, int button);
 		public signal void captured_move (int x, int y);
-		
+
 		public override bool draw (Cairo.Context ctx){
-			
+
 			//key
 			for (var i=0;i<keys.length;i++){
 				ctx.set_source_surface (key_bg, 0, screen_h - (i+2)*key_size);
 				ctx.paint ();
-				
+
 				ctx.set_source_rgba (1.0, 1.0, 1.0, 1.0);
-				
+
 				int [] sizes = {0, 30, 45, 55, 60};
 				print ("%i\n", keys.peek_nth (i).key.length);
 
@@ -155,7 +155,7 @@
 
 				ctx.move_to (key_size - 40, screen_h - (i+1)*key_size-20);
 				ctx.show_text (keys.peek_nth (i).key);
-				
+
 				ctx.set_font_size (18);
 				if (keys.peek_nth (i).count > 1){
 					ctx.move_to (3, screen_h - (i+1)*key_size - (key_size-12));
@@ -183,21 +183,21 @@
 					ctx.show_text ("AltGr");
 				}
 			}
-			
+
 			return base.draw (ctx);
 		}
-		
+
 		public void place (int x, int y, int h){
 			this.set_size_request (key_size, h);
 			this.resize (key_size, h);
 			this.move (x - key_size, y);
 			this.screen_h = h;
 		}
-		
+
 		public KeyView (bool keyboard, bool mouse, bool mouse_circle, Gdk.RGBA mouse_circle_color){
 			this.key_size = 75;
 			this.fade_duration = 2000;
-            
+
 			this.stick ();
 			this.set_keep_above (true);
 			this.deletable = false;
@@ -206,32 +206,32 @@
 			this.skip_pager_hint = true;
             this.skip_taskbar_hint = true;
             this.accept_focus = false;
-            
+
             this.type_hint = Gdk.WindowTypeHint.NOTIFICATION;
-            this.events = Gdk.EventMask.BUTTON_MOTION_MASK | Gdk.EventMask.BUTTON1_MOTION_MASK | 
+            this.events = Gdk.EventMask.BUTTON_MOTION_MASK | Gdk.EventMask.BUTTON1_MOTION_MASK |
                 Gdk.EventMask.BUTTON_PRESS_MASK | Gdk.EventMask.BUTTON_RELEASE_MASK ;
-            
+
 			this.realize ();
-			
+
 			Cairo.RectangleInt rect = {0, 0, 1, 1};
 			this.get_window ().input_shape_combine_region (new Cairo.Region.rectangle (rect), 0, 0);
-			
+
 			this.enter_notify_event.connect ( () => {
 				this.get_window ().input_shape_combine_region (new Cairo.Region.rectangle (rect), 0, 0);
 				return true;
 			});
-			
+
 			this.keys = new Queue<Key> ();
-			
+
 			//setup the key background
 			key_bg = new Cairo.ImageSurface (Cairo.Format.ARGB32, key_size, key_size);
 			var ctx = new Cairo.Context (key_bg);
 			Granite.Drawing.Utilities.cairo_rounded_rectangle (ctx, 5, 5, key_size-10, key_size-10, 5);
 			ctx.set_source_rgba (0.2, 0.2, 0.2, 0.7);
 			ctx.fill_preserve ();
-			
+
 			capture ();
-			
+
 			Timeout.add (fade_duration, () => {
 				if (!keys.is_empty ()){
 					keys.pop_tail ();
@@ -239,7 +239,7 @@
 				}
 				return true;
 			});
-			
+
 			if (mouse_circle) {
 			    this.circle = new YellowCircle (mouse_circle_color);
 		        this.captured_move.connect ( (x, y) => {
@@ -247,14 +247,14 @@
 		            //debug ("Moved to %i, %i\n", x, y);
 		        });
 		    }
-			
+
 			if (mouse)
 			this.captured_mouse.connect ( (x, y, button) => {
 			    debug ("Button %i pressed at %i, %i ", button, x, y);
 	            if (button <= 3)
 	                Timeout.add (10, () => { new ClickWindow (x, y, button); return false; });
 			});
-			
+
 			if (keyboard)
 			this.captured.connect ( (keyvalue, released) => {
 				if (released){
@@ -289,7 +289,7 @@
 					switch (res){
 						case "Control_L":
 						case "Control_R":
-							this.ctrl = true; 
+							this.ctrl = true;
 							this.queue_draw ();
 							return;
 						case "Shift_L":
@@ -404,10 +404,10 @@
 								res = keyvalue.substring (0, 9);
 							break;
 					}
-					
+
 					if ((!keys.is_empty ()) &&
-					    (keys.peek_head ().key == res) && 
-					    (keys.peek_head ().ctrl == ctrl) && 
+					    (keys.peek_head ().key == res) &&
+					    (keys.peek_head ().ctrl == ctrl) &&
 					    (keys.peek_head ().shift == shift) &&
 					    (keys.peek_head ().alt == alt) &&
 						(keys.peek_head ().iso_level3_shift == iso_level3_shift)){
@@ -425,7 +425,7 @@
 				}
 			});
 		}
-		
+
 		public void capture (){
 			try{
 				Thread.create<void*> (this.intercept_key_thread, true);

=== modified file 'src/eidete.vala'
--- src/eidete.vala	2012-08-05 00:39:41 +0000
+++ src/eidete.vala	2013-05-18 07:55:30 +0000
@@ -6,7 +6,7 @@
 
 
 namespace Eidete{
-	
+
 	class LLabel : Label{
 		public LLabel (string label){
 			this.set_halign (Align.START);
@@ -30,8 +30,8 @@
 			this.label = label;
 		}
 	}
-	
-	
+
+
 	public struct Settings{
 		public int sx;
 		public int sy;
@@ -45,39 +45,39 @@
 		public Gdk.RGBA mouse_circle_color;
 		public string destination;
 	}
-	
+
 	public class EideteApp : Granite.Application{
-		
+
 		construct{
 			program_name = "Eidete";
 			exec_name = "eidete";
-			
+
 			build_data_dir = Constants.DATADIR;
 			build_pkg_data_dir = Constants.PKGDATADIR;
 			build_release_name = Constants.RELEASE_NAME;
 			build_version = Constants.VERSION;
 			build_version_info = Constants.VERSION_INFO;
-			
+
 			app_years = "2011-2012";
 			app_icon = "eidete";
 			app_launcher = "eidete.desktop";
 			application_id = "net.launchpad.eidete";
-			
+
 			main_url = "https://code.launchpad.net/eidete";
 			bug_url = "https://bugs.launchpad.net/eidete";
 			help_url = "https://code.launchpad.net/eidete";
 			translate_url = "https://translations.launchpad.net/eidete";
-			
+
 			about_authors = {"Tom Beckmann <[e-mail]>"};
 			about_documenters = {"Tom Beckmann <[e-mail]>"};
 			about_artists = {"Harvey Cabaguio", "Sergey 'shnatsel' Davidoff"};
-			about_comments = "Development release, not all features implemented";
+			about_comments = "Development release (all features not implemented)";
 			about_translators = "";
 			about_license_type = License.GPL_3_0;
 		}
-		
+
 		public dynamic Pipeline pipeline;
-		
+
 		public Window main_window;
 		public Eidete.Widgets.KeyView keyview;
 		public Eidete.Widgets.SelectionArea selectionarea;
@@ -87,9 +87,9 @@
 		public Wnck.Window win;
 		public Gdk.Screen screen;
 		public Gdk.Rectangle monitor_rec;
-		
+
 		public Settings settings;
-		
+
 		public bool recording;
 		public bool typing_size;
 
@@ -98,99 +98,121 @@
 
 		public EideteApp (){
 		}
-		
+
 		public void start_and_build () {
-			
+
 			Gtk.Settings.get_default ().gtk_application_prefer_dark_theme = true;
-			
+
 			this.main_window = new Window ();
 			this.main_window.title = program_name;
 			this.main_window.icon_name = exec_name;
 			this.main_window.set_application (this);
 			this.main_window.window_position = WindowPosition.CENTER;
 			this.main_window.set_resizable (false);
-			
-			
+
+
 			if (!this.main_window.is_composited ()){
 				warning ("Compositing is not supported. No transparency available.");
 			}
-			
-			
+
+
 			/*
 			  UI
 			*/
-			
+
 			tabs = new Granite.Widgets.StaticNotebook (false);
 			tabs.margin = 12;
-			
+
 			pause_icon = new Image.from_icon_name ("media-playback-pause", IconSize.DIALOG);
 			pause_icon.pixel_size = 64;
-			
-			
+
+
 			var grid = new Grid ();
 			grid.column_spacing = 12;
 			grid.row_spacing = 6;
-			grid.hexpand = true;
-			
+			grid.hexpand = false;
+
 			var monitors_combo = new ComboBoxText ();
 			monitors_combo.hexpand = true;
-			monitors_combo.margin_left = 6;
 			for (var i=0;i<Gdk.Screen.get_default ().get_n_monitors (); i++)
 				monitors_combo.append (i.to_string (), _("Monitor")+" "+(i+1).to_string ());
 			monitors_combo.active = 0;
 			if (Gdk.Screen.get_default ().get_n_monitors () == 1)
 				monitors_combo.set_sensitive (false);
-			
+
 			var width = new SpinButton.with_range (50, Gdk.Screen.get_default ().get_width (), 1);
 			width.max_length = 4;
+			width.margin_left = 1;
+			width.margin_right = -4;
+
 			var height = new SpinButton.with_range (50, Gdk.Screen.get_default ().get_height (), 1);
 			height.max_length = 4;
+			height.margin_left = 1;
+			height.margin_right = -4;
 			width.set_sensitive (false);
 			height.set_sensitive (false);
 			width.halign = Align.START;
 			height.halign = Align.START;
-			
+
 			var recordingarea_combo = new ComboBoxText ();
 			recordingarea_combo.append ("full", _("Fullscreen"));
 			recordingarea_combo.append ("custom", _("Custom"));
 			recordingarea_combo.active = 0;
-			
+
 			var use_comp_sounds    = new CheckButton ();
 			use_comp_sounds.halign = Align.START;
 			use_comp_sounds.set_sensitive (false);
+
 			var use_audio          = new CheckButton ();
-			use_audio.halign       = Align.END;
-			
+			use_audio.halign       = Align.START;
+
 			var audio_source = new ComboBoxText ();
-			audio_source.margin_left = 6;
-			audio_source.append ("0", "Default");
+			audio_source.append ("0", _("Default"));
 			audio_source.active = 0;
 			audio_source.hexpand = true;
 			audio_source.set_sensitive (false);
-			
+
 			var audio_box = new Box (Orientation.HORIZONTAL, 0);
 			audio_box.pack_start (use_audio, false, true, 0);
 			audio_box.pack_start (audio_source, true, true, 0);
-			
-			var start_bt = new Button.with_label (_("Record"));
+
+			var sound = new LLabel.markup ("<b>"+_("Sound")+":"+"</b>");
+			sound.margin_top = 18;
+
+			var video = new LLabel.markup ("<b>"+_("Video")+":"+"</b>");
+			video.margin_top = 12;
+
+			var keyboard = new LLabel.markup ("<b>"+_("Keyboard")+":"+"</b>");
+			keyboard.margin_top = 18;
+
+			var mouse = new LLabel.markup ("<b>"+_("Mouse")+":"+"</b>");
+			mouse.margin_top = 12;
+
+			var start_bt = new Button.with_label (_("Start Recording"));
+			start_bt.can_default = true;
+			start_bt.get_style_context ().add_class ("noundo");
+
 			var cancel_bt = new Button.from_stock (Stock.CANCEL);
-			var about_bt = new Button.from_stock (Stock.ABOUT);
+
+			var about_bt = new Button.with_label (_("About"));
+			about_bt.image = new Image.from_stock (Stock.ABOUT, IconSize.BUTTON);
+
 			var buttons = new Box (Orientation.HORIZONTAL, 5);
-			buttons.homogeneous = false;
+			buttons.homogeneous = true;
+			buttons.pack_start (about_bt, false, true, 0);
+			buttons.pack_start (cancel_bt, false, true, 0);
 			buttons.pack_end (start_bt, false, true, 0);
-			buttons.pack_end (cancel_bt, false, true, 0);
-			buttons.pack_start (about_bt, false, true, 0);
-			start_bt.can_default = true;
-			start_bt.get_style_context ().add_class ("noundo");
+			buttons.margin_top = 24;
+
 			this.main_window.set_default (start_bt);
-			
-			grid.attach (new LLabel.markup ("<b>"+_("Sound")+"</b>"), 0, 0, 2, 1);
-			grid.attach (new LLabel.right ("        "+_("Record Computer Sounds")+":"), 0, 1, 1, 1);
+
+			grid.attach ((sound), 0, 0, 1, 1);
+			grid.attach (new LLabel.right (_("Record Computer Sounds")), 0, 1, 1, 1);
 			grid.attach (use_comp_sounds, 1, 1, 1, 1);
 			grid.attach (new LLabel.right (_("Record from Microphone")+":"), 0, 2, 1, 1);
 			grid.attach (audio_box, 1, 2, 1, 1);
-			grid.attach (new LLabel.markup ("<b>"+_("Video")+"</b>"), 0, 3, 2, 1);
-			grid.attach (new LLabel.right (_("Record from Monitor")+":"), 0, 4, 1, 1);
+			grid.attach ((video), 0, 3, 2, 1);
+			grid.attach (new LLabel.right ("        "+_("Record from Monitor")+":"), 0, 4, 1, 1);
 			grid.attach (monitors_combo, 1, 4, 1, 1);
 			grid.attach (new LLabel.right (_("Recording Area")+":"), 0, 5, 1, 1);
 			grid.attach (recordingarea_combo, 1, 5, 1, 1);
@@ -199,56 +221,62 @@
 			grid.attach (new LLabel.right (_("Height")+":"), 0, 7, 1, 1);
 			grid.attach (height, 1, 7, 1, 1);
 			grid.attach (buttons, 0, 8, 2, 1);
-			
+
 			//grid2
 			var grid2 = new Grid ();
-			
+
 			var use_keyview        = new Gtk.CheckButton ();
 			use_keyview.halign     = Gtk.Align.START;
+
 			var use_clickview      = new Gtk.CheckButton ();
 			use_clickview.halign   = Gtk.Align.START;
+
 			var use_circle         = new Gtk.CheckButton ();
 			use_circle.halign      = Gtk.Align.START;
+
 			var circle_color       = new Gtk.ColorButton ();
+
 			var circle_box         = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
-			
 			circle_box.pack_start (use_circle, false);
 			circle_box.pack_start (circle_color);
-			
-			grid2.attach (new LLabel.right (_("Show pressed keys on screen")+":"), 0, 0, 1, 1);
-			grid2.attach (use_keyview, 1, 0, 1, 1);
-			grid2.attach (new LLabel.right (_("Show clicks on screen")+":"), 0, 1, 1, 1);
-			grid2.attach (use_clickview, 1, 1, 1, 1);
-			grid2.attach (new LLabel.right (_("Show circle behind mouse")+":"), 0, 2, 1, 1);
-			grid2.attach (circle_box, 1, 2, 1, 1);
+
+			//grid2.attach (new LLabel
+			grid2.attach ((keyboard), 0, 0, 1, 1);
+			grid2.attach (new LLabel.right (_("Pressed keys on screen")+":"), 0, 1, 1, 1);
+			grid2.attach (use_keyview, 1, 1, 1, 1);
+			grid2.attach ((mouse), 0, 2, 1, 1);
+			grid2.attach (new LLabel.right (_("Mouse clicks on screen")+":"), 0, 3, 1, 1);
+			grid2.attach (use_clickview, 1, 3, 1, 1);
+			grid2.attach (new LLabel.right (_("Circle around the cursor")+":"), 0, 4, 1, 1);
+			grid2.attach (circle_box, 1, 4, 1, 1);
 			grid2.column_spacing = 12;
 			grid2.row_spacing = 6;
 			grid2.hexpand = true;
-			
+
 			tabs.append_page (grid, new Label (_("Behavior")));
 			tabs.append_page (grid2, new Label (_("Appearance")));
-			
+
 			this.main_window.add (tabs);
 			this.main_window.show_all ();
 			this.main_window.present ();
-			
+
 			/*
 			  Events
 			*/
-			
+
+			about_bt.clicked.connect ( () => {
+				this.show_about (this.main_window);
+			});
+
 			cancel_bt.clicked.connect ( () => {
 				this.main_window.destroy ();
 			});
-			
+
 			start_bt.clicked.connect ( () => {
 				var count = new Eidete.Widgets.Countdown ();
 				this.main_window.iconify ();
 				count.start (this);
 			});
-			
-			about_bt.clicked.connect ( () => {
-				this.show_about (this.main_window);
-			});
 
 			this.screen = Gdk.Screen.get_default();
 			settings.monitor = 0;
@@ -260,14 +288,14 @@
 				settings.ex = settings.sx + this.monitor_rec.width - 1;
 				settings.ey = settings.sy + this.monitor_rec.height - 1;
 			});
-			
+
 			settings.monitor = int.parse (monitors_combo.active_id);
 			this.screen.get_monitor_geometry(settings.monitor, out this.monitor_rec);
 			settings.sx = this.monitor_rec.x;
 			settings.sy = this.monitor_rec.y;
 			settings.ex = settings.sx + this.monitor_rec.width - 1;
 			settings.ey = settings.sy + this.monitor_rec.height - 1;
-            
+
 			recordingarea_combo.changed.connect ( () => {
 				if (recordingarea_combo.active_id != "full"){
 					selectionarea = new Eidete.Widgets.SelectionArea ();
@@ -303,7 +331,7 @@
 					height.set_sensitive (false);
 				}
 			});
-			
+
 			width.key_release_event.connect ( (e) => {
 				selectionarea.resize ((int)width.value, (int)height.value);
 				typing_size = true;
@@ -316,7 +344,7 @@
 				return false;
 			});
 			height.focus_out_event.connect ( (e) => {typing_size = false;return false;});
-			
+
 			settings.audio = false;
 			use_audio.toggled.connect ( () => {
 				settings.audio = use_audio.active;
@@ -326,40 +354,40 @@
 					audio_source.set_sensitive (false);
 				}
 			});
-			
-			
+
+
 			Gdk.Screen.get_default ().monitors_changed.connect ( () => {
 				if (Gdk.Screen.get_default ().get_n_monitors () > 1)
 					monitors_combo.set_sensitive (true);
 				else
 					monitors_combo.set_sensitive (false);
 			});
-			
+
 			settings.keyview = false;
 			use_keyview.toggled.connect ( () => {
 				settings.keyview = use_keyview.active;
 			});
-			
+
 			settings.clickview = false;
 			use_clickview.toggled.connect ( () => {
 			    settings.clickview = use_clickview.active;
 			});
-			
+
 			settings.mouse_circle = false;
 			use_circle.toggled.connect ( () => {
 			    settings.mouse_circle = use_circle.active;
 			});
-			
+
 			settings.mouse_circle_color = {1, 1, 0, 0.3};
 			circle_color.use_alpha = true;
 			circle_color.rgba = settings.mouse_circle_color;
 			circle_color.color_set.connect ( () => {
 			    settings.mouse_circle_color = circle_color.rgba;
 			});
-			
+
 			settings.destination = GLib.Environment.get_tmp_dir ()+
 			    "/screencast"+new GLib.DateTime.now_local ().to_unix ().to_string ()+".webm";
-            
+
             ulong handle = 0;
             handle = Wnck.Screen.get_default().active_window_changed.connect ( () => {
                 this.win = Wnck.Screen.get_default().get_active_window ();
@@ -372,7 +400,7 @@
                 });
                 Wnck.Screen.get_default ().disconnect (handle);
             });
-            
+
             this.main_window.focus_in_event.connect ( (ev) => {
                 if (this.selectionarea != null && !this.selectionarea.not_visible){
                     this.selectionarea.present ();
@@ -397,11 +425,11 @@
 					finish_recording ();
 				}
 			});
-			
+
 			Granite.Services.Logger.initialize ("Eidete");
 			Granite.Services.Logger.DisplayLevel = Granite.Services.LogLevel.DEBUG;
 		}
-		
+
 		public override void activate (){
 			if (this.get_windows ().length () == 0){
 				this.start_and_build ();
@@ -413,50 +441,74 @@
 				}
 			}
 		}
-		
+
 		private void build_pause_ui (){
+
 			pause_grid = new Grid ();
 			pause_grid.margin = 12;
-			
+			this.main_window.title = _("Recording paused");
+
+
+			var img_text_grid = new Grid ();
+
+			var text_grid = new Grid ();
+
+			var title = new LLabel.markup ("<span weight='bold' size='larger'>"+_("Recording paused")+"</span>");
+			title.valign = Align.START;
+
+			var info = new LLabel (_("You can continue or finish the recording now"));
+			info.valign = Align.START;
+			info.margin_top = 6;
+
 			var buttons = new Box (Orientation.HORIZONTAL, 0);
-			var stop_bt = new Button ();
-			stop_bt.image = new Image.from_stock (Stock.MEDIA_STOP, IconSize.BUTTON);
-			stop_bt.label = _("Finish");
-			stop_bt.set_tooltip_text (_("Finish recording"));
-			var cancel_bt = new Button.from_stock (Stock.CANCEL);
-			var continue_bt = new Button.with_label (_("Record more"));
+			buttons.homogeneous = true;
+			buttons.spacing = 6;
+			buttons.margin_top = 24;
+
+			var continue_bt = new Button.with_label (_("Continue"));
+			continue_bt.set_tooltip_text (_("Continue recording"));
 			continue_bt.image = new Image.from_stock (Stock.MEDIA_RECORD, IconSize.BUTTON);
+
+			var stop_bt = new Button.with_label (_("Finish"));
+			stop_bt.set_tooltip_text (_("Stop the recording and save the file"));
+			stop_bt.image = new Image.from_stock (Stock.APPLY, IconSize.BUTTON);
+
+			var cancel_bt = new Button.with_label (_("Cancel"));
+			cancel_bt.set_tooltip_text (_("Cancel the recording without saving the file"));
+			cancel_bt.image = new Image.from_stock (Stock.DELETE, IconSize.BUTTON);
+
 			buttons.pack_end (stop_bt, false, true, 0);
-			buttons.pack_end (cancel_bt, false, true, 0);
 			buttons.pack_end (continue_bt, false, true, 0);
-			
+			buttons.pack_end (cancel_bt, false, true, 0);
+
 			var img = new Image.from_stock (Stock.MEDIA_PAUSE, IconSize.DIALOG);
 			img.valign = Align.START;
 			img.margin_right = 12;
-			
-			var space = new Label ("");
-			space.height_request = 24;
-			
-			pause_grid.attach (img, 0, 0, 1, 1);
-			pause_grid.attach (new LLabel.markup ("<span weight='bold' size='20000'>"+_("Recording paused")+"</span>"), 1, 0, 1, 1);
-			pause_grid.attach (new LLabel (_("You can continue or finish the recording now.")), 1, 1, 1, 1);
-			pause_grid.attach (space, 0, 2, 1, 1);
-			pause_grid.attach (buttons, 0, 3, 2, 1);
-			
+
+			text_grid.attach (title, 0, 0, 1, 1);
+			text_grid.attach (info, 0, 1, 1, 1);
+
+			img_text_grid.attach (img, 0, 0, 1, 1);
+			img_text_grid.attach (text_grid, 1, 0, 1, 1);
+
+			pause_grid.attach (img_text_grid, 0, 0, 1, 1);
+			pause_grid.attach (buttons, 0, 2, 1, 1);
+
+
 			stop_bt.can_default = true;
 			this.main_window.set_default (stop_bt);
-			
+
 			/*
 			  Events
 			*/
 			cancel_bt.clicked.connect ( () => {
 				this.main_window.destroy ();
 			});
-			
+
 			stop_bt.clicked.connect ( () => {
 				finish_recording ();
 			});
-			
+
 			continue_bt.clicked.connect ( () => {
 				this.main_window.iconify ();
 				this.pipeline.set_state (State.PLAYING);
@@ -464,7 +516,7 @@
 				switch_to_paused (false);
 			});
 		}
-		
+
 		public void record () {
 			if (settings.keyview || settings.clickview || settings.mouse_circle) {
 				keyview = new Eidete.Widgets.KeyView (settings.keyview, settings.clickview, settings.mouse_circle, settings.mouse_circle_color);
@@ -476,36 +528,36 @@
 					return false;
 				});
 				keyview.place (settings.ex,
-							   settings.sy, 
+							   settings.sy,
 							   settings.ey - settings.sy);
 				keyview.show_all ();
 			}
-			
+
 			pipeline                    = new Pipeline ("screencast-pipe");
 			dynamic Element muxer      = ElementFactory.make ("webmmux", "mux");
 			dynamic Element sink       = ElementFactory.make ("filesink", "sink");
-			
+
 			//video bin
 			this.videobin = new Gst.Bin ("video");
 			try {
 				videobin = (Gst.Bin)parse_bin_from_description (
-				    "ximagesrc name=\"videosrc\" ! video/x-raw-rgb, framerate=15/1 ! 
+				    "ximagesrc name=\"videosrc\" ! video/x-raw-rgb, framerate=15/1 !
 				     ffmpegcolorspace ! vp8enc name=\"encoder\" ! queue", true);
 			}catch (Error e){ stderr.printf ("Error: %s\n", e.message);}
-			
+
 			//audio bin
 			this.audiobin = new Gst.Bin ("audio");
 			try{
-				audiobin = (Gst.Bin)parse_bin_from_description ("pulsesrc name=\"audiosrc\" ! 
+				audiobin = (Gst.Bin)parse_bin_from_description ("pulsesrc name=\"audiosrc\" !
 				                  audioconvert ! audioresample ! audiorate ! vorbisenc ! queue", true);
 			}catch (Error e){ stderr.printf ("Error: %s\n", e.message);}
-			
-			
+
+
 			string cores;
 			try{
 				Process.spawn_command_line_sync ("cat /sys/devices/system/cpu/online", out cores);
 			}catch (Error e){warning (e.message);}
-			
+
 			//configure
 			sink.set ("location", settings.destination);
 			videobin.get_by_name ("videosrc").set ("startx", this.settings.sx);
@@ -514,37 +566,37 @@
 			videobin.get_by_name ("videosrc").set ("endy",   this.settings.ey);
 			videobin.get_by_name ("videosrc").set ("use-damage", false);
 			videobin.get_by_name ("videosrc").set ("screen-num", this.settings.monitor);
-			
+
 			//videobin.get_by_name ("encoder").set  ("mode", 1);
 			videobin.get_by_name ("encoder").set  ("quality", 8.0);
 			videobin.get_by_name ("encoder").set  ("speed", 6);
 			videobin.get_by_name ("encoder").set  ("max-keyframe-distance", 150);
 			videobin.get_by_name ("encoder").set  ("threads", int.parse (cores.substring (2)));
-			
-			
+
+
 			if (pipeline==null||muxer==null||sink==null||videobin==null||audiobin==null){
 				stderr.printf ("Error: Elements weren't made correctly!\n");
 			}
-			
+
 			if (settings.audio)
 				pipeline.add_many (audiobin, videobin, muxer, sink);
 			else
 				pipeline.add_many (videobin, muxer, sink);
-			
-			
+
+
 			videobin.get_static_pad ("src").link(muxer.get_request_pad ("video_%d"));
 			if (settings.audio)
 				audiobin.get_static_pad ("src").link(muxer.get_request_pad ("audio_%d"));
-			
+
 			muxer.link (sink);
-			
+
 			pipeline.get_bus ().add_watch (bus_message_cb);
 
 			pipeline.set_state (State.READY);
-			
+
 			if (selectionarea != null)
 				selectionarea.to_discrete ();
-			
+
 			pipeline.set_state (State.PLAYING);
 			this.recording = true;
 		}
@@ -581,9 +633,10 @@
 			}
 			return true;
 		}
-		
+
 		//only visuals
 		public void switch_to_paused (bool to_normal){
+
 			if (to_normal){
 				this.main_window.title = _("Recording paused");
 				this.main_window.remove (pause_icon);
@@ -615,8 +668,8 @@
 bool finish_rec;
 
 static const OptionEntry[] entries = {
-	{"pause", 'n', 0, OptionArg.NONE, ref pause_rec, "Pause Recording", ""},
-	{"finish", 'n', 0, OptionArg.NONE, ref finish_rec, "Finish Recording", ""},
+	{"pause", 'n', 0, OptionArg.NONE, ref pause_rec, N_("Pause Recording"), ""},
+	{"finish", 'n', 0, OptionArg.NONE, ref finish_rec, N_("Finish Recording"), ""},
 	{ null }
 };
 
@@ -628,11 +681,11 @@
 	try{
 		context.parse (ref args);
 	}catch (Error e){ error ("Error: "+e.message);}
-	
+
 	Gst.init (ref args);
-	
+
 	eidete = new Eidete.EideteApp ();
-	
+
 	return eidete.run (args);
 }