[Xfce4-commits] <xfburn:master> Merge branch 'master' into burnimage

David Mohr noreply at xfce.org
Sat Oct 24 21:12:03 CEST 2009


Updating branch refs/heads/master
         to 07d56a81706e1ce9049f38958468e5d7bc24033c (commit)
       from cfd9906c051c63cb9e1fac6cd447d45c15b563f4 (commit)

commit 07d56a81706e1ce9049f38958468e5d7bc24033c
Merge: cfd9906c051c63cb9e1fac6cd447d45c15b563f4 3c289d525f8c02dfba2698a9343dcbc5ae85ffd9
Author: David Mohr <squisher at xfce.org>
Date:   Tue Oct 20 01:54:58 2009 -0600

    Merge branch 'master' into burnimage

commit 3c289d525f8c02dfba2698a9343dcbc5ae85ffd9
Author: David Mohr <squisher at xfce.org>
Date:   Tue Oct 20 01:43:17 2009 -0600

    Fixing the remaining new compiler warnings

commit c1bf3559cc137037a5f22cf2d0f32172e8768678
Author: David Mohr <squisher at xfce.org>
Date:   Mon Oct 19 21:48:49 2009 -0600

    Replace old style function declarations - () with (void)

commit 57b29f9b5591022cf63d8c0e1136ff9b878db664
Author: Vlad Vasilev <lortwer at gmail.com>
Date:   Sun Oct 18 10:13:53 2009 +0000

    l10n: Updates to Russian (ru) translation
    
    Transmitted-via: Transifex (translations.xfce.org)

commit 832d9b2f9ae8ecff6f21221051886834d260eb6e
Author: Rihards Prieditis <rprieditis at gmail.com>
Date:   Fri Oct 16 16:36:39 2009 +0000

    l10n: Updates to Latvian (lv) translation
    
    Transmitted-via: Transifex (translations.xfce.org)

 po/lv.po                                          |  509 ++++++++++-----------
 po/ru.po                                          |  473 +++++++++----------
 xfburn/Makefile.am                                |    4 +-
 xfburn/xfburn-audio-composition.c                 |    7 +-
 xfburn/xfburn-audio-track-gst.c                   |    2 +-
 xfburn/xfburn-audio-track-gst.h                   |    2 +-
 xfburn/xfburn-audio-track.c                       |    2 +-
 xfburn/xfburn-audio-track.h                       |    2 +-
 xfburn/xfburn-blank-dialog.c                      |    4 +-
 xfburn/xfburn-blank-dialog.h                      |    4 +-
 xfburn/xfburn-burn-audio-cd-composition-dialog.c  |   24 +-
 xfburn/xfburn-burn-audio-cd-composition-dialog.h  |    2 +-
 xfburn/xfburn-burn-data-cd-composition-dialog.c   |    2 +-
 xfburn/xfburn-burn-data-cd-composition-dialog.h   |    2 +-
 xfburn/xfburn-burn-data-composition-base-dialog.c |    4 +-
 xfburn/xfburn-burn-data-composition-base-dialog.h |    2 +-
 xfburn/xfburn-burn-data-dvd-composition-dialog.c  |    2 +-
 xfburn/xfburn-burn-data-dvd-composition-dialog.h  |    2 +-
 xfburn/xfburn-burn-image-dialog.c                 |    4 +-
 xfburn/xfburn-burn-image-dialog.h                 |    4 +-
 xfburn/xfburn-compositions-notebook.c             |    4 +-
 xfburn/xfburn-compositions-notebook.h             |    4 +-
 xfburn/xfburn-copy-cd-dialog.c                    |    4 +-
 xfburn/xfburn-copy-cd-dialog.h                    |    4 +-
 xfburn/xfburn-copy-cd-progress-dialog.c           |    4 +-
 xfburn/xfburn-copy-cd-progress-dialog.h           |    4 +-
 xfburn/xfburn-copy-dvd-dialog.c                   |    4 +-
 xfburn/xfburn-copy-dvd-dialog.h                   |    4 +-
 xfburn/xfburn-create-iso-progress-dialog.c        |    4 +-
 xfburn/xfburn-create-iso-progress-dialog.h        |    4 +-
 xfburn/xfburn-data-composition.c                  |    7 +-
 xfburn/xfburn-device-box.c                        |    3 +-
 xfburn/xfburn-device-list.c                       |    1 -
 xfburn/xfburn-directory-browser.c                 |    2 +-
 xfburn/xfburn-disc-usage.c                        |    1 -
 xfburn/xfburn-error.c                             |    2 +-
 xfburn/xfburn-error.h                             |    2 +-
 xfburn/xfburn-fs-browser.c                        |    6 +-
 xfburn/xfburn-fs-browser.h                        |    4 +-
 xfburn/xfburn-hal-manager.c                       |   46 +-
 xfburn/xfburn-hal-manager.h                       |   10 +-
 xfburn/xfburn-main-window.c                       |    2 +-
 xfburn/xfburn-main.c                              |   15 +-
 xfburn/xfburn-main.h                              |    4 +-
 xfburn/xfburn-notebook-tab.c                      |    2 +-
 xfburn/xfburn-notebook-tab.h                      |    2 +-
 xfburn/xfburn-preferences-dialog.c                |   14 +-
 xfburn/xfburn-preferences-dialog.h                |    4 +-
 xfburn/xfburn-progress-dialog.c                   |    2 +-
 xfburn/xfburn-progress-dialog.h                   |    2 +-
 xfburn/xfburn-settings.c                          |   42 +-
 xfburn/xfburn-settings.h                          |    8 +-
 xfburn/xfburn-transcoder-basic.c                  |    4 +-
 xfburn/xfburn-transcoder-basic.h                  |    4 +-
 xfburn/xfburn-transcoder-gst.c                    |    6 +-
 xfburn/xfburn-transcoder-gst.h                    |    4 +-
 xfburn/xfburn-transcoder.c                        |    4 +-
 xfburn/xfburn-transcoder.h                        |    4 +-
 xfburn/xfburn-utils.c                             |   14 +-
 xfburn/xfburn-utils.h                             |    4 +-
 xfburn/xfburn-welcome-tab.c                       |    2 +-
 xfburn/xfburn-welcome-tab.h                       |    2 +-
 62 files changed, 652 insertions(+), 674 deletions(-)

diff --git a/po/lv.po b/po/lv.po
index c51e36e..6a5005b 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -1,19 +1,23 @@
 # Latvian translations for xfburn package.
 # Copyright (C) 2005-2006 Jean-François Wauthy
 # This file is distributed under the same license as the xfburn package.
-# Rihards Prieditis <rprieditis at inbox.lv>, 2007.
 #
+# Rihards Prieditis <rprieditis at inbox.lv>, 2007.
+# Rihards Prieditis <rprieditis at gmail.com>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: xfburn 0.0.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-22 20:32-0600\n"
-"PO-Revision-Date: 2007-11-11 19:43+0300\n"
-"Last-Translator: Rihards Priedītis <rprieditis at inbox.lv>\n"
-"Language-Team: Latvian <rprieditis at inbox.lv>\n"
+"POT-Creation-Date: 2009-07-22 20:17-0600\n"
+"PO-Revision-Date: 2009-10-16 17:35+0100\n"
+"Last-Translator: Rihards Prieditis <rprieditis at gmail.com>\n"
+"Language-Team: Latvian <translation-team-lv at lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+"2);\n"
 
 #: ../xfburn/xfburn-adding-progress.c:112
 msgid "Adding files to the composition"
@@ -21,43 +25,39 @@ msgstr "Pieveinot failus kompilācijai"
 
 #: ../xfburn/xfburn-blank-dialog.c:72
 msgid "Quick Blank"
-msgstr ""
+msgstr "Ātri tukšot"
 
 #: ../xfburn/xfburn-blank-dialog.c:73
 msgid "Full Blank (slow)"
-msgstr ""
+msgstr "Pilnā tukšošana (lēni)"
 
 #: ../xfburn/xfburn-blank-dialog.c:74
-#, fuzzy
 msgid "Quick Format"
-msgstr "_Formatēt"
+msgstr "Ātrā formatēšana"
 
 #: ../xfburn/xfburn-blank-dialog.c:75
-#, fuzzy
 msgid "Full Format"
-msgstr "_Formatēt"
+msgstr "Pilnā formatēšana"
 
 #: ../xfburn/xfburn-blank-dialog.c:76
 msgid "Quick Deformat"
-msgstr ""
+msgstr "Ātrā pārformēšana"
 
 #: ../xfburn/xfburn-blank-dialog.c:77
 msgid "Full Deformat (slow)"
-msgstr ""
+msgstr "Pilnā pārformēšana (lēni)"
 
 #: ../xfburn/xfburn-blank-dialog.c:150
-#, fuzzy
 msgid "Eject the disc"
-msgstr "I_zgrūst disku"
+msgstr "Izgrūst disku"
 
 #: ../xfburn/xfburn-blank-dialog.c:151
 msgid "Default value for eject checkbox"
-msgstr ""
+msgstr "Noklusēta vērtība priekš izgrūšanas atzīmes lodziņa"
 
 #: ../xfburn/xfburn-blank-dialog.c:198
-#, fuzzy
 msgid "Blank Disc"
-msgstr "Tukšā veids"
+msgstr "Tukšs disks"
 
 #: ../xfburn/xfburn-blank-dialog.c:210
 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:191
@@ -66,12 +66,11 @@ msgstr "Tukšā veids"
 #: ../xfburn/xfburn-copy-dvd-dialog.c:132
 #: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:160
 msgid "Burning device"
-msgstr "Dedzinātāj ierīce"
+msgstr "Dedzināšanas ierīce"
 
 #: ../xfburn/xfburn-blank-dialog.c:223 ../xfburn/xfburn-device-box.c:188
-#, fuzzy
 msgid "Blank mode"
-msgstr "Tukšā veids"
+msgstr "Tukšais režīms"
 
 #: ../xfburn/xfburn-blank-dialog.c:231
 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:223
@@ -97,9 +96,8 @@ msgstr "_Tukšs"
 
 #. blanking can only be performed on blank discs, format and deformat are allowed to be blank ones
 #: ../xfburn/xfburn-blank-dialog.c:356
-#, fuzzy
 msgid "The inserted disc is already blank."
-msgstr "Ievietotais disks, jau ir tukšs"
+msgstr "Ievietotais disks, jau ir tukšs."
 
 #. these ones we can blank
 #: ../xfburn/xfburn-blank-dialog.c:362
@@ -107,18 +105,16 @@ msgid "Ready"
 msgstr "Gatavs"
 
 #: ../xfburn/xfburn-blank-dialog.c:365
-#, fuzzy
 msgid "No disc detected in the drive."
-msgstr "Iekārtā nav noteikts disks"
+msgstr "Iekārtā nav noteikts disks."
 
 #: ../xfburn/xfburn-blank-dialog.c:374
-#, fuzzy
 msgid "Disc is not erasable."
-msgstr "Datu nesējs nav dzēšams"
+msgstr "Datu nesējs nav dzēšams."
 
 #: ../xfburn/xfburn-blank-dialog.c:414
 msgid "Blanking disc..."
-msgstr "Tukšoju disku..."
+msgstr "Diska tukšošana..."
 
 #: ../xfburn/xfburn-blank-dialog.c:441
 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:502
@@ -137,23 +133,22 @@ msgstr "Kļūda"
 #: ../xfburn/xfburn-burn-image-dialog.c:332
 #: ../xfburn/xfburn-burn-image-dialog.c:532
 #: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:414
-#, fuzzy
 msgid "Unable to grab the drive."
-msgstr "Neizdevās paķert ierīci"
+msgstr "Neizdevās paķert ierīci."
 
 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:179
 #: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:149
 msgid "Burn Composition"
-msgstr "Dedzināt Kompozīciju"
+msgstr "Dedzināt kompozīciju"
 
 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:202
-#, fuzzy
 msgid "Composition name"
-msgstr "Dedzināt Kompozīciju"
+msgstr "Kompozīcijas nosaukums"
 
 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:207
 msgid "<small>Would you like to change the default composition name?</small>"
 msgstr ""
+"<small>Vai vēlaties nomainīt noklusētās kompozīcijas nosaukumu?</small>"
 
 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:232
 #: ../xfburn/xfburn-burn-image-dialog.c:188
@@ -167,7 +162,7 @@ msgstr "_Dumjā rakstīšana"
 #: ../xfburn/xfburn-burn-image-dialog.c:192
 #: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:207
 msgid "Burn_Free"
-msgstr "Brīvā_Dedzināšana"
+msgstr "Brīvā_dedzināšana"
 
 #. create ISO ?
 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:242
@@ -179,7 +174,7 @@ msgstr "Veidot tikai _ISO"
 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:279
 #: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:222
 msgid "_Burn Composition"
-msgstr "_Dedzināt Kompozīciju"
+msgstr "_Dedzināt kompozīciju"
 
 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:460
 #, c-format
@@ -188,7 +183,7 @@ msgstr "Nevarēju izveidot ISO failu: %s"
 
 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:467
 msgid "Writing ISO..."
-msgstr "Rakstu ISO..."
+msgstr "ISO rakstīšana..."
 
 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:484
 #, c-format
@@ -197,26 +192,22 @@ msgstr "Notika kļūda rakstot ISO: %s"
 
 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:538
 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:544
-#, fuzzy
 msgid "An error occurred in the burn backend."
-msgstr "Notika kļūda rakstot ISO: %s"
+msgstr "Notika kļūda rakstīšanas aizmugurē."
 
 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:571
 #: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:343
-#, fuzzy
 msgid "The write mode is not supported currently."
-msgstr "Šis rakstīšanas režīms pagaidām netiek atbalstīts"
+msgstr "Šis rakstīšanas režīms pagaidām netiek atbalstīts."
 
 #. could not create source
 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:659
-#, fuzzy
 msgid "Could not create ISO source structure."
-msgstr "Nevarēju izveidot ISO avota struktūru"
+msgstr "Nevarēju izveidot ISO avota struktūru."
 
 #: ../xfburn/xfburn-burn-image-dialog.c:136
-#, fuzzy
 msgid "Burn image"
-msgstr "_Dedzināt attēlu"
+msgstr "Dedzināt attēlu"
 
 #. file
 #: ../xfburn/xfburn-burn-image-dialog.c:143
@@ -238,101 +229,95 @@ msgstr "_Dedzināt attēlu"
 
 #: ../xfburn/xfburn-burn-image-dialog.c:296
 #: ../xfburn/xfburn-burn-image-dialog.c:325
-#, fuzzy
 msgid "An error occurred in the burn backend"
-msgstr "Notika kļūda rakstot ISO: %s"
+msgstr "Notika kļūda dedzināšanas aizmugurē"
 
 #: ../xfburn/xfburn-burn-image-dialog.c:309
-#, fuzzy
 msgid "Unable to determine image size."
-msgstr "Nevarēju  noteikt attēla izmēru"
+msgstr "Nevarēju noteikt attēla izmēru."
 
 #: ../xfburn/xfburn-burn-image-dialog.c:316
-#, fuzzy
 msgid "Cannot open image."
-msgstr "Nevaru atvērt attēlu"
+msgstr "Nevaru atvērt attēlu."
 
 #: ../xfburn/xfburn-burn-image-dialog.c:341
-#, fuzzy
 msgid "Burn mode is not currently implemented."
-msgstr "Šis rakstīšanas režīms pagaidām netiek atbalstīts"
+msgstr "Šis rakstīšanas režīms pagaidām nav izstrādāts."
 
 #: ../xfburn/xfburn-burn-image-dialog.c:351
 msgid "Burning image..."
-msgstr "Dedzinu attēlu..."
+msgstr "Attēla dedzināšana..."
 
 #: ../xfburn/xfburn-burn-image-dialog.c:422
 msgid ""
 "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Please "
 "select an image to burn</span>"
 msgstr ""
+"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">LÅ«dzu "
+"norādiet dedzināmo attēlu</span>"
 
 #: ../xfburn/xfburn-burn-image-dialog.c:460
 msgid ""
 "Cannot append data to multisession disc in this write mode (use TAO instead)"
 msgstr ""
-"Nevar apvienot datus uz vairāksesiju diska a esošo rakstīšanas režīmu "
-"(Izmantojiet TAO)"
+"Nevar apvienot datus uz vairāksesiju diska ar esošo rakstīšanas režīmu "
+"(izmantojiet TAO)"
 
 #: ../xfburn/xfburn-burn-image-dialog.c:464
-#, fuzzy
 msgid "Closed disc with data detected. Need blank or appendable disc"
 msgstr ""
-"Aizvērts datu nesējs, ar datiem, noteikts. Nepieciešams tukšs, vai "
+"Noteikts aizvērts datu nesējs, ar datiem. Nepieciešams tukšs, vai "
 "papildināms datu nesējs"
 
 #: ../xfburn/xfburn-burn-image-dialog.c:466
-#, fuzzy
 msgid "No disc detected in drive"
-msgstr "Iekārtā nav noteikts disks"
+msgstr "Iekārtā nav noteikts neviens disks"
 
 #: ../xfburn/xfburn-burn-image-dialog.c:468
-#, fuzzy
 msgid "Cannot recognize state of drive and disc"
 msgstr "Nevar atpazīt stāvokli ierīcei un datu nesējam"
 
 #: ../xfburn/xfburn-burn-image-dialog.c:480
 msgid "The selected image does not fit on the inserted disc"
-msgstr ""
+msgstr "Atlasītais attēls nevar ietilpt ievietotajā diskā"
 
 #: ../xfburn/xfburn-burn-image-dialog.c:484
-#, fuzzy
 msgid "Failed to get image size"
-msgstr "Nevarēju  noteikt attēla izmēru"
+msgstr "Nevarēju noteikt attēla izmēru"
 
 #: ../xfburn/xfburn-burn-image-dialog.c:512
 msgid ""
 "Make sure you selected a valid file and you have the proper permissions to "
 "access it."
 msgstr ""
+"Pārliecinieties, ka esat norādījuši derīgu failu un jums ir tiesības piekļūt "
+"Å¡im failam."
 
 #: ../xfburn/xfburn-burn-image-dialog.c:542
-#, fuzzy
 msgid "The write mode is not currently supported"
 msgstr "Šis rakstīšanas režīms pagaidām netiek atbalstīts"
 
 #: ../xfburn/xfburn-compositions-notebook.c:175
-#, fuzzy
 msgid "Audio composition"
-msgstr "Dedzināt kompozīciju"
+msgstr "Audio kompozīcija"
 
 #: ../xfburn/xfburn-compositions-notebook.c:236
 msgid "Welcome"
-msgstr ""
+msgstr "Esiet sveicināti"
 
 #: ../xfburn/xfburn-copy-cd-dialog.c:114
 #: ../xfburn/xfburn-copy-cd-progress-dialog.c:157
 msgid "Copy data CD"
-msgstr "Kopēt datus uz CD"
+msgstr "Kopēt datu CD"
 
 #: ../xfburn/xfburn-copy-cd-dialog.c:124
 msgid "CD Reader device"
-msgstr "CD Lasītāja iekārta"
+msgstr "CD lasītāja iekārta"
 
 #: ../xfburn/xfburn-copy-cd-dialog.c:153
 #: ../xfburn/xfburn-copy-dvd-dialog.c:153
 msgid "On the _fly"
-msgstr "_Patiešo"
+msgstr "_Pa tiešo"
 
 #: ../xfburn/xfburn-copy-cd-dialog.c:194
 msgid "_Copy CD"
@@ -340,29 +325,28 @@ msgstr "_Kopēt CD"
 
 #: ../xfburn/xfburn-copy-cd-progress-dialog.c:94
 msgid "Flushing cache..."
-msgstr "Attīru kešu..."
+msgstr "Keša attīrīšana..."
 
 #: ../xfburn/xfburn-copy-cd-progress-dialog.c:106
-#, fuzzy
 msgid "Please insert a recordable disc."
-msgstr "Lūdzu, ievietojiet ierakstāmu datu nesēju"
+msgstr "Lūdzu, ievietojiet ierakstāmu datu nesēju."
 
 #: ../xfburn/xfburn-copy-cd-progress-dialog.c:128
 msgid "Writing CD..."
-msgstr "Rakstu CD..."
+msgstr "CD rakstīšana..."
 
 #: ../xfburn/xfburn-copy-cd-progress-dialog.c:141
 #: ../xfburn/xfburn-create-iso-progress-dialog.c:103
 msgid "Reading CD..."
-msgstr "Lasu CD..."
+msgstr "CD lasīšana..."
 
 #: ../xfburn/xfburn-copy-dvd-dialog.c:114
 msgid "Copy data DVD"
-msgstr "Kopēju datu DVD"
+msgstr "Kopēt datu DVD"
 
 #: ../xfburn/xfburn-copy-dvd-dialog.c:124
 msgid "DVD Reader device"
-msgstr "DVD Lasāmā ierīce"
+msgstr "DVD lasāmā ierīce"
 
 #: ../xfburn/xfburn-copy-dvd-dialog.c:194
 msgid "_Copy DVD"
@@ -398,7 +382,7 @@ msgstr "Noņemt"
 #: ../xfburn/xfburn-data-composition.c:186
 #: ../xfburn/xfburn-audio-composition.c:209
 msgid "Remove the selected file(s) from the composition"
-msgstr "Noņmet atlasīto(-s) failus no kompozīcijas"
+msgstr "Noņemt atlasīto(-s) failus no kompozīcijas"
 
 #: ../xfburn/xfburn-data-composition.c:188
 #: ../xfburn/xfburn-audio-composition.c:211
@@ -408,7 +392,7 @@ msgstr "Notīrīt"
 #: ../xfburn/xfburn-data-composition.c:188
 #: ../xfburn/xfburn-audio-composition.c:211
 msgid "Clear the content of the composition"
-msgstr "Notīrīt kompzīcijas saturu"
+msgstr "Notīrīt kompozīcijas saturu"
 
 #. {"import-session", "xfburn-import-session", N_("Import"), NULL, N_("Import existing session"),},
 #: ../xfburn/xfburn-data-composition.c:191
@@ -427,7 +411,7 @@ msgstr "SÄ“juma nosaukums :"
 #: ../xfburn/xfburn-data-composition.c:365
 #, c-format
 msgid "Data %s~%d"
-msgstr ""
+msgstr "Datums %s~%d"
 
 #: ../xfburn/xfburn-data-composition.c:397
 msgid "Contents"
@@ -440,25 +424,23 @@ msgstr "Izmērs"
 
 #: ../xfburn/xfburn-data-composition.c:415
 msgid "Local Path"
-msgstr "Vietējais Ceļš"
+msgstr "Vietējais ceļš"
 
 #: ../xfburn/xfburn-data-composition.c:690
-#, fuzzy
 msgid "You must give a name to the file."
-msgstr "Jums, jānorāda failam nosaukums"
+msgstr "Jums, jānorāda failam nosaukums."
 
 #: ../xfburn/xfburn-data-composition.c:699
 #: ../xfburn/xfburn-data-composition.c:1097
 #: ../xfburn/xfburn-audio-composition.c:1146
-#, fuzzy
 msgid "A file with the same name is already present in the composition."
-msgstr "Fails ar tādu nosaukumu jau ir kompozīcijā"
+msgstr "Fails ar tādu nosaukumu jau ir kompozīcijā."
 
 #: ../xfburn/xfburn-data-composition.c:807
 #: ../xfburn/xfburn-data-composition.c:808
 #: ../xfburn/xfburn-data-composition.c:810
 msgid "New directory"
-msgstr "Jaunu direktoriju"
+msgstr "Jauna direktorija"
 
 #: ../xfburn/xfburn-data-composition.c:1176
 #, c-format
@@ -466,12 +448,13 @@ msgid ""
 "%s cannot be added to the composition, because it exceeds the maximum "
 "allowed file size for iso9660."
 msgstr ""
+"%s nevar tikt pievienots kompozīcijā, jo tas pārsniedz atļautā faila izmēra "
+"maksimumu ISO9660 standartā."
 
 #: ../xfburn/xfburn-data-composition.c:1266
 #: ../xfburn/xfburn-audio-composition.c:1319
-#, fuzzy
 msgid "Adding home directory"
-msgstr "Jaunu direktoriju"
+msgstr "Pievienoju mājas direktoriju"
 
 #: ../xfburn/xfburn-data-composition.c:1267
 #: ../xfburn/xfburn-audio-composition.c:1320
@@ -481,28 +464,31 @@ msgid ""
 "\n"
 "Are you sure you want to proceed?"
 msgstr ""
+"Jūs grasāties pievienot savu mājas mapi kompozīcijā. Visdrīzāk tas aizņems "
+"ļoti daudz laika un diskā var nebūt tik daudz vietas.\n"
+"\n"
+"Vai vēlaties turpināt?"
 
-#: ../xfburn/xfburn-data-composition.c:1429
-#, fuzzy, c-format
+#: ../xfburn/xfburn-data-composition.c:1429, c-format
 msgid ""
 "A file named \"%s\" already exists in this directory, the file hasn't been "
 "added."
 msgstr ""
-"Faila nosaukums \"%s\" jau eksistē šai direktorijā, fails netika pievienots"
+"Faila nosaukums \"%s\" jau eksistē šai direktorijā, fails netika pievienots."
 
 #. The first string is the renamed name, the second one the original name
 #: ../xfburn/xfburn-data-composition.c:1847
 #, c-format
 msgid "Duplicate filename '%s' for '%s'"
-msgstr ""
+msgstr "Dublikāts faila nosaukumam \"%s\" priekš \"%s\""
 
 #: ../xfburn/xfburn-device-box.c:173 ../xfburn/xfburn-device-box.c:174
 msgid "Show writers only"
-msgstr "Rādit tikai rakstītājus"
+msgstr "Rādīt tikai rakstītājus"
 
 #: ../xfburn/xfburn-device-box.c:176
 msgid "Show speed selection"
-msgstr "Rādit ātruma atlasi"
+msgstr "Rādīt ātruma atlasi"
 
 #: ../xfburn/xfburn-device-box.c:177
 msgid "Show speed selection combo"
@@ -510,7 +496,7 @@ msgstr "Rādīt kombinēto ātruma atlasi"
 
 #: ../xfburn/xfburn-device-box.c:180
 msgid "Show mode selection"
-msgstr "Rādit rēžīma atlasi"
+msgstr "Rādīt režīma atlasi"
 
 #: ../xfburn/xfburn-device-box.c:181
 msgid "Show mode selection combo"
@@ -518,19 +504,20 @@ msgstr "Rādīt kombinēto režīma atlasi"
 
 #: ../xfburn/xfburn-device-box.c:184
 msgid "Is it a valid combination"
-msgstr ""
+msgstr "Vai tā ir derīga kombinācija"
 
 #: ../xfburn/xfburn-device-box.c:185
 msgid "Is the combination of hardware and disc valid to burn the composition?"
-msgstr ""
+msgstr "Vai dzelža un diska kombinācija ir derīga kompozīcijas dedzināšanai?"
 
 #: ../xfburn/xfburn-device-box.c:189
 msgid "The blank mode shows different disc status messages than regular mode"
 msgstr ""
+"Tukšais režīms rāda citus diska statusa paziņojumus nekā parastais režīms"
 
 #: ../xfburn/xfburn-device-box.c:192 ../xfburn/xfburn-device-box.c:193
 msgid "Accept only CDs as valid discs"
-msgstr ""
+msgstr "Pieņemt tikai derīgos CD diskus"
 
 #: ../xfburn/xfburn-device-box.c:246
 msgid "_Speed:"
@@ -542,7 +529,7 @@ msgstr "Rakstīšanas r_ežīms:"
 
 #: ../xfburn/xfburn-device-box.c:388
 msgid "Empty speed list"
-msgstr ""
+msgstr "Tukšs ātruma saraksts"
 
 #: ../xfburn/xfburn-device-box.c:396
 msgid ""
@@ -557,83 +544,87 @@ msgid ""
 "\n"
 "<i>Thank you!</i>"
 msgstr ""
+"<b>Neizdevās iegūt ātruma sarakstu no ierīces.</b>\n"
+"\n"
+"Tā ir zināma kļūda, kas notiek dažās iekārtās. Lūdzu ziņojiet par to uz <i>"
+"xfburn at xfce.org</i> kopā ar konsoles izvadu, lai palielinātu salabošanas "
+"iespējas.\n"
+"\n"
+"Dedzināšanai būtu vienalga jāstrādā, bet ja rodas kādas problēmas ziņojiet.\n"
+"\n"
+"<i>Paldies!</i>"
 
 #: ../xfburn/xfburn-device-box.c:405
 msgid "Continue to _show this notice"
-msgstr ""
+msgstr "Turpmāk arī _rādīt šo ziņu"
 
 #: ../xfburn/xfburn-device-box.c:447
 msgid "default"
-msgstr ""
+msgstr "noklusētais"
 
 #: ../xfburn/xfburn-device-box.c:483
 msgid "Max"
-msgstr ""
+msgstr "Maks"
 
 #: ../xfburn/xfburn-device-box.c:582
 msgid "Drive can't burn on the inserted disc"
-msgstr ""
+msgstr "Ierīce nevar iededzināt ievietoto disku"
 
 #: ../xfburn/xfburn-device-box.c:591 ../xfburn/xfburn-device-box.c:637
 msgid "Drive is empty"
-msgstr ""
+msgstr "Disks ir tukšs"
 
 #: ../xfburn/xfburn-device-box.c:594
 msgid "Sorry, multisession is not yet supported"
-msgstr ""
+msgstr "Piedodiet, multisesijas netiek vēl atbalstītas"
 
 #: ../xfburn/xfburn-device-box.c:597
-#, fuzzy
 msgid "Inserted disc is full"
-msgstr "Ievietotais disks, jau ir tukšs"
+msgstr "Ievietotais disks ir pilns"
 
 #: ../xfburn/xfburn-device-box.c:600 ../xfburn/xfburn-device-box.c:643
-#, fuzzy
 msgid "Inserted disc is unsuitable"
-msgstr "Ievietotais disks, jau ir tukšs"
+msgstr "Ievietotais disks nav derīgs"
 
 #: ../xfburn/xfburn-device-box.c:603 ../xfburn/xfburn-device-box.c:646
 msgid "Cannot access drive (it might be in use)"
-msgstr ""
+msgstr "Nevar piekļūt ierīcei (iespējams, ka ierīce tiek lietota)"
 
 #: ../xfburn/xfburn-device-box.c:608 ../xfburn/xfburn-device-box.c:649
 msgid "Error determining disc"
-msgstr ""
+msgstr "Kļūda nosakot disku"
 
 #: ../xfburn/xfburn-device-box.c:629
 msgid "Write-once disc, no blanking possible"
-msgstr ""
+msgstr "Vienreiz ierakstām disks, iztukšošana nav iespējama"
 
 #: ../xfburn/xfburn-device-box.c:632
 msgid "DVD+RW does not need blanking"
-msgstr ""
+msgstr "DVD+RW nav nepieciešama iztukšošana"
 
 #: ../xfburn/xfburn-device-box.c:640
-#, fuzzy
 msgid "Inserted disc is already blank"
 msgstr "Ievietotais disks, jau ir tukšs"
 
 #: ../xfburn/xfburn-device-list.c:206 ../xfburn/xfburn-device-list.c:207
 msgid "Number of burners in the system"
-msgstr ""
+msgstr "Dedzinātāju skaits sistēmā"
 
 #: ../xfburn/xfburn-device-list.c:209
 msgid "Number of drives in the system"
-msgstr ""
+msgstr "Ierīču skaits sistēmā"
 
 #: ../xfburn/xfburn-device-list.c:210
 msgid "Number of drives in the system (readers and writers)"
-msgstr ""
+msgstr "Ierīču skaits sistēmā (lasītāji un rakstītāji)"
 
 #: ../xfburn/xfburn-device-list.c:212 ../xfburn/xfburn-device-list.c:213
-#, fuzzy
 msgid "List of devices"
-msgstr "M_eklēt ierīces"
+msgstr "Ierīču saraksts"
 
 #: ../xfburn/xfburn-device-list.c:215 ../xfburn/xfburn-device-list.c:216
-#, fuzzy
 msgid "Currently selected device"
-msgstr "Noteiktās ierīces"
+msgstr "Patreiz atlasītā ierīce"
 
 #. globals
 #: ../xfburn/xfburn-directory-browser.c:58
@@ -669,14 +660,17 @@ msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
+"%s: %s\n"
+"Mēģiniet %s --help , lai redzētu pilnu sarakstu ar komandas līnijas opcijām."
+"\n"
 
 #: ../xfburn/xfburn-main.c:222
 msgid "Unable to initialize the burning backend."
-msgstr ""
+msgstr "Neizdevās inicializēt dedzināšanas aizmuguri."
 
 #: ../xfburn/xfburn-main.c:307
 msgid "No burners are currently available"
-msgstr ""
+msgstr "Neviens dedzinātājs pagaidām nav pieejams"
 
 #: ../xfburn/xfburn-main.c:309
 msgid ""
@@ -687,6 +681,12 @@ msgid ""
 "If no disc is in the drive, check that you have read and write access to the "
 "drive with the current user."
 msgstr ""
+"Iespējams disks(-i) tiek izmantoti un tāpēc nav pieejami.\n"
+"\n"
+"Lūdzu atmontējiet un pārstartējiet lietotni\n"
+"\n"
+"Ja nav neviena diska ierīce, tad pārbaudiet, vai jums ir rakstīšanas un "
+"lasīšanas pieejas iekārtai ar šo lietotāju."
 
 #: ../xfburn/xfburn-main.c:343
 #, c-format
@@ -694,11 +694,13 @@ msgid ""
 "Failed to initialize %s transcoder: %s\n"
 "\t(falling back to basic implementation)"
 msgstr ""
+"Neizdevās inicializēt %s transcoder: %s\n"
+"\t(atgriežas uz pamata izstrādni)"
 
 #: ../xfburn/xfburn-main.c:376
 #, c-format
 msgid "Image file '%s' does not exist."
-msgstr ""
+msgstr "Attēla fails \"%s\" neeksistē."
 
 #: ../xfburn/xfburn-main-window.c:100
 msgid "_File"
@@ -708,14 +710,12 @@ msgstr "_Fails"
 #. {"new-composition", GTK_STOCK_NEW, N_("_New composition"), NULL, N_("Create a new composition"),
 #. G_CALLBACK (action_new_data_composition),},
 #: ../xfburn/xfburn-main-window.c:104
-#, fuzzy
 msgid "New data composition"
-msgstr "Datu Kompozīcija"
+msgstr "Jauna datu kompozīcija"
 
 #: ../xfburn/xfburn-main-window.c:106
-#, fuzzy
 msgid "New audio composition"
-msgstr "_Jauna kompozīcija"
+msgstr "Jauna audio kompozīcija"
 
 #. {"load-composition", GTK_STOCK_OPEN, N_("Load composition"), NULL, N_("Load composition"),
 #. G_CALLBACK (action_load),},
@@ -785,9 +785,8 @@ msgstr "Kopēt Data CD"
 
 #. {"copy-audio", "xfburn-audio-copy", N_("Copy Audio CD"), NULL, N_("Copy Audio CD"),},
 #: ../xfburn/xfburn-main-window.c:132
-#, fuzzy
 msgid "Burn Image"
-msgstr "Dedzināt CD Attēlu"
+msgstr "Dedzināt attēlu"
 
 #. {"copy-dvd", "xfburn-data-copy", N_("Copy DVD"), NULL, N_("Copy DVD"),
 #. G_CALLBACK (action_copy_dvd),},
@@ -805,28 +804,27 @@ msgstr "Rādīt/slēpt failu pārlūku"
 
 #: ../xfburn/xfburn-main-window.c:143
 msgid "Show toolbar"
-msgstr "Rādīt rīkjoslu"
+msgstr "Rādīt rīku joslu"
 
 #: ../xfburn/xfburn-main-window.c:143
 msgid "Show/hide the toolbar"
-msgstr "Rādīt/slēpt rīkjoslu"
+msgstr "Rādīt/slēpt rīku joslu"
 
 #: ../xfburn/xfburn-main-window.c:350
 msgid "Toolbar Editor"
-msgstr "RÄ«kjoslas Redaktors"
+msgstr "RÄ«ku joslas redaktors"
 
 #: ../xfburn/xfburn-main-window.c:533
 msgid "Another cd burning GUI"
-msgstr "Vēlviens cd dedzināšanas GUI"
+msgstr "Vēl viens cd dedzināšanas GUI"
 
 #: ../xfburn/xfburn-main-window.c:536 ../xfburn/xfburn-main-window.c:537
 msgid "Author/Maintainer"
 msgstr "Autors/Uzturētājs"
 
 #: ../xfburn/xfburn-main-window.c:538
-#, fuzzy
 msgid "Retired author/maintainer"
-msgstr "Autors/Uzturētājs"
+msgstr "Aizgājušais autors/uzturētājs"
 
 #: ../xfburn/xfburn-main-window.c:544
 #, c-format
@@ -842,79 +840,73 @@ msgid "The text of the label"
 msgstr "EtiÄ·etes teksts"
 
 #: ../xfburn/xfburn-notebook-tab.c:112
-#, fuzzy
 msgid "Show close button"
-msgstr "Rādit rēžīma atlasi"
+msgstr "Rādīt aizvēršanas pogu"
 
 #: ../xfburn/xfburn-notebook-tab.c:112
 msgid "Determine whether the close button is visible"
-msgstr ""
+msgstr "Nosaka vai aizvēršanas poga ir redzama"
 
 #: ../xfburn/xfburn-perform-burn.c:96
-#, fuzzy
 msgid ""
 "Cannot append data to multisession disc in this write mode (use TAO instead)."
 msgstr ""
 "Nevar apvienot datus uz vairāksesiju diska a esošo rakstīšanas režīmu "
-"(Izmantojiet TAO)"
+"(izmantojiet TAO)."
 
 #: ../xfburn/xfburn-perform-burn.c:100
-#, fuzzy
 msgid "Closed disc with data detected, a blank or appendable disc is needed."
 msgstr ""
 "Aizvērts datu nesējs, ar datiem, noteikts. Nepieciešams tukšs, vai "
-"papildināms datu nesējs"
+"papildināms datu nesējs."
 
 #: ../xfburn/xfburn-perform-burn.c:102
-#, fuzzy
 msgid "No disc detected in drive."
-msgstr "Iekārtā nav noteikts disks"
+msgstr "Iekārtā nav noteikts disks."
 
 #: ../xfburn/xfburn-perform-burn.c:105
-#, fuzzy
 msgid "Cannot recognize the state of the drive and disc."
-msgstr "Nevar atpazīt stāvokli ierīcei un datu nesējam"
+msgstr "Nevar atpazīt stāvokli ierīcei un datu nesējam."
 
 #: ../xfburn/xfburn-perform-burn.c:118
 msgid "There is not enough space available on the inserted disc."
-msgstr ""
+msgstr "Uz ievietotā diska nav pietiekami daudz brīvās vietas."
 
-#: ../xfburn/xfburn-perform-burn.c:163
-#, fuzzy, c-format
+#: ../xfburn/xfburn-perform-burn.c:163, c-format
 msgid "Burning track %2d/%d..."
-msgstr "Dedzinu attēlu..."
+msgstr "Celiņa dedzināšana %2d/%d..."
 
 #: ../xfburn/xfburn-perform-burn.c:167 ../xfburn/xfburn-perform-burn.c:232
 msgid "Burning composition..."
-msgstr "Dedzinu kompozīciju..."
+msgstr "Kompozīcijas dedzināšana..."
 
 #: ../xfburn/xfburn-perform-burn.c:201
 msgid "standby"
-msgstr ""
+msgstr "gaidstāve"
 
 #: ../xfburn/xfburn-perform-burn.c:209
 msgid "ending"
-msgstr ""
+msgstr "beigas"
 
 #: ../xfburn/xfburn-perform-burn.c:212
 msgid "failing"
-msgstr ""
+msgstr "neizdodas"
 
 #: ../xfburn/xfburn-perform-burn.c:215
 msgid "unused"
-msgstr ""
+msgstr "nelietots"
 
 #: ../xfburn/xfburn-perform-burn.c:218
 msgid "abandoned"
-msgstr ""
+msgstr "pamests"
 
 #: ../xfburn/xfburn-perform-burn.c:221
 msgid "ended"
-msgstr ""
+msgstr "beidzies"
 
 #: ../xfburn/xfburn-perform-burn.c:224
 msgid "aborted"
-msgstr ""
+msgstr "atcelts"
 
 #: ../xfburn/xfburn-perform-burn.c:227 ../xfburn/xfburn-progress-dialog.c:200
 #: ../xfburn/xfburn-progress-dialog.c:217
@@ -928,36 +920,35 @@ msgstr "nav informācijas"
 
 #: ../xfburn/xfburn-perform-burn.c:237
 msgid "Writing Lead-In..."
-msgstr "Rakstu Ievadu..."
+msgstr "Raksta ievadu..."
 
 #: ../xfburn/xfburn-perform-burn.c:243
 msgid "Writing Lead-Out..."
-msgstr "Rakstu Izvadu..."
+msgstr "Raksta izvadu..."
 
 #: ../xfburn/xfburn-perform-burn.c:249
 msgid "Writing pregap..."
-msgstr "Rakstu pirmsatkāpi..."
+msgstr "Raksta pirmsatkāpi..."
 
 #: ../xfburn/xfburn-perform-burn.c:255
 msgid "Closing track..."
-msgstr "Aizveru celiņu..."
+msgstr "Aizver celiņu..."
 
 #: ../xfburn/xfburn-perform-burn.c:261
 msgid "Closing session..."
-msgstr "Aizveru sesiju..."
+msgstr "Aizver sesiju..."
 
 #: ../xfburn/xfburn-perform-burn.c:267
-#, fuzzy
 msgid "Formatting..."
-msgstr "Rakstu CD..."
+msgstr "Formatē"
 
 #: ../xfburn/xfburn-perform-burn.c:280
 msgid "see console"
-msgstr ""
+msgstr "apskatīt konsoli"
 
 #: ../xfburn/xfburn-perform-burn.c:308
 msgid "User Aborted"
-msgstr ""
+msgstr "Lietotāja atcelts"
 
 #: ../xfburn/xfburn-preferences-dialog.c:142
 msgid "Preferences"
@@ -982,7 +973,7 @@ msgstr "Failu pārlūks"
 
 #: ../xfburn/xfburn-preferences-dialog.c:208
 msgid "Show _hidden files"
-msgstr "Rādit _slēptos failus"
+msgstr "Rādīt _slēptos failus"
 
 #: ../xfburn/xfburn-preferences-dialog.c:213
 msgid "Show human_readable filesizes"
@@ -1032,20 +1023,19 @@ msgstr "M_eklēt ierīces"
 #. below the device list
 #: ../xfburn/xfburn-preferences-dialog.c:322
 msgid "Show warning on _empty speed list"
-msgstr ""
+msgstr "Rādīt brīdinājumu uz _tukšu ātruma sarakstu"
 
 #: ../xfburn/xfburn-preferences-dialog.c:330
-#, fuzzy
 msgid "FIFO buffer size (in kb)"
-msgstr "FIFO buferis:"
+msgstr "FIFO bufera izmērs (kb)"
 
 #: ../xfburn/xfburn-preferences-dialog.c:464
 msgid "Changing this setting only takes full effect after a program restart."
-msgstr ""
+msgstr "Šo uzstādījumu maiņa stājas spēka pēc programmas pārstartēšanas."
 
 #: ../xfburn/xfburn-progress-dialog.c:182
 msgid "Initializing..."
-msgstr "Sāknēju..."
+msgstr "Inicializācija..."
 
 #: ../xfburn/xfburn-progress-dialog.c:197
 msgid "Estimated writing speed:"
@@ -1057,17 +1047,16 @@ msgstr "FIFO buferis:"
 
 #: ../xfburn/xfburn-progress-dialog.c:221
 msgid "Device buffer:"
-msgstr "Ierices buferis:"
+msgstr "Ierīces buferis:"
 
 #: ../xfburn/xfburn-progress-dialog.c:468
 #, c-format
 msgid "Min. fill was %2d%%"
-msgstr ""
+msgstr "Min. aizpildījums bija %2d%%"
 
 #: ../xfburn/xfburn-progress-dialog.c:527
-#, fuzzy
 msgid "Aborted"
-msgstr "_Par"
+msgstr "Kļūdas atcelts"
 
 #: ../xfburn/xfburn-progress-dialog.c:533
 msgid "Failed"
@@ -1082,125 +1071,113 @@ msgid "Completed"
 msgstr "Pabeigts"
 
 #: ../xfburn/xfburn-progress-dialog.c:576
-#, fuzzy
 msgid "Aborting..."
-msgstr "Rakstu CD..."
+msgstr "Atcelšana..."
 
 #: ../xfburn/xfburn-utils.c:130
 msgid "Select command"
 msgstr "Norādiet komandu"
 
 #: ../xfburn/xfburn-welcome-tab.c:130
-#, fuzzy
 msgid "Welcome to xfburn!"
-msgstr "Attēls, kuru dedzināt"
+msgstr "Sveicināti xfburn!"
 
 #. buttons
 #: ../xfburn/xfburn-welcome-tab.c:141
-#, fuzzy
 msgid "<big>Burn _Image</big>"
-msgstr "Dedzināt CD Attēlu"
+msgstr "<big>Dedzināt _attēlu</big>"
 
 #: ../xfburn/xfburn-welcome-tab.c:141
 msgid "Burn a prepared compilation, i.e. an .ISO file"
-msgstr ""
+msgstr "Dedzināt sagatavotu kompilāciju, piemēram, ISO fails"
 
 #: ../xfburn/xfburn-welcome-tab.c:146
-#, fuzzy
 msgid "<big>New _Data Composition</big>"
-msgstr "Datu Kompozīcija"
+msgstr "<big>Jauna _datu kompozīcija</big>"
 
 #: ../xfburn/xfburn-welcome-tab.c:146
 msgid "Create a new data disc with the files of your choosing"
-msgstr ""
+msgstr "Izveidot jaunu data disku, ar jūsu atlasītajiem failiem"
 
 #: ../xfburn/xfburn-welcome-tab.c:151
 msgid "<big>_Blank Disc</big>"
-msgstr ""
+msgstr "<big>_Tukšot disks</big>"
 
 #: ../xfburn/xfburn-welcome-tab.c:151
 msgid "Prepare the rewriteable disc for a new burn"
-msgstr ""
+msgstr "Sagatavo pārrakstāmo disku jaunai dedzināšanai"
 
 #: ../xfburn/xfburn-welcome-tab.c:156
-#, fuzzy
 msgid "<big>_Audio CD</big>"
-msgstr "Dedzināt CD Attēlu"
+msgstr "<big>_Audio CD</big>"
 
 #: ../xfburn/xfburn-welcome-tab.c:156
 msgid "Audio CD playable in regular stereos"
-msgstr ""
+msgstr "Audio CD atskaņojams parasto mūzikas atskaņotājos"
 
 #: ../xfburn/xfburn-audio-composition.c:213
 msgid "What files can get burned to an audio CD?"
-msgstr ""
+msgstr "Kādi faili var tikt iededzināti Audio CD?"
 
 #: ../xfburn/xfburn-audio-composition.c:217
-#, fuzzy
 msgid "Rename Artist"
-msgstr "Pārdēvēt"
+msgstr "Pārdēvēt izpildītāju"
 
 #: ../xfburn/xfburn-audio-composition.c:217
-#, fuzzy
 msgid "Rename the artist of the selected file"
-msgstr "Pārdēvēt atlasīto failu"
+msgstr "Pārdēvēt atlasītā faila izpildītāju"
 
 #: ../xfburn/xfburn-audio-composition.c:219
-#, fuzzy
 msgid "Rename Title"
-msgstr "Pārdēvēt"
+msgstr "Pārdēvēt virsrakstu"
 
 #: ../xfburn/xfburn-audio-composition.c:219
-#, fuzzy
 msgid "Rename the title of the selected file"
-msgstr "Pārdēvēt atlasīto failu"
+msgstr "Pārdēvēt atlasītā faila virsrakstu"
 
 #: ../xfburn/xfburn-audio-composition.c:403
 msgid "Pos"
-msgstr ""
+msgstr "Pozīcija"
 
 #: ../xfburn/xfburn-audio-composition.c:405
 msgid "Length"
-msgstr ""
+msgstr "Garums"
 
 #: ../xfburn/xfburn-audio-composition.c:411
 msgid "Artist"
-msgstr ""
+msgstr "Izpildītājs"
 
 #: ../xfburn/xfburn-audio-composition.c:424
-#, fuzzy
 msgid "Title"
-msgstr "Fails"
+msgstr "Virsraksts"
 
 #: ../xfburn/xfburn-audio-composition.c:435
-#, fuzzy
 msgid "Filename"
-msgstr "Pārdēvēt"
+msgstr "Faila nosaukums"
 
 #: ../xfburn/xfburn-audio-composition.c:582
 msgid "Cannot burn audio onto a DVD."
-msgstr ""
+msgstr "Nevar iededzināt audio cd iekš DVD diska."
 
 #: ../xfburn/xfburn-audio-composition.c:1230
 msgid "You can only have a maximum of 99 tracks."
-msgstr ""
+msgstr "Maksimālais celiņu skaits ir 99."
 
 #: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:311
 msgid "A problem with the burn backend occurred."
-msgstr ""
+msgstr "Notika problēma ar dedzināšanas aizmuguri."
 
 #: ../xfburn/xfburn-disc-usage.c:165
 msgid "Proceed to Burn"
-msgstr ""
+msgstr "Doties uz dedzināšanu"
 
 #: ../xfburn/xfburn-disc-usage.c:205
-#, fuzzy
 msgid "You are trying to burn more onto the disc than it can hold."
-msgstr "Jūs mēģinat iededzināt vairāk datu, nekā disks spēj saturēt !"
+msgstr "Jūs mēģināt iededzināt vairāk datu, nekā disks spēj saturēt."
 
 #: ../xfburn/xfburn-transcoder-basic.c:167
 msgid "basic"
-msgstr ""
+msgstr "pamata"
 
 #: ../xfburn/xfburn-transcoder-basic.c:173
 msgid ""
@@ -1213,31 +1190,37 @@ msgid ""
 "audio files, please compile with\n"
 "gstreamer support."
 msgstr ""
+"Pamata transcoder ir iestrādāts,\n"
+"un tam nav nepieciešamas nekādas bibliotēkas.\n"
+"Bet tas var tikt galā tikai ar nesaspiestiem\n"
+".wav failiem.\n"
+"Ja jūs vēlaties izveidot audi\n"
+"kompozīciju no citiem audio failu\n"
+"tipiem, lūdzu kompilējiet ar\n"
+"gstreamer atbalstu."
 
 #: ../xfburn/xfburn-transcoder-basic.c:197
 #, c-format
 msgid "File %s does not have a .wav extension"
-msgstr ""
+msgstr "Failam %s nav .wav paplašinājuma"
 
 #: ../xfburn/xfburn-transcoder-basic.c:202
 #, c-format
 msgid "File %s does not contain uncompressed PCM wave audio"
-msgstr ""
+msgstr "Fails %s nesatur nesaspiestu PCM wave skaņu"
 
-#: ../xfburn/xfburn-transcoder-basic.c:208
-#, fuzzy, c-format
+#: ../xfburn/xfburn-transcoder-basic.c:208, c-format
 msgid "Could not stat %s: %s"
-msgstr "Nevarēju izveidot ISO failu: %s"
+msgstr "Nevarēja iestatīt %s: %s"
 
-#: ../xfburn/xfburn-transcoder-basic.c:239
-#, fuzzy, c-format
+#: ../xfburn/xfburn-transcoder-basic.c:239, c-format
 msgid "Could not open %s."
-msgstr "Nevarēju izveidot ISO failu: %s"
+msgstr "Nevarēja atvērt %s."
 
 #: ../xfburn/xfburn-transcoder-basic.c:320
 #, c-format
 msgid "Could not open %s: %s"
-msgstr ""
+msgstr "Nevarēja atvērt %s: %s"
 
 #: ../xfburn/xfburn-transcoder-gst.c:633
 #, c-format
@@ -1248,13 +1231,18 @@ msgid ""
 "Probably you need to look at the gst-plugins-* packages\n"
 "for the necessary plugins.\n"
 msgstr ""
+"%s trūkst.\n"
+"\n"
+"Jums nav instalēts dekoderis, lai apstrādātu šo failu.\n"
+"Visdrīzāk jums ir jāskata gst-plugins-* paciņas, lai\n"
+"tiktu pie nepieciešama spraudņa.\n"
 
 #. Note to translators: you can probably keep this as gstreamer,
 #. * unless you have a good reason to call it by another name that
 #. * the user would understand better
 #: ../xfburn/xfburn-transcoder-gst.c:722
 msgid "gstreamer"
-msgstr ""
+msgstr "gstreamer"
 
 #: ../xfburn/xfburn-transcoder-gst.c:728
 msgid ""
@@ -1267,11 +1255,19 @@ msgid ""
 "that you have the 'good','bad', and 'ugly'\n"
 "gstreamer plugin packages installed."
 msgstr ""
+"gstreamer transcoder izmanto gstreamer\n"
+"bibliotēku, lai veidotu audio kompozīcijas.\n"
+"\n"
+"Pamatā visi audio failiem jābūt atbalstītiem,\n"
+"ja pieņem ka spraudņi ir pareizi instalēti.\n"
+"Ja audio fails netiek atpazīts, pārliecinieties, ka \n"
+"jums ir instalētas gstreamer spraudņu paciņas\n"
+"'good','bad', un 'ugly'."
 
 #: ../xfburn/xfburn-transcoder-gst.c:793
 #, c-format
 msgid "Gstreamer did not like this file (detection timed out)"
-msgstr ""
+msgstr "Gstreamer nepatika šis fails  (noteikšana iztecēja)"
 
 #: ../xfburn/xfburn-transcoder-gst.c:802
 #, c-format
@@ -1282,103 +1278,102 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"%s\n"
+"\n"
+"nav audio fails:\n"
+"\n"
+"%s"
 
 #: ../xfburn/xfburn-transcoder-gst.c:917
 #, c-format
 msgid "Gstreamer did not want to start transcoding (timed out)"
-msgstr ""
+msgstr "Gstreamer negribēja sākt transcoding (iztecēja)"
 
 #: ../xfburn/xfburn-transcoder-gst.c:952
 #, c-format
 msgid "Failed to change songs while transcoding"
-msgstr ""
+msgstr "Neizdevās izmainīt dziesmas, kamēr notika transcoding"
 
 #: ../xfburn/xfburn-transcoder.c:125 ../xfburn/xfburn-transcoder.c:152
-#: ../xfburn/xfburn-transcoder.c:164
-#, fuzzy, c-format
+#: ../xfburn/xfburn-transcoder.c:164, c-format
 msgid "not implemented"
-msgstr "Pabeigts"
+msgstr "nav izstrādāts"
 
 #: ../xfburn/xfburn-device.c:248 ../xfburn/xfburn-device.c:249
-#, fuzzy
 msgid "Display name"
-msgstr "Pārdēvēt"
+msgstr "Attēlot nosaukumu"
 
 #: ../xfburn/xfburn-device.c:251 ../xfburn/xfburn-device.c:252
-#, fuzzy
 msgid "Device address"
-msgstr "Ierīces"
+msgstr "Ierīces adrese"
 
 #: ../xfburn/xfburn-device.c:254 ../xfburn/xfburn-device.c:255
 msgid "Is the device accessible"
-msgstr ""
+msgstr "Vai ierīce ir pieejama"
 
 #: ../xfburn/xfburn-device.c:257 ../xfburn/xfburn-device.c:258
 msgid "Burn speeds supported by the device"
-msgstr ""
+msgstr "Rakstīšanas ātrumi, kurus atbalsta ierīce"
 
 #: ../xfburn/xfburn-device.c:260 ../xfburn/xfburn-device.c:261
 msgid "Disc status"
-msgstr ""
+msgstr "Diska status"
 
 #: ../xfburn/xfburn-device.c:263 ../xfburn/xfburn-device.c:264
 msgid "Profile no. as reported by libburn"
-msgstr ""
+msgstr "Profila numurs, kā ziņo libburn"
 
 #: ../xfburn/xfburn-device.c:266 ../xfburn/xfburn-device.c:267
 msgid "Profile name as reported by libburn"
-msgstr ""
+msgstr "Profila nosaukums, kā ziņo libburn"
 
 #: ../xfburn/xfburn-device.c:269 ../xfburn/xfburn-device.c:270
-#, fuzzy
 msgid "Is the disc erasable"
-msgstr "Ievietotais disks, jau ir tukšs"
+msgstr "Vai disks ir dzēšams"
 
 #: ../xfburn/xfburn-device.c:272 ../xfburn/xfburn-device.c:273
 msgid "Can burn CDR"
-msgstr ""
+msgstr "Var dedzināt CDR"
 
 #: ../xfburn/xfburn-device.c:275 ../xfburn/xfburn-device.c:276
 msgid "Can burn CDRW"
-msgstr ""
+msgstr "Var dedzināt CDRW"
 
 #: ../xfburn/xfburn-device.c:278 ../xfburn/xfburn-device.c:279
 msgid "Can burn DVDR"
-msgstr ""
+msgstr "Var dedzināt DVDR"
 
 #: ../xfburn/xfburn-device.c:281 ../xfburn/xfburn-device.c:282
 msgid "Can burn DVDPLUSR"
-msgstr ""
+msgstr "Var dedzināt DVDPLUSR"
 
 #: ../xfburn/xfburn-device.c:284 ../xfburn/xfburn-device.c:285
 msgid "Can burn DVDRAM"
-msgstr ""
+msgstr "Var dedzināt DVDRAM"
 
 #: ../xfburn/xfburn-device.c:287 ../xfburn/xfburn-device.c:288
 msgid "libburn TAO block types"
-msgstr ""
+msgstr "libburn TAO bloka tipi"
 
 #: ../xfburn/xfburn-device.c:290 ../xfburn/xfburn-device.c:291
 msgid "libburn SAO block types"
-msgstr ""
+msgstr "libburn SAO bloka tipi"
 
 #: ../xfburn/xfburn-device.c:293 ../xfburn/xfburn-device.c:294
 msgid "libburn RAW block types"
-msgstr ""
+msgstr "libburn RAW bloka tipi"
 
 #: ../xfburn/xfburn-device.c:296 ../xfburn/xfburn-device.c:297
 msgid "libburn PACKET block types"
-msgstr ""
+msgstr "libburn PACKET bloka tips"
 
 #: ../desktop-integration/thunar-sendto-xfburn.desktop.in.h:1
-#, fuzzy
 msgid "Data Composition"
-msgstr "Datu Kompozīcija"
+msgstr "Datu kompozīcija"
 
 #: ../xfburn.desktop.in.h:1
-#, fuzzy
 msgid "Burn Image (xfburn)"
-msgstr "Dedzināt CD Attēlu"
+msgstr "Dedzināt attēlu (xfburn)"
 
 #: ../xfburn.desktop.in.h:2
 msgid "CD and DVD burning application"
diff --git a/po/ru.po b/po/ru.po
index f0dbbbc..03191a9 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfburn 0.0.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-22 20:32-0600\n"
-"PO-Revision-Date: 2006-09-24 20:10+0600\n"
-"Last-Translator: Sergey Fedoseev <fedoseev.sergey at gmail.com>\n"
+"POT-Creation-Date: 2009-07-22 20:17-0600\n"
+"PO-Revision-Date: 2009-10-18 14:12+0300\n"
+"Last-Translator: Vlad Vasilev <lortwer at gmail.com>\n"
 "Language-Team: Russian <ru at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,43 +22,39 @@ msgstr "Добавление файлов к проекту"
 
 #: ../xfburn/xfburn-blank-dialog.c:72
 msgid "Quick Blank"
-msgstr ""
+msgstr "Быстрая очистка"
 
 #: ../xfburn/xfburn-blank-dialog.c:73
 msgid "Full Blank (slow)"
-msgstr ""
+msgstr "Полная очистка (медленно)"
 
 #: ../xfburn/xfburn-blank-dialog.c:74
-#, fuzzy
 msgid "Quick Format"
-msgstr "_Форматировать"
+msgstr "Быстрое форматирование"
 
 #: ../xfburn/xfburn-blank-dialog.c:75
-#, fuzzy
 msgid "Full Format"
-msgstr "_Форматировать"
+msgstr "Полное форматирование"
 
 #: ../xfburn/xfburn-blank-dialog.c:76
 msgid "Quick Deformat"
-msgstr ""
+msgstr "Быстрое деформатирование"
 
 #: ../xfburn/xfburn-blank-dialog.c:77
 msgid "Full Deformat (slow)"
-msgstr ""
+msgstr "Полное деформатирование (медленно)"
 
 #: ../xfburn/xfburn-blank-dialog.c:150
-#, fuzzy
 msgid "Eject the disc"
-msgstr "_Извлечь диск"
+msgstr "Извлечь диск"
 
 #: ../xfburn/xfburn-blank-dialog.c:151
 msgid "Default value for eject checkbox"
-msgstr ""
+msgstr "Значение по умолчанию для опции извлечения"
 
 #: ../xfburn/xfburn-blank-dialog.c:198
-#, fuzzy
 msgid "Blank Disc"
-msgstr "Тип очистки"
+msgstr "Очистка диска"
 
 #: ../xfburn/xfburn-blank-dialog.c:210
 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:191
@@ -69,8 +65,8 @@ msgstr "Тип очистки"
 msgid "Burning device"
 msgstr "Записывающее устройство"
 
-#: ../xfburn/xfburn-blank-dialog.c:223 ../xfburn/xfburn-device-box.c:188
-#, fuzzy
+#: ../xfburn/xfburn-blank-dialog.c:223
+#: ../xfburn/xfburn-device-box.c:188
 msgid "Blank mode"
 msgstr "Тип очистки"
 
@@ -99,23 +95,22 @@ msgstr "_Очистить"
 #. blanking can only be performed on blank discs, format and deformat are allowed to be blank ones
 #: ../xfburn/xfburn-blank-dialog.c:356
 msgid "The inserted disc is already blank."
-msgstr ""
+msgstr "Вставленный диск уже очищен"
 
 #. these ones we can blank
 #: ../xfburn/xfburn-blank-dialog.c:362
 msgid "Ready"
-msgstr ""
+msgstr "Готово"
 
 #: ../xfburn/xfburn-blank-dialog.c:365
 msgid "No disc detected in the drive."
-msgstr ""
+msgstr "В приводе не обнаружено диска"
 
 #: ../xfburn/xfburn-blank-dialog.c:374
 msgid "Disc is not erasable."
-msgstr ""
+msgstr "Диск не может быть очищен"
 
 #: ../xfburn/xfburn-blank-dialog.c:414
-#, fuzzy
 msgid "Blanking disc..."
 msgstr "Очистка..."
 
@@ -124,11 +119,11 @@ msgstr "Очистка..."
 #: ../xfburn/xfburn-perform-burn.c:304
 #, c-format
 msgid "Done"
-msgstr ""
+msgstr "Завершено"
 
-#: ../xfburn/xfburn-blank-dialog.c:444 ../xfburn/xfburn-perform-burn.c:310
+#: ../xfburn/xfburn-blank-dialog.c:444
+#: ../xfburn/xfburn-perform-burn.c:310
 #: ../xfburn/xfburn-progress-dialog.c:604
-#, fuzzy
 msgid "Failure"
 msgstr "Завершена неудачно"
 
@@ -138,7 +133,7 @@ msgstr "Завершена неудачно"
 #: ../xfburn/xfburn-burn-image-dialog.c:532
 #: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:414
 msgid "Unable to grab the drive."
-msgstr ""
+msgstr "Невозможно захватить привод"
 
 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:179
 #: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:149
@@ -146,13 +141,12 @@ msgid "Burn Composition"
 msgstr "Запись проекта"
 
 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:202
-#, fuzzy
 msgid "Composition name"
-msgstr "Запись проекта"
+msgstr "Имя проекта"
 
 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:207
 msgid "<small>Would you like to change the default composition name?</small>"
-msgstr ""
+msgstr "Хотите изменить название проекта?"
 
 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:232
 #: ../xfburn/xfburn-burn-image-dialog.c:188
@@ -183,7 +177,7 @@ msgstr "_Записать проект"
 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:460
 #, c-format
 msgid "Could not create destination ISO file: %s"
-msgstr ""
+msgstr "Невозможно создать целевой ISO файл: %s"
 
 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:467
 msgid "Writing ISO..."
@@ -192,27 +186,26 @@ msgstr "Запись ISO..."
 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:484
 #, c-format
 msgid "An error occured while writing ISO: %s"
-msgstr ""
+msgstr "Возникла ошибка при записи ISO: %s"
 
 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:538
 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:544
 msgid "An error occurred in the burn backend."
-msgstr ""
+msgstr "Возникла ошибка в фоновой программе прожига"
 
 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:571
 #: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:343
 msgid "The write mode is not supported currently."
-msgstr ""
+msgstr "Режим записи в данный момент не поддерживается"
 
 #. could not create source
 #: ../xfburn/xfburn-burn-data-composition-base-dialog.c:659
 msgid "Could not create ISO source structure."
-msgstr ""
+msgstr "Невозможно создать исходную ISO структуру"
 
 #: ../xfburn/xfburn-burn-image-dialog.c:136
-#, fuzzy
 msgid "Burn image"
-msgstr "_Записать образ"
+msgstr "Записать образ"
 
 #. file
 #: ../xfburn/xfburn-burn-image-dialog.c:143
@@ -222,11 +215,11 @@ msgstr "Образ для записи"
 
 #: ../xfburn/xfburn-burn-image-dialog.c:147
 msgid "All files"
-msgstr ""
+msgstr "Все файлы"
 
 #: ../xfburn/xfburn-burn-image-dialog.c:151
 msgid "ISO images"
-msgstr ""
+msgstr "ISO образы"
 
 #: ../xfburn/xfburn-burn-image-dialog.c:202
 msgid "_Burn image"
@@ -239,70 +232,63 @@ msgstr ""
 
 #: ../xfburn/xfburn-burn-image-dialog.c:309
 msgid "Unable to determine image size."
-msgstr ""
+msgstr "Невозможно определить размер образа"
 
 #: ../xfburn/xfburn-burn-image-dialog.c:316
 msgid "Cannot open image."
-msgstr ""
+msgstr "Невозможно открыть образ"
 
 #: ../xfburn/xfburn-burn-image-dialog.c:341
 msgid "Burn mode is not currently implemented."
-msgstr ""
+msgstr "Режим прожига в данный момент не поддерживается"
 
 #: ../xfburn/xfburn-burn-image-dialog.c:351
-#, fuzzy
 msgid "Burning image..."
-msgstr "_Записать образ"
+msgstr "Запись образа..."
 
 #: ../xfburn/xfburn-burn-image-dialog.c:422
-msgid ""
-"<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Please "
-"select an image to burn</span>"
-msgstr ""
+msgid "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Please select an image to burn</span>"
+msgstr "<span weight=\"bold\" foreground=\"darkred\" stretch=\"semiexpanded\">Пожалуйста, выберите образ для записи</span>"
 
 #: ../xfburn/xfburn-burn-image-dialog.c:460
-msgid ""
-"Cannot append data to multisession disc in this write mode (use TAO instead)"
-msgstr ""
+msgid "Cannot append data to multisession disc in this write mode (use TAO instead)"
+msgstr "Невозможно добавить данные к мультисессионному диску в этом режиме записи (используйте TAO)"
 
 #: ../xfburn/xfburn-burn-image-dialog.c:464
 msgid "Closed disc with data detected. Need blank or appendable disc"
-msgstr ""
+msgstr "Обнаружен закрытый диск с данными. Требуется очистка или новый диск"
 
 #: ../xfburn/xfburn-burn-image-dialog.c:466
 msgid "No disc detected in drive"
-msgstr ""
+msgstr "В приводе не обнаружено диска"
 
 #: ../xfburn/xfburn-burn-image-dialog.c:468
 msgid "Cannot recognize state of drive and disc"
-msgstr ""
+msgstr "Невозможно определить состояние привода и диска"
 
 #: ../xfburn/xfburn-burn-image-dialog.c:480
 msgid "The selected image does not fit on the inserted disc"
-msgstr ""
+msgstr "Размер образа превышает размер диска"
 
 #: ../xfburn/xfburn-burn-image-dialog.c:484
 msgid "Failed to get image size"
-msgstr ""
+msgstr "Невозможно определить размер образа"
 
 #: ../xfburn/xfburn-burn-image-dialog.c:512
-msgid ""
-"Make sure you selected a valid file and you have the proper permissions to "
-"access it."
-msgstr ""
+msgid "Make sure you selected a valid file and you have the proper permissions to access it."
+msgstr "Удостоверьтесь, что выбран правильный файл, и у вас достаточно прав для доступа к нему"
 
 #: ../xfburn/xfburn-burn-image-dialog.c:542
 msgid "The write mode is not currently supported"
 msgstr ""
 
 #: ../xfburn/xfburn-compositions-notebook.c:175
-#, fuzzy
 msgid "Audio composition"
-msgstr "Записать проект"
+msgstr "Проект аудиодиска"
 
 #: ../xfburn/xfburn-compositions-notebook.c:236
 msgid "Welcome"
-msgstr ""
+msgstr "Добро пожаловать"
 
 #: ../xfburn/xfburn-copy-cd-dialog.c:114
 #: ../xfburn/xfburn-copy-cd-progress-dialog.c:157
@@ -327,7 +313,6 @@ msgid "Flushing cache..."
 msgstr "Заполнение кэша..."
 
 #: ../xfburn/xfburn-copy-cd-progress-dialog.c:106
-#, fuzzy
 msgid "Please insert a recordable disc."
 msgstr "Вставьте записываемый носитель."
 
@@ -341,19 +326,16 @@ msgid "Reading CD..."
 msgstr "Чтение CD..."
 
 #: ../xfburn/xfburn-copy-dvd-dialog.c:114
-#, fuzzy
 msgid "Copy data DVD"
-msgstr "Копирование CD с данными"
+msgstr "Копирование DVD с данными"
 
 #: ../xfburn/xfburn-copy-dvd-dialog.c:124
-#, fuzzy
 msgid "DVD Reader device"
-msgstr "Устройство чтение компакт-дисков"
+msgstr "Устройство чтение DVD"
 
 #: ../xfburn/xfburn-copy-dvd-dialog.c:194
-#, fuzzy
 msgid "_Copy DVD"
-msgstr "Копировать DVD"
+msgstr "_Копировать DVD"
 
 #: ../xfburn/xfburn-create-iso-progress-dialog.c:118
 msgid "Create ISO from CD"
@@ -430,14 +412,12 @@ msgid "Local Path"
 msgstr "Локальный путь"
 
 #: ../xfburn/xfburn-data-composition.c:690
-#, fuzzy
 msgid "You must give a name to the file."
 msgstr "Вы должны дать имя файлу"
 
 #: ../xfburn/xfburn-data-composition.c:699
 #: ../xfburn/xfburn-data-composition.c:1097
 #: ../xfburn/xfburn-audio-composition.c:1146
-#, fuzzy
 msgid "A file with the same name is already present in the composition."
 msgstr "В проекте уже есть файл с таким именем"
 
@@ -449,33 +429,29 @@ msgstr "Новый каталог"
 
 #: ../xfburn/xfburn-data-composition.c:1176
 #, c-format
-msgid ""
-"%s cannot be added to the composition, because it exceeds the maximum "
-"allowed file size for iso9660."
-msgstr ""
+msgid "%s cannot be added to the composition, because it exceeds the maximum allowed file size for iso9660."
+msgstr "%s невозможно добавить в проект, т.к. размер превышает максимум допустимый для iso9660."
 
 #: ../xfburn/xfburn-data-composition.c:1266
 #: ../xfburn/xfburn-audio-composition.c:1319
-#, fuzzy
 msgid "Adding home directory"
-msgstr "Новый каталог"
+msgstr "Добавление домашней папки"
 
 #: ../xfburn/xfburn-data-composition.c:1267
 #: ../xfburn/xfburn-audio-composition.c:1320
 msgid ""
-"You are about to add your home directory to the composition. This is likely "
-"to take a very long time, and also to be too big to fit on one disc.\n"
+"You are about to add your home directory to the composition. This is likely to take a very long time, and also to be too big to fit on one disc.\n"
 "\n"
 "Are you sure you want to proceed?"
 msgstr ""
+"Вы собираетесь добавить в проект домашнюю папку. Это может занять много времени, а размер папки превысить размеры диска. \n"
+"\n"
+"Вы уверены, что хотите продолжить?"
 
 #: ../xfburn/xfburn-data-composition.c:1429
 #, fuzzy, c-format
-msgid ""
-"A file named \"%s\" already exists in this directory, the file hasn't been "
-"added."
-msgstr ""
-"В этом каталоге уже существует файл с именем \"%s\", файл не был добавлен"
+msgid "A file named \"%s\" already exists in this directory, the file hasn't been added."
+msgstr "В этом каталоге уже существует файл с именем \"%s\", файл не был добавлен"
 
 #. The first string is the renamed name, the second one the original name
 #: ../xfburn/xfburn-data-composition.c:1847
@@ -483,7 +459,8 @@ msgstr ""
 msgid "Duplicate filename '%s' for '%s'"
 msgstr ""
 
-#: ../xfburn/xfburn-device-box.c:173 ../xfburn/xfburn-device-box.c:174
+#: ../xfburn/xfburn-device-box.c:173
+#: ../xfburn/xfburn-device-box.c:174
 msgid "Show writers only"
 msgstr "Показывать только записывающие устройства"
 
@@ -505,19 +482,21 @@ msgstr ""
 
 #: ../xfburn/xfburn-device-box.c:184
 msgid "Is it a valid combination"
-msgstr ""
+msgstr "Это подходящая комбинация"
 
 #: ../xfburn/xfburn-device-box.c:185
 msgid "Is the combination of hardware and disc valid to burn the composition?"
 msgstr ""
 
 #: ../xfburn/xfburn-device-box.c:189
+#, fuzzy
 msgid "The blank mode shows different disc status messages than regular mode"
-msgstr ""
+msgstr "Режим очистки показывает сообщения о состоянии диска, отличные от нормального режима"
 
-#: ../xfburn/xfburn-device-box.c:192 ../xfburn/xfburn-device-box.c:193
+#: ../xfburn/xfburn-device-box.c:192
+#: ../xfburn/xfburn-device-box.c:193
 msgid "Accept only CDs as valid discs"
-msgstr ""
+msgstr "Принимать только CD диски, как подходящие"
 
 #: ../xfburn/xfburn-device-box.c:246
 #, fuzzy
@@ -525,48 +504,51 @@ msgid "_Speed:"
 msgstr "_Скорость :"
 
 #: ../xfburn/xfburn-device-box.c:265
-#, fuzzy
 msgid "Write _mode:"
-msgstr "_Режим записи :"
+msgstr "_Режим записи:"
 
 #: ../xfburn/xfburn-device-box.c:388
 msgid "Empty speed list"
-msgstr ""
+msgstr "Пустой список скоростей"
 
 #: ../xfburn/xfburn-device-box.c:396
 msgid ""
 "<b>Unable to retrieve the speed list for the drive.</b>\n"
 "\n"
-"This is a known bug, which occurs with some drives. Please report it to "
-"<i>xfburn at xfce.org</i> together with the console output to increase the "
-"chances that it will get fixed.\n"
+"This is a known bug, which occurs with some drives. Please report it to <i>xfburn at xfce.org</i> together with the console output to increase the chances that it will get fixed.\n"
 "\n"
-"Burning should still work, but if there are problems anyways, please let us "
-"know.\n"
+"Burning should still work, but if there are problems anyways, please let us know.\n"
 "\n"
 "<i>Thank you!</i>"
 msgstr ""
+"<b>Невозможно получить список скоростей для привода.</b>\n"
+"\n"
+"Это известная ошибка, возникающая с некоторыми приводами. Пожалуйста, сообщите об этом на <i>xfburn at xfce.org</i> Приложите вывод консоли, это поможет исправить ошибку.\n"
+"\n"
+"Запись должна работать, но если возникнут ошибки, пожалуйста, сообщите нам\n"
+"\n"
+"<i>Спасибо!</i>"
 
 #: ../xfburn/xfburn-device-box.c:405
 msgid "Continue to _show this notice"
-msgstr ""
+msgstr "Продолжать _показывать это уведомление"
 
 #: ../xfburn/xfburn-device-box.c:447
-#, fuzzy
 msgid "default"
-msgstr "По умолчанию"
+msgstr "по умолчанию"
 
 #: ../xfburn/xfburn-device-box.c:483
 msgid "Max"
-msgstr ""
+msgstr "Максимум"
 
 #: ../xfburn/xfburn-device-box.c:582
 msgid "Drive can't burn on the inserted disc"
-msgstr ""
+msgstr "Привод не может записать вставленный диск"
 
-#: ../xfburn/xfburn-device-box.c:591 ../xfburn/xfburn-device-box.c:637
+#: ../xfburn/xfburn-device-box.c:591
+#: ../xfburn/xfburn-device-box.c:637
 msgid "Drive is empty"
-msgstr ""
+msgstr "Привод пуст"
 
 #: ../xfburn/xfburn-device-box.c:594
 msgid "Sorry, multisession is not yet supported"
@@ -574,53 +556,57 @@ msgstr ""
 
 #: ../xfburn/xfburn-device-box.c:597
 msgid "Inserted disc is full"
-msgstr ""
+msgstr "Вставленный диск заполнен"
 
-#: ../xfburn/xfburn-device-box.c:600 ../xfburn/xfburn-device-box.c:643
+#: ../xfburn/xfburn-device-box.c:600
+#: ../xfburn/xfburn-device-box.c:643
 msgid "Inserted disc is unsuitable"
-msgstr ""
+msgstr "Вставленный диск непригоден"
 
-#: ../xfburn/xfburn-device-box.c:603 ../xfburn/xfburn-device-box.c:646
+#: ../xfburn/xfburn-device-box.c:603
+#: ../xfburn/xfburn-device-box.c:646
 msgid "Cannot access drive (it might be in use)"
-msgstr ""
+msgstr "Невозможно получить доступ к приводу (возможно он используется)"
 
-#: ../xfburn/xfburn-device-box.c:608 ../xfburn/xfburn-device-box.c:649
+#: ../xfburn/xfburn-device-box.c:608
+#: ../xfburn/xfburn-device-box.c:649
 msgid "Error determining disc"
-msgstr ""
+msgstr "Ошибка при определении диска"
 
 #: ../xfburn/xfburn-device-box.c:629
 msgid "Write-once disc, no blanking possible"
-msgstr ""
+msgstr "Диск для одноразовой записи, невозможно очистить"
 
 #: ../xfburn/xfburn-device-box.c:632
 msgid "DVD+RW does not need blanking"
-msgstr ""
+msgstr "DVD+RW не требует очистки"
 
 #: ../xfburn/xfburn-device-box.c:640
 msgid "Inserted disc is already blank"
-msgstr ""
+msgstr "Вставо"
 
-#: ../xfburn/xfburn-device-list.c:206 ../xfburn/xfburn-device-list.c:207
+#: ../xfburn/xfburn-device-list.c:206
+#: ../xfburn/xfburn-device-list.c:207
 msgid "Number of burners in the system"
-msgstr ""
+msgstr "Количество устройст прожига  в системе"
 
 #: ../xfburn/xfburn-device-list.c:209
 msgid "Number of drives in the system"
-msgstr ""
+msgstr "Количество приводов в системе"
 
 #: ../xfburn/xfburn-device-list.c:210
 msgid "Number of drives in the system (readers and writers)"
-msgstr ""
+msgstr "Количество приводов в системе (чтение и запись)"
 
-#: ../xfburn/xfburn-device-list.c:212 ../xfburn/xfburn-device-list.c:213
-#, fuzzy
+#: ../xfburn/xfburn-device-list.c:212
+#: ../xfburn/xfburn-device-list.c:213
 msgid "List of devices"
-msgstr "_Найти устройства"
+msgstr "_Список устройств"
 
-#: ../xfburn/xfburn-device-list.c:215 ../xfburn/xfburn-device-list.c:216
-#, fuzzy
+#: ../xfburn/xfburn-device-list.c:215
+#: ../xfburn/xfburn-device-list.c:216
 msgid "Currently selected device"
-msgstr "Обнаруженные устройства"
+msgstr "Выбранное устройство"
 
 #. globals
 #: ../xfburn/xfburn-directory-browser.c:58
@@ -636,7 +622,8 @@ msgstr "Файл"
 msgid "Type"
 msgstr "Тип"
 
-#: ../xfburn/xfburn-fs-browser.c:96 ../xfburn/xfburn-fs-browser.c:285
+#: ../xfburn/xfburn-fs-browser.c:96
+#: ../xfburn/xfburn-fs-browser.c:285
 msgid "Filesystem"
 msgstr "Файловая система"
 
@@ -646,7 +633,8 @@ msgstr "Файловая система"
 msgid "%s's home"
 msgstr "Домашняя папка %s"
 
-#: ../xfburn/xfburn-main.c:204 ../xfburn.desktop.in.h:3
+#: ../xfburn/xfburn-main.c:204
+#: ../xfburn.desktop.in.h:3
 msgid "Xfburn"
 msgstr "Xfburn"
 
@@ -656,14 +644,16 @@ msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
+"%s: %s\n"
+"Попробуйте %s --help для получения списка доступных параметров.\n"
 
 #: ../xfburn/xfburn-main.c:222
 msgid "Unable to initialize the burning backend."
-msgstr ""
+msgstr "Невозможно запустить процесс записи"
 
 #: ../xfburn/xfburn-main.c:307
 msgid "No burners are currently available"
-msgstr ""
+msgstr "Нет доступных устройств записи"
 
 #: ../xfburn/xfburn-main.c:309
 msgid ""
@@ -671,9 +661,13 @@ msgid ""
 "\n"
 "Please unmount and restart the application.\n"
 "\n"
-"If no disc is in the drive, check that you have read and write access to the "
-"drive with the current user."
+"If no disc is in the drive, check that you have read and write access to the drive with the current user."
 msgstr ""
+"Возможно диск используется и недоступен. \n"
+"\n"
+"Пожалуйста размонтируйте диск и перезапустите приложение. \n"
+"\n"
+"Если в приводе нет диска, проверьте есть ли у вас права доступа на чтение и запись к приводу."
 
 #: ../xfburn/xfburn-main.c:343
 #, c-format
@@ -695,14 +689,12 @@ msgstr "_Файл"
 #. {"new-composition", GTK_STOCK_NEW, N_("_New composition"), NULL, N_("Create a new composition"),
 #. G_CALLBACK (action_new_data_composition),},
 #: ../xfburn/xfburn-main-window.c:104
-#, fuzzy
 msgid "New data composition"
-msgstr "Проект с данными"
+msgstr "Новый диск с данными"
 
 #: ../xfburn/xfburn-main-window.c:106
-#, fuzzy
 msgid "New audio composition"
-msgstr "_Создать проект"
+msgstr "Новый аудиодиск"
 
 #. {"load-composition", GTK_STOCK_OPEN, N_("Load composition"), NULL, N_("Load composition"),
 #. G_CALLBACK (action_load),},
@@ -772,9 +764,8 @@ msgstr "Копировать CD с данными"
 
 #. {"copy-audio", "xfburn-audio-copy", N_("Copy Audio CD"), NULL, N_("Copy Audio CD"),},
 #: ../xfburn/xfburn-main-window.c:132
-#, fuzzy
 msgid "Burn Image"
-msgstr "Записать образ CD"
+msgstr "Записать образ"
 
 #. {"copy-dvd", "xfburn-data-copy", N_("Copy DVD"), NULL, N_("Copy DVD"),
 #. G_CALLBACK (action_copy_dvd),},
@@ -806,7 +797,8 @@ msgstr "Редактор панели инструментов"
 msgid "Another cd burning GUI"
 msgstr "Ещё один инструмент для записи CD"
 
-#: ../xfburn/xfburn-main-window.c:536 ../xfburn/xfburn-main-window.c:537
+#: ../xfburn/xfburn-main-window.c:536
+#: ../xfburn/xfburn-main-window.c:537
 msgid "Author/Maintainer"
 msgstr "Автор/сопровождающий"
 
@@ -830,40 +822,39 @@ msgstr "Текст метки"
 
 #: ../xfburn/xfburn-notebook-tab.c:112
 msgid "Show close button"
-msgstr ""
+msgstr "Показывать кнопку закрытия"
 
 #: ../xfburn/xfburn-notebook-tab.c:112
 msgid "Determine whether the close button is visible"
 msgstr ""
 
 #: ../xfburn/xfburn-perform-burn.c:96
-msgid ""
-"Cannot append data to multisession disc in this write mode (use TAO instead)."
+msgid "Cannot append data to multisession disc in this write mode (use TAO instead)."
 msgstr ""
 
 #: ../xfburn/xfburn-perform-burn.c:100
 msgid "Closed disc with data detected, a blank or appendable disc is needed."
-msgstr ""
+msgstr "Обнаружен закрытый диск с данными. Требуется очистка или новый диск"
 
 #: ../xfburn/xfburn-perform-burn.c:102
 msgid "No disc detected in drive."
-msgstr ""
+msgstr "В приводе не обнаружено диска"
 
 #: ../xfburn/xfburn-perform-burn.c:105
 msgid "Cannot recognize the state of the drive and disc."
-msgstr ""
+msgstr "Невозможно определить состояние диска и привода"
 
 #: ../xfburn/xfburn-perform-burn.c:118
 msgid "There is not enough space available on the inserted disc."
-msgstr ""
+msgstr "На вставленном диске недостаточно свободного места "
 
 #: ../xfburn/xfburn-perform-burn.c:163
-#, fuzzy, c-format
+#, c-format
 msgid "Burning track %2d/%d..."
-msgstr "_Записать образ"
+msgstr "Запись дорожки %2d/%d..."
 
-#: ../xfburn/xfburn-perform-burn.c:167 ../xfburn/xfburn-perform-burn.c:232
-#, fuzzy
+#: ../xfburn/xfburn-perform-burn.c:167
+#: ../xfburn/xfburn-perform-burn.c:232
 msgid "Burning composition..."
 msgstr "Запись проекта..."
 
@@ -873,15 +864,15 @@ msgstr ""
 
 #: ../xfburn/xfburn-perform-burn.c:209
 msgid "ending"
-msgstr ""
+msgstr "завершение"
 
 #: ../xfburn/xfburn-perform-burn.c:212
 msgid "failing"
-msgstr ""
+msgstr "неудача"
 
 #: ../xfburn/xfburn-perform-burn.c:215
 msgid "unused"
-msgstr ""
+msgstr "неиспользовано"
 
 #: ../xfburn/xfburn-perform-burn.c:218
 msgid "abandoned"
@@ -889,13 +880,14 @@ msgstr ""
 
 #: ../xfburn/xfburn-perform-burn.c:221
 msgid "ended"
-msgstr ""
+msgstr "завершено"
 
 #: ../xfburn/xfburn-perform-burn.c:224
 msgid "aborted"
-msgstr ""
+msgstr "отменено"
 
-#: ../xfburn/xfburn-perform-burn.c:227 ../xfburn/xfburn-progress-dialog.c:200
+#: ../xfburn/xfburn-perform-burn.c:227
+#: ../xfburn/xfburn-progress-dialog.c:200
 #: ../xfburn/xfburn-progress-dialog.c:217
 #: ../xfburn/xfburn-progress-dialog.c:227
 #: ../xfburn/xfburn-progress-dialog.c:310
@@ -906,14 +898,12 @@ msgid "no info"
 msgstr "нет данных"
 
 #: ../xfburn/xfburn-perform-burn.c:237
-#, fuzzy
 msgid "Writing Lead-In..."
-msgstr "Запись ISO..."
+msgstr "Запись Lead-In..."
 
 #: ../xfburn/xfburn-perform-burn.c:243
-#, fuzzy
 msgid "Writing Lead-Out..."
-msgstr "Запись ISO..."
+msgstr "Запись Lead-Out..."
 
 #: ../xfburn/xfburn-perform-burn.c:249
 #, fuzzy
@@ -931,17 +921,16 @@ msgid "Closing session..."
 msgstr "Импортировать существующую сессию"
 
 #: ../xfburn/xfburn-perform-burn.c:267
-#, fuzzy
 msgid "Formatting..."
-msgstr "Фиксация..."
+msgstr "Форматирование"
 
 #: ../xfburn/xfburn-perform-burn.c:280
 msgid "see console"
-msgstr ""
+msgstr "проверьте вывод консоли"
 
 #: ../xfburn/xfburn-perform-burn.c:308
 msgid "User Aborted"
-msgstr ""
+msgstr "Отменено пользователем"
 
 #: ../xfburn/xfburn-preferences-dialog.c:142
 msgid "Preferences"
@@ -1016,16 +1005,15 @@ msgstr "_Найти устройства"
 #. below the device list
 #: ../xfburn/xfburn-preferences-dialog.c:322
 msgid "Show warning on _empty speed list"
-msgstr ""
+msgstr "Показывать предупреждение при _пустом списке скоростей"
 
 #: ../xfburn/xfburn-preferences-dialog.c:330
-#, fuzzy
 msgid "FIFO buffer size (in kb)"
-msgstr "Буфер FIFO:"
+msgstr "Размер буфера FIFO (в кБ):"
 
 #: ../xfburn/xfburn-preferences-dialog.c:464
 msgid "Changing this setting only takes full effect after a program restart."
-msgstr ""
+msgstr "Изменения вступят в силу, при повторной загрузке программы"
 
 #: ../xfburn/xfburn-progress-dialog.c:182
 msgid "Initializing..."
@@ -1075,54 +1063,49 @@ msgid "Select command"
 msgstr "Выберите команду"
 
 #: ../xfburn/xfburn-welcome-tab.c:130
-#, fuzzy
 msgid "Welcome to xfburn!"
-msgstr "Образ для записи"
+msgstr "Добро пожаловать в Xfburn!"
 
 #. buttons
 #: ../xfburn/xfburn-welcome-tab.c:141
-#, fuzzy
 msgid "<big>Burn _Image</big>"
-msgstr "Записать образ CD"
+msgstr "<big>Записать _образ CD</big>"
 
 #: ../xfburn/xfburn-welcome-tab.c:141
 msgid "Burn a prepared compilation, i.e. an .ISO file"
-msgstr ""
+msgstr "Записать подготовленный образ диска"
 
 #: ../xfburn/xfburn-welcome-tab.c:146
-#, fuzzy
 msgid "<big>New _Data Composition</big>"
-msgstr "Проект с данными"
+msgstr "<big>Диск с да_нными</big>"
 
 #: ../xfburn/xfburn-welcome-tab.c:146
 msgid "Create a new data disc with the files of your choosing"
-msgstr ""
+msgstr "Создать диск содержащий различные данные по вашему выбору"
 
 #: ../xfburn/xfburn-welcome-tab.c:151
 msgid "<big>_Blank Disc</big>"
-msgstr ""
+msgstr "<big>_Очистка диска</big>"
 
 #: ../xfburn/xfburn-welcome-tab.c:151
 msgid "Prepare the rewriteable disc for a new burn"
-msgstr ""
+msgstr "Подготовить перезаписываемый диск для записи"
 
 #: ../xfburn/xfburn-welcome-tab.c:156
-#, fuzzy
 msgid "<big>_Audio CD</big>"
-msgstr "Записать образ CD"
+msgstr "<big>_Аудиодиск</big>"
 
 #: ../xfburn/xfburn-welcome-tab.c:156
 msgid "Audio CD playable in regular stereos"
-msgstr ""
+msgstr "Звуковой CD для обычных стереопроигрывателей"
 
 #: ../xfburn/xfburn-audio-composition.c:213
 msgid "What files can get burned to an audio CD?"
 msgstr ""
 
 #: ../xfburn/xfburn-audio-composition.c:217
-#, fuzzy
 msgid "Rename Artist"
-msgstr "Переименовать"
+msgstr "Изменить исполнителя"
 
 #: ../xfburn/xfburn-audio-composition.c:217
 #, fuzzy
@@ -1130,44 +1113,40 @@ msgid "Rename the artist of the selected file"
 msgstr "Переименовать выбранный файл"
 
 #: ../xfburn/xfburn-audio-composition.c:219
-#, fuzzy
 msgid "Rename Title"
-msgstr "Переименовать"
+msgstr "Изменить название"
 
 #: ../xfburn/xfburn-audio-composition.c:219
-#, fuzzy
 msgid "Rename the title of the selected file"
-msgstr "Переименовать выбранный файл"
+msgstr "Изменить название выбранного файла"
 
 #: ../xfburn/xfburn-audio-composition.c:403
 msgid "Pos"
-msgstr ""
+msgstr "Позиция"
 
 #: ../xfburn/xfburn-audio-composition.c:405
 msgid "Length"
-msgstr ""
+msgstr "Длительность"
 
 #: ../xfburn/xfburn-audio-composition.c:411
 msgid "Artist"
-msgstr ""
+msgstr "Исполнитель"
 
 #: ../xfburn/xfburn-audio-composition.c:424
-#, fuzzy
 msgid "Title"
-msgstr "Файл"
+msgstr "Назваание"
 
 #: ../xfburn/xfburn-audio-composition.c:435
-#, fuzzy
 msgid "Filename"
-msgstr "Переименовать"
+msgstr "Имя файла"
 
 #: ../xfburn/xfburn-audio-composition.c:582
 msgid "Cannot burn audio onto a DVD."
-msgstr ""
+msgstr "Невозможно записать звук на DVD"
 
 #: ../xfburn/xfburn-audio-composition.c:1230
 msgid "You can only have a maximum of 99 tracks."
-msgstr ""
+msgstr "Максимально доступно 99 дорожек"
 
 #: ../xfburn/xfburn-burn-audio-cd-composition-dialog.c:311
 msgid "A problem with the burn backend occurred."
@@ -1175,10 +1154,9 @@ msgstr ""
 
 #: ../xfburn/xfburn-disc-usage.c:165
 msgid "Proceed to Burn"
-msgstr ""
+msgstr "Перейти к записи"
 
 #: ../xfburn/xfburn-disc-usage.c:205
-#, fuzzy
 msgid "You are trying to burn more onto the disc than it can hold."
 msgstr "Вы пытаетесь записать больше данных, чем может вместить диск!"
 
@@ -1216,12 +1194,12 @@ msgstr ""
 #: ../xfburn/xfburn-transcoder-basic.c:239
 #, c-format
 msgid "Could not open %s."
-msgstr ""
+msgstr "Невозможно открыть %s."
 
 #: ../xfburn/xfburn-transcoder-basic.c:320
 #, c-format
 msgid "Could not open %s: %s"
-msgstr ""
+msgstr "Невозможно открыть %s: %s"
 
 #: ../xfburn/xfburn-transcoder-gst.c:633
 #, c-format
@@ -1277,91 +1255,106 @@ msgstr ""
 msgid "Failed to change songs while transcoding"
 msgstr ""
 
-#: ../xfburn/xfburn-transcoder.c:125 ../xfburn/xfburn-transcoder.c:152
+#: ../xfburn/xfburn-transcoder.c:125
+#: ../xfburn/xfburn-transcoder.c:152
 #: ../xfburn/xfburn-transcoder.c:164
 #, fuzzy, c-format
 msgid "not implemented"
 msgstr "Завершена успешно"
 
-#: ../xfburn/xfburn-device.c:248 ../xfburn/xfburn-device.c:249
+#: ../xfburn/xfburn-device.c:248
+#: ../xfburn/xfburn-device.c:249
 #, fuzzy
 msgid "Display name"
 msgstr "Переименовать"
 
-#: ../xfburn/xfburn-device.c:251 ../xfburn/xfburn-device.c:252
-#, fuzzy
+#: ../xfburn/xfburn-device.c:251
+#: ../xfburn/xfburn-device.c:252
 msgid "Device address"
-msgstr "Устройства"
+msgstr "Адрес устройства"
 
-#: ../xfburn/xfburn-device.c:254 ../xfburn/xfburn-device.c:255
+#: ../xfburn/xfburn-device.c:254
+#: ../xfburn/xfburn-device.c:255
 msgid "Is the device accessible"
-msgstr ""
+msgstr "Устройство доступно"
 
-#: ../xfburn/xfburn-device.c:257 ../xfburn/xfburn-device.c:258
+#: ../xfburn/xfburn-device.c:257
+#: ../xfburn/xfburn-device.c:258
 msgid "Burn speeds supported by the device"
-msgstr ""
+msgstr "Поддерживаемые устройством скрости записи"
 
-#: ../xfburn/xfburn-device.c:260 ../xfburn/xfburn-device.c:261
+#: ../xfburn/xfburn-device.c:260
+#: ../xfburn/xfburn-device.c:261
 msgid "Disc status"
-msgstr ""
+msgstr "Состояние диска"
 
-#: ../xfburn/xfburn-device.c:263 ../xfburn/xfburn-device.c:264
+#: ../xfburn/xfburn-device.c:263
+#: ../xfburn/xfburn-device.c:264
 msgid "Profile no. as reported by libburn"
 msgstr ""
 
-#: ../xfburn/xfburn-device.c:266 ../xfburn/xfburn-device.c:267
+#: ../xfburn/xfburn-device.c:266
+#: ../xfburn/xfburn-device.c:267
 msgid "Profile name as reported by libburn"
 msgstr ""
 
-#: ../xfburn/xfburn-device.c:269 ../xfburn/xfburn-device.c:270
+#: ../xfburn/xfburn-device.c:269
+#: ../xfburn/xfburn-device.c:270
 msgid "Is the disc erasable"
 msgstr ""
 
-#: ../xfburn/xfburn-device.c:272 ../xfburn/xfburn-device.c:273
+#: ../xfburn/xfburn-device.c:272
+#: ../xfburn/xfburn-device.c:273
 msgid "Can burn CDR"
-msgstr ""
+msgstr "может записывать CDR"
 
-#: ../xfburn/xfburn-device.c:275 ../xfburn/xfburn-device.c:276
+#: ../xfburn/xfburn-device.c:275
+#: ../xfburn/xfburn-device.c:276
 msgid "Can burn CDRW"
-msgstr ""
+msgstr "может записывать CDRW"
 
-#: ../xfburn/xfburn-device.c:278 ../xfburn/xfburn-device.c:279
+#: ../xfburn/xfburn-device.c:278
+#: ../xfburn/xfburn-device.c:279
 msgid "Can burn DVDR"
-msgstr ""
+msgstr "может записывать DVDR"
 
-#: ../xfburn/xfburn-device.c:281 ../xfburn/xfburn-device.c:282
+#: ../xfburn/xfburn-device.c:281
+#: ../xfburn/xfburn-device.c:282
 msgid "Can burn DVDPLUSR"
-msgstr ""
+msgstr "может записывать DVDPLUSR"
 
-#: ../xfburn/xfburn-device.c:284 ../xfburn/xfburn-device.c:285
+#: ../xfburn/xfburn-device.c:284
+#: ../xfburn/xfburn-device.c:285
 msgid "Can burn DVDRAM"
-msgstr ""
+msgstr "может записывать DVDRAM"
 
-#: ../xfburn/xfburn-device.c:287 ../xfburn/xfburn-device.c:288
+#: ../xfburn/xfburn-device.c:287
+#: ../xfburn/xfburn-device.c:288
 msgid "libburn TAO block types"
 msgstr ""
 
-#: ../xfburn/xfburn-device.c:290 ../xfburn/xfburn-device.c:291
+#: ../xfburn/xfburn-device.c:290
+#: ../xfburn/xfburn-device.c:291
 msgid "libburn SAO block types"
 msgstr ""
 
-#: ../xfburn/xfburn-device.c:293 ../xfburn/xfburn-device.c:294
+#: ../xfburn/xfburn-device.c:293
+#: ../xfburn/xfburn-device.c:294
 msgid "libburn RAW block types"
 msgstr ""
 
-#: ../xfburn/xfburn-device.c:296 ../xfburn/xfburn-device.c:297
+#: ../xfburn/xfburn-device.c:296
+#: ../xfburn/xfburn-device.c:297
 msgid "libburn PACKET block types"
 msgstr ""
 
 #: ../desktop-integration/thunar-sendto-xfburn.desktop.in.h:1
-#, fuzzy
 msgid "Data Composition"
 msgstr "Проект с данными"
 
 #: ../xfburn.desktop.in.h:1
-#, fuzzy
 msgid "Burn Image (xfburn)"
-msgstr "Записать образ CD"
+msgstr "Записать образ (xfburn)"
 
 #: ../xfburn.desktop.in.h:2
 msgid "CD and DVD burning application"
@@ -1369,25 +1362,18 @@ msgstr "Приложение для записи CD и DVD"
 
 #~ msgid "Data composition"
 #~ msgstr "Проект с данными"
-
 #~ msgid "Format DVD+RW"
 #~ msgstr "Форматировать DVD-RW"
-
 #~ msgid "_Format"
 #~ msgstr "_Форматировать"
-
 #~ msgid "Import"
 #~ msgstr "Импорт"
-
 #~ msgid "Import existing session"
 #~ msgstr "Импортировать существующую сессию"
-
 #~ msgid "Copy Audio CD"
 #~ msgstr "Копировать аудио-CD"
-
 #~ msgid "Create a new composition"
 #~ msgstr "Создать проект"
-
 #~ msgid "Copy DVD"
 #~ msgstr "Копировать DVD"
 
@@ -1406,39 +1392,28 @@ msgstr "Приложение для записи CD и DVD"
 #, fuzzy
 #~ msgid "Deformat Complete"
 #~ msgstr "Полная"
-
 #~ msgid "Fast"
 #~ msgstr "Быстрая"
-
 #~ msgid "Burn CD image"
 #~ msgstr "Запись образа CD"
-
 #~ msgid "Reopen last session"
 #~ msgstr "Открыть последнюю сессию"
-
 #~ msgid "Erase last session"
 #~ msgstr "Стереть последнюю сессию"
-
 #~ msgid "_Force"
 #~ msgstr "_Принудительно"
-
 #~ msgid "Performing OPC..."
 #~ msgstr "Выполняется OPC..."
-
 #~ msgid "Finishing"
 #~ msgstr "Завершение"
-
 #~ msgid "Burn data composition"
 #~ msgstr "Запись проекта с данными"
-
 #~ msgid "Create ISO from composition"
 #~ msgstr "Создание ISO-образа из проекта"
-
 #~ msgid "Id"
 #~ msgstr "Id"
-
 #~ msgid "View _output"
 #~ msgstr "Просмотреть _вывод"
-
 #~ msgid "Operation finished"
 #~ msgstr "Операция завершена"
+
diff --git a/xfburn/Makefile.am b/xfburn/Makefile.am
index a96ba38..e606f56 100644
--- a/xfburn/Makefile.am
+++ b/xfburn/Makefile.am
@@ -126,7 +126,9 @@ xfburn-cclosure-marshal.h: xfburn-cclosure-marshal.list
 	glib-genmarshal --header --prefix=xfburn_cclosure_marshal $< > $@
 
 xfburn-cclosure-marshal.c: xfburn-cclosure-marshal.list
-	glib-genmarshal --body --prefix=xfburn_cclosure_marshal $< > $@
+	glib-genmarshal --body --prefix=xfburn_cclosure_marshal $< \
+		| awk 'BEGIN { print "#include \"$(patsubst %.c,%.h, $@)\"" } { print; }' > $@
+
 
 BUILT_SOURCES = 							\
 	xfburn-cclosure-marshal.h					\
diff --git a/xfburn/xfburn-audio-composition.c b/xfburn/xfburn-audio-composition.c
index 6a9d014..eb9c624 100644
--- a/xfburn/xfburn-audio-composition.c
+++ b/xfburn/xfburn-audio-composition.c
@@ -148,7 +148,7 @@ static void cb_cell_title_edited (GtkCellRenderer * renderer, gchar * path, gcha
 static void cb_content_drag_data_rcv (GtkWidget * widget, GdkDragContext * dc, guint x, guint y, GtkSelectionData * sd,
                                       guint info, guint t, XfburnAudioComposition * composition);
 static void cb_content_drag_data_get (GtkWidget * widget, GdkDragContext * dc, GtkSelectionData * data, guint info,
-                                      guint time, XfburnAudioComposition * content);
+                                      guint timestamp, XfburnAudioComposition * content);
 static void cb_adding_done (XfburnAddingProgress *progress, XfburnAudioComposition *dc);
 
 /* thread entry points */
@@ -162,6 +162,7 @@ static gboolean thread_add_file_to_list_with_name (const gchar *name, XfburnAudi
                                                    GtkTreeIter * insertion, GtkTreeViewDropPosition position);
 static gboolean thread_add_file_to_list (XfburnAudioComposition * dc, GtkTreeModel * model, const gchar * path, 
                                          GtkTreeIter * iter, GtkTreeIter * insertion, GtkTreeViewDropPosition position);
+static gboolean show_add_home_question_dialog (void);
                                   
 typedef struct
 {
@@ -1027,7 +1028,7 @@ action_info (GtkAction * action, XfburnAudioComposition * dc)
 
 static void
 cb_content_drag_data_get (GtkWidget * widget, GdkDragContext * dc,
-                          GtkSelectionData * data, guint info, guint time, XfburnAudioComposition * content)
+                          GtkSelectionData * data, guint info, guint timestamp, XfburnAudioComposition * content)
 {
   if (info == AUDIO_COMPOSITION_DND_TARGET_INSIDE) {
     GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget));
@@ -1309,7 +1310,7 @@ thread_add_files_cli (ThreadAddFilesCLIParams *params)
 }
 
 static gboolean
-show_add_home_question_dialog ()
+show_add_home_question_dialog (void)
 {
   gboolean ok = TRUE;
 
diff --git a/xfburn/xfburn-audio-track-gst.c b/xfburn/xfburn-audio-track-gst.c
index 85117a3..9498ce8 100644
--- a/xfburn/xfburn-audio-track-gst.c
+++ b/xfburn/xfburn-audio-track-gst.c
@@ -29,7 +29,7 @@ void audio_track_gst_free (gpointer boxed);
 
 /* implementations */
 GType
-xfburn_audio_track_gst_get_type ()
+xfburn_audio_track_gst_get_type (void)
 {
   static GType type = 0;
 
diff --git a/xfburn/xfburn-audio-track-gst.h b/xfburn/xfburn-audio-track-gst.h
index aee01da..7de1eb8 100644
--- a/xfburn/xfburn-audio-track-gst.h
+++ b/xfburn/xfburn-audio-track-gst.h
@@ -38,7 +38,7 @@ typedef struct {
   off_t size;
 } XfburnAudioTrackGst;
 
-GType xfburn_audio_track_gst_get_type ();
+GType xfburn_audio_track_gst_get_type (void);
 
 G_END_DECLS
 
diff --git a/xfburn/xfburn-audio-track.c b/xfburn/xfburn-audio-track.c
index 261307d..200be4f 100644
--- a/xfburn/xfburn-audio-track.c
+++ b/xfburn/xfburn-audio-track.c
@@ -29,7 +29,7 @@ void audio_track_free (gpointer boxed);
 
 /* implementations */
 GType
-xfburn_audio_track_get_type ()
+xfburn_audio_track_get_type (void)
 {
   static GType type = 0;
 
diff --git a/xfburn/xfburn-audio-track.h b/xfburn/xfburn-audio-track.h
index 0241535..f475c11 100644
--- a/xfburn/xfburn-audio-track.h
+++ b/xfburn/xfburn-audio-track.h
@@ -51,7 +51,7 @@ typedef struct
   gpointer data; 
 } XfburnAudioTrack;
 
-GType xfburn_audio_track_get_type ();
+GType xfburn_audio_track_get_type (void);
 
 G_END_DECLS
 
diff --git a/xfburn/xfburn-blank-dialog.c b/xfburn/xfburn-blank-dialog.c
index 9776e0c..4fe4eca 100644
--- a/xfburn/xfburn-blank-dialog.c
+++ b/xfburn/xfburn-blank-dialog.c
@@ -110,7 +110,7 @@ static XfceTitledDialogClass *parent_class = NULL;
 
 
 GType
-xfburn_blank_dialog_get_type ()
+xfburn_blank_dialog_get_type (void)
 {
   static GType type = 0;
 
@@ -531,7 +531,7 @@ cb_volume_changed (GtkWidget *device_box, gboolean device_changed, XfburnDevice
 
 /* public */
 GtkWidget *
-xfburn_blank_dialog_new ()
+xfburn_blank_dialog_new (void)
 {
   GtkWidget *obj;
 
diff --git a/xfburn/xfburn-blank-dialog.h b/xfburn/xfburn-blank-dialog.h
index 17014bd..e4cb246 100644
--- a/xfburn/xfburn-blank-dialog.h
+++ b/xfburn/xfburn-blank-dialog.h
@@ -46,8 +46,8 @@ typedef struct
   XfceTitledDialogClass parent_class;
 } XfburnBlankDialogClass;
 
-GType xfburn_blank_dialog_get_type ();
-GtkWidget *xfburn_blank_dialog_new ();
+GType xfburn_blank_dialog_get_type (void);
+GtkWidget *xfburn_blank_dialog_new (void);
 GtkWidget * xfburn_blank_dialog_new_eject (gboolean eject);
 
 G_END_DECLS
diff --git a/xfburn/xfburn-burn-audio-cd-composition-dialog.c b/xfburn/xfburn-burn-audio-cd-composition-dialog.c
index 1b513c0..197b0f8 100644
--- a/xfburn/xfburn-burn-audio-cd-composition-dialog.c
+++ b/xfburn/xfburn-burn-audio-cd-composition-dialog.c
@@ -83,7 +83,7 @@ static void cb_dialog_response (XfburnBurnAudioCdCompositionDialog * dialog, gin
 static XfceTitledDialogClass *parent_class = NULL;
 
 GType
-xfburn_burn_audio_cd_composition_dialog_get_type ()
+xfburn_burn_audio_cd_composition_dialog_get_type (void)
 {
   static GType type = 0;
 
@@ -367,7 +367,7 @@ thread_burn_composition (ThreadBurnCompositionParams * params)
   int i,j;
   GSList *track_list;
   int *track_sectors;
-  gboolean abort = FALSE;
+  gboolean abort_burn = FALSE;
   XfburnTranscoder *trans;
   GError *error = NULL;
 
@@ -390,7 +390,7 @@ thread_burn_composition (ThreadBurnCompositionParams * params)
     if (tracks[i] == NULL) {
       xfburn_progress_dialog_burning_failed (XFBURN_PROGRESS_DIALOG (dialog_progress), error->message);
       g_error_free (error);
-      abort = TRUE;
+      abort_burn = TRUE;
       break;
     }
     srcs[i] = atrack->src;
@@ -400,15 +400,15 @@ thread_burn_composition (ThreadBurnCompositionParams * params)
     track_list = g_slist_next (track_list);
   }
 
-  if (!abort) {
+  if (!abort_burn) {
     if (!xfburn_transcoder_prepare (trans, &error)) {
       xfburn_progress_dialog_burning_failed (XFBURN_PROGRESS_DIALOG (dialog_progress), error->message);
       g_error_free (error);
-      abort = TRUE;
+      abort_burn = TRUE;
     }
   }
 
-  if (!abort) {
+  if (!abort_burn) {
     if (!xfburn_device_grab (params->device, &drive_info)) {
       xfburn_progress_dialog_burning_failed (XFBURN_PROGRESS_DIALOG (dialog_progress), _("Unable to grab the drive."));
     } else {
@@ -441,6 +441,12 @@ cb_dialog_response (XfburnBurnAudioCdCompositionDialog * dialog, gint response_i
   if (response_id == GTK_RESPONSE_OK) {
     GtkWidget *dialog_progress;
 
+    ThreadBurnCompositionParams *params = NULL;
+    XfburnDevice *device;
+    gint speed;
+    XfburnWriteMode write_mode;
+    //struct burn_source * src_fifo = NULL;
+
     /* If the name was the default, update the image volume id and volset id */
     /*
     if (priv->entry != NULL) {
@@ -456,12 +462,6 @@ cb_dialog_response (XfburnBurnAudioCdCompositionDialog * dialog, gint response_i
     
     gtk_widget_show (dialog_progress);
 
-    ThreadBurnCompositionParams *params = NULL;
-    XfburnDevice *device;
-    gint speed;
-    XfburnWriteMode write_mode;
-    //struct burn_source * src_fifo = NULL;
-
     device = xfburn_device_box_get_selected_device (XFBURN_DEVICE_BOX (priv->device_box));
     speed = xfburn_device_box_get_speed (XFBURN_DEVICE_BOX (priv->device_box));
     /* cdrskin burns audio with SAO */
diff --git a/xfburn/xfburn-burn-audio-cd-composition-dialog.h b/xfburn/xfburn-burn-audio-cd-composition-dialog.h
index 141b857..495d095 100644
--- a/xfburn/xfburn-burn-audio-cd-composition-dialog.h
+++ b/xfburn/xfburn-burn-audio-cd-composition-dialog.h
@@ -53,7 +53,7 @@ typedef struct
   XfceTitledDialogClass parent_class;
 } XfburnBurnAudioCdCompositionDialogClass;
 
-GType xfburn_burn_audio_cd_composition_dialog_get_type ();
+GType xfburn_burn_audio_cd_composition_dialog_get_type (void);
 
 GtkWidget *xfburn_burn_audio_cd_composition_dialog_new (GSList *tracklist);
 
diff --git a/xfburn/xfburn-burn-data-cd-composition-dialog.c b/xfburn/xfburn-burn-data-cd-composition-dialog.c
index 116350a..e3c3e02 100644
--- a/xfburn/xfburn-burn-data-cd-composition-dialog.c
+++ b/xfburn/xfburn-burn-data-cd-composition-dialog.c
@@ -55,7 +55,7 @@ static void xfburn_burn_data_cd_composition_dialog_finalize (GObject * object);
 static XfceTitledDialogClass *parent_class = NULL;
 
 GType
-xfburn_burn_data_cd_composition_dialog_get_type ()
+xfburn_burn_data_cd_composition_dialog_get_type (void)
 {
   static GType type = 0;
 
diff --git a/xfburn/xfburn-burn-data-cd-composition-dialog.h b/xfburn/xfburn-burn-data-cd-composition-dialog.h
index 1fdad87..10f1b56 100644
--- a/xfburn/xfburn-burn-data-cd-composition-dialog.h
+++ b/xfburn/xfburn-burn-data-cd-composition-dialog.h
@@ -48,7 +48,7 @@ typedef struct
   XfburnBurnDataCompositionBaseDialogClass parent_class;
 } XfburnBurnDataCdCompositionDialogClass;
 
-GType xfburn_burn_data_cd_composition_dialog_get_type ();
+GType xfburn_burn_data_cd_composition_dialog_get_type (void);
 
 GtkWidget *xfburn_burn_data_cd_composition_dialog_new (IsoImage *image, gboolean has_default_name);
 
diff --git a/xfburn/xfburn-burn-data-composition-base-dialog.c b/xfburn/xfburn-burn-data-composition-base-dialog.c
index e6d2232..35d8a94 100644
--- a/xfburn/xfburn-burn-data-composition-base-dialog.c
+++ b/xfburn/xfburn-burn-data-composition-base-dialog.c
@@ -113,7 +113,7 @@ static void cb_dialog_response (XfburnBurnDataCompositionBaseDialog * dialog, gi
 static XfceTitledDialogClass *parent_class = NULL;
 
 GType
-xfburn_burn_data_composition_base_dialog_get_type ()
+xfburn_burn_data_composition_base_dialog_get_type (void)
 {
   static GType type = 0;
 
@@ -500,8 +500,8 @@ thread_write_iso (ThreadWriteIsoParams * params)
       i++;
 
       if (i >= 1000) {
-	i = 0;
 	gdouble percent = 0;
+	i = 0;
 
 	percent = ((gdouble) written / (gdouble) size);
 
diff --git a/xfburn/xfburn-burn-data-composition-base-dialog.h b/xfburn/xfburn-burn-data-composition-base-dialog.h
index 7a54611..82260e0 100644
--- a/xfburn/xfburn-burn-data-composition-base-dialog.h
+++ b/xfburn/xfburn-burn-data-composition-base-dialog.h
@@ -53,7 +53,7 @@ typedef struct
   XfceTitledDialogClass parent_class;
 } XfburnBurnDataCompositionBaseDialogClass;
 
-GType xfburn_burn_data_composition_base_dialog_get_type ();
+GType xfburn_burn_data_composition_base_dialog_get_type (void);
 
 GtkWidget *xfburn_burn_data_composition_base_dialog_new (IsoImage *image);
 
diff --git a/xfburn/xfburn-burn-data-dvd-composition-dialog.c b/xfburn/xfburn-burn-data-dvd-composition-dialog.c
index 05917a4..da4b83a 100644
--- a/xfburn/xfburn-burn-data-dvd-composition-dialog.c
+++ b/xfburn/xfburn-burn-data-dvd-composition-dialog.c
@@ -56,7 +56,7 @@ static void xfburn_burn_data_dvd_composition_dialog_finalize (GObject * object);
 static XfceTitledDialogClass *parent_class = NULL;
 
 GType
-xfburn_burn_data_dvd_composition_dialog_get_type ()
+xfburn_burn_data_dvd_composition_dialog_get_type (void)
 {
   static GType type = 0;
 
diff --git a/xfburn/xfburn-burn-data-dvd-composition-dialog.h b/xfburn/xfburn-burn-data-dvd-composition-dialog.h
index afd1b1e..9c4c0d6 100644
--- a/xfburn/xfburn-burn-data-dvd-composition-dialog.h
+++ b/xfburn/xfburn-burn-data-dvd-composition-dialog.h
@@ -48,7 +48,7 @@ typedef struct
   XfburnBurnDataCompositionBaseDialogClass parent_class;
 } XfburnBurnDataDvdCompositionDialogClass;
 
-GType xfburn_burn_data_dvd_composition_dialog_get_type ();
+GType xfburn_burn_data_dvd_composition_dialog_get_type (void);
 
 GtkWidget *xfburn_burn_data_dvd_composition_dialog_new (IsoImage *image);
 
diff --git a/xfburn/xfburn-burn-image-dialog.c b/xfburn/xfburn-burn-image-dialog.c
index 68b568f..a4deb7d 100644
--- a/xfburn/xfburn-burn-image-dialog.c
+++ b/xfburn/xfburn-burn-image-dialog.c
@@ -90,7 +90,7 @@ static void cb_clicked_ok (GtkButton * button, gpointer user_data);
 static XfceTitledDialogClass *parent_class = NULL;
 
 GType
-xfburn_burn_image_dialog_get_type ()
+xfburn_burn_image_dialog_get_type (void)
 {
   static GType type = 0;
 
@@ -581,7 +581,7 @@ cb_clicked_ok (GtkButton *button, gpointer user_data)
 
 /* public */
 GtkWidget *
-xfburn_burn_image_dialog_new ()
+xfburn_burn_image_dialog_new (void)
 {
   GtkWidget *obj;
 
diff --git a/xfburn/xfburn-burn-image-dialog.h b/xfburn/xfburn-burn-image-dialog.h
index 2d1fdb6..d08073a 100644
--- a/xfburn/xfburn-burn-image-dialog.h
+++ b/xfburn/xfburn-burn-image-dialog.h
@@ -48,8 +48,8 @@ typedef struct
   XfceTitledDialogClass parent_class;
 } XfburnBurnImageDialogClass;
 
-GType xfburn_burn_image_dialog_get_type ();
-GtkWidget *xfburn_burn_image_dialog_new ();
+GType xfburn_burn_image_dialog_get_type (void);
+GtkWidget *xfburn_burn_image_dialog_new (void);
 void xfburn_burn_image_dialog_set_filechooser_name (GtkWidget * dialog, gchar *name);
 
 G_END_DECLS
diff --git a/xfburn/xfburn-compositions-notebook.c b/xfburn/xfburn-compositions-notebook.c
index f9d8087..8830723 100644
--- a/xfburn/xfburn-compositions-notebook.c
+++ b/xfburn/xfburn-compositions-notebook.c
@@ -59,7 +59,7 @@ static XfburnComposition * add_composition_with_data (XfburnCompositionsNotebook
 static GtkNotebookClass *parent_class = NULL;
 
 GType
-xfburn_compositions_notebook_get_type ()
+xfburn_compositions_notebook_get_type (void)
 {
   static GType type = 0;
 
@@ -210,7 +210,7 @@ add_composition_with_data (XfburnCompositionsNotebook *notebook, XfburnCompositi
 /* public */
 /**********/
 GtkWidget *
-xfburn_compositions_notebook_new ()
+xfburn_compositions_notebook_new (void)
 {
   GtkWidget *obj;
 
diff --git a/xfburn/xfburn-compositions-notebook.h b/xfburn/xfburn-compositions-notebook.h
index 6821990..9f98888 100644
--- a/xfburn/xfburn-compositions-notebook.h
+++ b/xfburn/xfburn-compositions-notebook.h
@@ -48,9 +48,9 @@ typedef enum
   XFBURN_AUDIO_COMPOSITION,
 } XfburnCompositionType;
 
-GType xfburn_compositions_notebook_get_type ();
+GType xfburn_compositions_notebook_get_type (void);
 
-GtkWidget *xfburn_compositions_notebook_new ();
+GtkWidget *xfburn_compositions_notebook_new (void);
 
 XfburnComposition *xfburn_compositions_notebook_add_composition (XfburnCompositionsNotebook *notebook, XfburnCompositionType type);
 void xfburn_compositions_notebook_add_welcome_tab (XfburnCompositionsNotebook *notebook, GtkActionGroup *action_group);
diff --git a/xfburn/xfburn-copy-cd-dialog.c b/xfburn/xfburn-copy-cd-dialog.c
index 4eb6b6c..2681ce8 100644
--- a/xfburn/xfburn-copy-cd-dialog.c
+++ b/xfburn/xfburn-copy-cd-dialog.c
@@ -65,7 +65,7 @@ static void cb_dialog_response (XfburnCopyCdDialog * dialog, gint response_id, X
 static XfceTitledDialogClass *parent_class = NULL;
 
 GType
-xfburn_copy_cd_dialog_get_type ()
+xfburn_copy_cd_dialog_get_type (void)
 {
   static GType type = 0;
 
@@ -300,7 +300,7 @@ cb_dialog_response (XfburnCopyCdDialog * dialog, gint response_id, XfburnCopyCdD
 
 /* public */
 GtkWidget *
-xfburn_copy_cd_dialog_new ()
+xfburn_copy_cd_dialog_new (void)
 {
   XfburnCopyCdDialog *obj;
 
diff --git a/xfburn/xfburn-copy-cd-dialog.h b/xfburn/xfburn-copy-cd-dialog.h
index ed4432d..671e9b0 100644
--- a/xfburn/xfburn-copy-cd-dialog.h
+++ b/xfburn/xfburn-copy-cd-dialog.h
@@ -46,9 +46,9 @@ typedef struct
   XfceTitledDialogClass parent_class;
 } XfburnCopyCdDialogClass;
 
-GType xfburn_copy_cd_dialog_get_type ();
+GType xfburn_copy_cd_dialog_get_type (void);
 
-GtkWidget *xfburn_copy_cd_dialog_new ();
+GtkWidget *xfburn_copy_cd_dialog_new (void);
 
 G_END_DECLS
 
diff --git a/xfburn/xfburn-copy-cd-progress-dialog.c b/xfburn/xfburn-copy-cd-progress-dialog.c
index d747510..e983089 100644
--- a/xfburn/xfburn-copy-cd-progress-dialog.c
+++ b/xfburn/xfburn-copy-cd-progress-dialog.c
@@ -42,7 +42,7 @@ static void cb_new_output (XfburnCopyCdProgressDialog * dialog, const gchar * ou
 static XfburnProgressDialogClass *parent_class = NULL;
 
 GType
-xfburn_copy_cd_progress_dialog_get_type ()
+xfburn_copy_cd_progress_dialog_get_type (void)
 {
   static GType type = 0;
 
@@ -148,7 +148,7 @@ cb_new_output (XfburnCopyCdProgressDialog * dialog, const gchar * output, gpoint
 /*        */
 
 GtkWidget *
-xfburn_copy_cd_progress_dialog_new ()
+xfburn_copy_cd_progress_dialog_new (void)
 {
   XfburnCopyCdProgressDialog *obj;
 
diff --git a/xfburn/xfburn-copy-cd-progress-dialog.h b/xfburn/xfburn-copy-cd-progress-dialog.h
index a92faea..06146b5 100644
--- a/xfburn/xfburn-copy-cd-progress-dialog.h
+++ b/xfburn/xfburn-copy-cd-progress-dialog.h
@@ -45,8 +45,8 @@ typedef struct {
 	/* Add Signal Functions Here */
 } XfburnCopyCdProgressDialogClass;
 
-GType xfburn_copy_cd_progress_dialog_get_type ();
-GtkWidget *xfburn_copy_cd_progress_dialog_new ();
+GType xfburn_copy_cd_progress_dialog_get_type (void);
+GtkWidget *xfburn_copy_cd_progress_dialog_new (void);
 
 G_END_DECLS
 
diff --git a/xfburn/xfburn-copy-dvd-dialog.c b/xfburn/xfburn-copy-dvd-dialog.c
index ab9b25f..bb7f35b 100644
--- a/xfburn/xfburn-copy-dvd-dialog.c
+++ b/xfburn/xfburn-copy-dvd-dialog.c
@@ -65,7 +65,7 @@ static void cb_dialog_response (XfburnCopyDvdDialog * dialog, gint response_id,
 static XfceTitledDialogClass *parent_class = NULL;
 
 GType
-xfburn_copy_dvd_dialog_get_type ()
+xfburn_copy_dvd_dialog_get_type (void)
 {
   static GType type = 0;
 
@@ -299,7 +299,7 @@ cb_dialog_response (XfburnCopyDvdDialog * dialog, gint response_id, XfburnCopyDv
 
 /* public */
 GtkWidget *
-xfburn_copy_dvd_dialog_new ()
+xfburn_copy_dvd_dialog_new (void)
 {
   XfburnCopyDvdDialog *obj;
 
diff --git a/xfburn/xfburn-copy-dvd-dialog.h b/xfburn/xfburn-copy-dvd-dialog.h
index 53fd791..807f15a 100644
--- a/xfburn/xfburn-copy-dvd-dialog.h
+++ b/xfburn/xfburn-copy-dvd-dialog.h
@@ -46,9 +46,9 @@ typedef struct
   XfceTitledDialogClass parent_class;
 } XfburnCopyDvdDialogClass;
 
-GType xfburn_copy_dvd_dialog_get_type ();
+GType xfburn_copy_dvd_dialog_get_type (void);
 
-GtkWidget *xfburn_copy_dvd_dialog_new ();
+GtkWidget *xfburn_copy_dvd_dialog_new (void);
 
 G_END_DECLS
 
diff --git a/xfburn/xfburn-create-iso-progress-dialog.c b/xfburn/xfburn-create-iso-progress-dialog.c
index b932c17..704c1fc 100644
--- a/xfburn/xfburn-create-iso-progress-dialog.c
+++ b/xfburn/xfburn-create-iso-progress-dialog.c
@@ -42,7 +42,7 @@ static void cb_new_output (XfburnCreateIsoProgressDialog * dialog, const gchar *
 static XfburnProgressDialogClass *parent_class = NULL;
 
 GType
-xfburn_create_iso_progress_dialog_get_type ()
+xfburn_create_iso_progress_dialog_get_type (void)
 {
   static GType type = 0;
 
@@ -109,7 +109,7 @@ cb_new_output (XfburnCreateIsoProgressDialog * dialog, const gchar * output, gpo
 /*        */
 
 GtkWidget *
-xfburn_create_iso_progress_dialog_new ()
+xfburn_create_iso_progress_dialog_new (void)
 {
   XfburnCreateIsoProgressDialog *obj;
 
diff --git a/xfburn/xfburn-create-iso-progress-dialog.h b/xfburn/xfburn-create-iso-progress-dialog.h
index e6e1c75..4bbf865 100644
--- a/xfburn/xfburn-create-iso-progress-dialog.h
+++ b/xfburn/xfburn-create-iso-progress-dialog.h
@@ -47,8 +47,8 @@ typedef struct
   /* Add Signal Functions Here */
 } XfburnCreateIsoProgressDialogClass;
 
-GType xfburn_create_iso_progress_dialog_get_type ();
-GtkWidget *xfburn_create_iso_progress_dialog_new ();
+GType xfburn_create_iso_progress_dialog_get_type (void);
+GtkWidget *xfburn_create_iso_progress_dialog_new (void);
 
 G_END_DECLS
 
diff --git a/xfburn/xfburn-data-composition.c b/xfburn/xfburn-data-composition.c
index 54c1a97..031dca6 100644
--- a/xfburn/xfburn-data-composition.c
+++ b/xfburn/xfburn-data-composition.c
@@ -130,7 +130,7 @@ static void cb_cell_file_edited (GtkCellRenderer * renderer, gchar * path, gchar
 static void cb_content_drag_data_rcv (GtkWidget * widget, GdkDragContext * dc, guint x, guint y, GtkSelectionData * sd,
                                       guint info, guint t, XfburnDataComposition * composition);
 static void cb_content_drag_data_get (GtkWidget * widget, GdkDragContext * dc, GtkSelectionData * data, guint info,
-                                      guint time, XfburnDataComposition * content);
+                                      guint timestamp, XfburnDataComposition * content);
 static void cb_adding_done (XfburnAddingProgress *progress, XfburnDataComposition *dc);
 
 /* thread entry points */
@@ -145,6 +145,7 @@ static gboolean thread_add_file_to_list_with_name (const gchar *name, XfburnData
 static gboolean thread_add_file_to_list (XfburnDataComposition * dc, GtkTreeModel * model, const gchar * path, 
                                          GtkTreeIter * iter, GtkTreeIter * insertion, GtkTreeViewDropPosition position);
 static IsoImage * generate_iso_image (XfburnDataComposition * dc);
+static gboolean show_add_home_question_dialog (void);
                                   
 typedef struct
 {
@@ -999,7 +1000,7 @@ action_clear (GtkAction * action, XfburnDataComposition * dc)
 
 static void
 cb_content_drag_data_get (GtkWidget * widget, GdkDragContext * dc,
-                          GtkSelectionData * data, guint info, guint time, XfburnDataComposition * content)
+                          GtkSelectionData * data, guint info, guint timestamp, XfburnDataComposition * content)
 {
   if (info == DATA_COMPOSITION_DND_TARGET_INSIDE) {
     GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget));
@@ -1283,7 +1284,7 @@ thread_add_files_cli (ThreadAddFilesCLIParams *params)
 }
 
 static gboolean
-show_add_home_question_dialog ()
+show_add_home_question_dialog (void)
 {
   gboolean ok = TRUE;
 
diff --git a/xfburn/xfburn-device-box.c b/xfburn/xfburn-device-box.c
index ad209af..c751d4d 100644
--- a/xfburn/xfburn-device-box.c
+++ b/xfburn/xfburn-device-box.c
@@ -114,6 +114,7 @@ static void fill_combo_mode (XfburnDeviceBox *box, XfburnDevice *device);
 
 static void cb_volume_change_start (XfburnDeviceList *devlist, gboolean device_changed, XfburnDeviceBox *box);
 static void cb_volume_change_end (XfburnDeviceList *devlist, gboolean device_changed, XfburnDevice *device, XfburnDeviceBox *box);
+static void empty_speed_list_dialog (void);
 
 /* globals */
 static GtkVBoxClass *parent_class = NULL;
@@ -376,7 +377,7 @@ xfburn_device_box_set_property (GObject *object, guint prop_id, const GValue *va
 /*************/
 
 static void
-empty_speed_list_dialog ()
+empty_speed_list_dialog (void)
 {
   GtkDialog *dialog;
   GtkWidget *label;
diff --git a/xfburn/xfburn-device-list.c b/xfburn/xfburn-device-list.c
index 6dcf3b1..2318e46 100644
--- a/xfburn/xfburn-device-list.c
+++ b/xfburn/xfburn-device-list.c
@@ -317,7 +317,6 @@ get_libburn_device_list (XfburnDeviceList *devlist)
     XfburnDevice *device = xfburn_device_new ();
     const gchar *name;
     char addr[BURN_DRIVE_ADR_LEN];;
-    gint ret = 0;
     
     name = xfburn_device_set_name (device, drives[i].vendor, drives[i].product);
 
diff --git a/xfburn/xfburn-directory-browser.c b/xfburn/xfburn-directory-browser.c
index 0191cd3..f88a3f6 100644
--- a/xfburn/xfburn-directory-browser.c
+++ b/xfburn/xfburn-directory-browser.c
@@ -202,7 +202,7 @@ directory_tree_sortfunc (GtkTreeModel * model, GtkTreeIter * a, GtkTreeIter * b,
 
 static void
 cb_browser_drag_data_get (GtkWidget * widget, GdkDragContext * dc,
-                          GtkSelectionData * data, guint info, guint time, gpointer user_data)
+                          GtkSelectionData * data, guint info, guint timestamp, gpointer user_data)
 {
   if (info == DATA_COMPOSITION_DND_TARGET_TEXT_PLAIN) {
     gchar *full_paths = NULL;
diff --git a/xfburn/xfburn-disc-usage.c b/xfburn/xfburn-disc-usage.c
index 08b1c16..b94db7d 100644
--- a/xfburn/xfburn-disc-usage.c
+++ b/xfburn/xfburn-disc-usage.c
@@ -86,7 +86,6 @@ static guint signals[LAST_SIGNAL];
 /*******************************/
 /* XfburnDiscUsage class */
 /*******************************/
-static guint signals[LAST_SIGNAL];
 
 GType
 xfburn_disc_usage_get_type (void)
diff --git a/xfburn/xfburn-error.c b/xfburn/xfburn-error.c
index 35e54d7..5883182 100644
--- a/xfburn/xfburn-error.c
+++ b/xfburn/xfburn-error.c
@@ -23,7 +23,7 @@
 #include "xfburn-error.h"
 
 GQuark
-xfburn_error_quark ()
+xfburn_error_quark (void)
 {
   return g_quark_from_static_string ("xfburn-error-quark");
 }
diff --git a/xfburn/xfburn-error.h b/xfburn/xfburn-error.h
index d1c4563..59f5acc 100644
--- a/xfburn/xfburn-error.h
+++ b/xfburn/xfburn-error.h
@@ -46,6 +46,6 @@ typedef enum
 
 #define XFBURN_ERROR xfburn_error_quark ()
 
-GQuark xfburn_error_quark ();
+GQuark xfburn_error_quark (void);
 
 #endif /* __XFBURN_ERROR_H__ */
diff --git a/xfburn/xfburn-fs-browser.c b/xfburn/xfburn-fs-browser.c
index dcde5da..54bc734 100644
--- a/xfburn/xfburn-fs-browser.c
+++ b/xfburn/xfburn-fs-browser.c
@@ -46,7 +46,7 @@ static void cb_browser_drag_data_get (GtkWidget *, GdkDragContext *, GtkSelectio
 static ExoTreeViewClass *parent_class = NULL;
 
 GType
-xfburn_fs_browser_get_type ()
+xfburn_fs_browser_get_type (void)
 {
   static GType type = 0;
 
@@ -222,7 +222,7 @@ cb_browser_row_activated (GtkTreeView *treeview, GtkTreePath *path, GtkTreeViewC
 
 static void
 cb_browser_drag_data_get (GtkWidget * widget, GdkDragContext * dc,
-                          GtkSelectionData * data, guint info, guint time, XfburnFsBrowser *browser)
+                          GtkSelectionData * data, guint info, guint timestamp, XfburnFsBrowser *browser)
 {
   if (info == DATA_COMPOSITION_DND_TARGET_TEXT_PLAIN) {
     gchar *full_path = NULL;
@@ -235,7 +235,7 @@ cb_browser_drag_data_get (GtkWidget * widget, GdkDragContext * dc,
 
 /* public methods */
 GtkWidget *
-xfburn_fs_browser_new ()
+xfburn_fs_browser_new (void)
 {
   return g_object_new (XFBURN_TYPE_FS_BROWSER, NULL);
 }
diff --git a/xfburn/xfburn-fs-browser.h b/xfburn/xfburn-fs-browser.h
index 5256e5a..6024729 100644
--- a/xfburn/xfburn-fs-browser.h
+++ b/xfburn/xfburn-fs-browser.h
@@ -54,9 +54,9 @@ enum
   FS_BROWSER_N_COLUMNS
 };
 
-GType xfburn_fs_browser_get_type ();
+GType xfburn_fs_browser_get_type (void);
 
-GtkWidget *xfburn_fs_browser_new ();
+GtkWidget *xfburn_fs_browser_new (void);
 
 void xfburn_fs_browser_refresh (XfburnFsBrowser *browser);
 gchar * xfburn_fs_browser_get_selection (XfburnFsBrowser *browser);
diff --git a/xfburn/xfburn-hal-manager.c b/xfburn/xfburn-hal-manager.c
index b01ad87..803ce11 100644
--- a/xfburn/xfburn-hal-manager.c
+++ b/xfburn/xfburn-hal-manager.c
@@ -47,6 +47,8 @@ static void xfburn_hal_manager_class_init (XfburnHalManagerClass * klass);
 static void xfburn_hal_manager_init (XfburnHalManager * obj);
 static void xfburn_hal_manager_finalize (GObject * object);
 
+static GObject * xfburn_hal_manager_new (void);
+
 static void hal_finalize (LibHalContext  *hal_context);
 static void cb_device_added (LibHalContext *ctx, const char *udi);
 static void cb_device_removed (LibHalContext *ctx, const char *udi);
@@ -70,7 +72,7 @@ typedef struct {
 #endif
 } XfburnHalManagerPrivate;
 
-static XfburnHalManager *halman = NULL;
+static XfburnHalManager *instance = NULL;
 
 /*********************/
 /* class declaration */
@@ -79,7 +81,7 @@ static XfburnProgressDialogClass *parent_class = NULL;
 static guint signals[LAST_SIGNAL];
 
 GType
-xfburn_hal_manager_get_type ()
+xfburn_hal_manager_get_type (void)
 {
   static GType type = 0;
 
@@ -131,7 +133,7 @@ xfburn_hal_manager_init (XfburnHalManager * obj)
   DBusConnection *dbus_connection;
   priv->error = NULL;
 
-  //if (halman != NULL)
+  //if (instance != NULL)
   //  g_error ("The HAL context was already there when trying to create a hal-manager!");
   
   /* dbus & hal init code taken from exo */
@@ -212,7 +214,7 @@ xfburn_hal_manager_finalize (GObject * object)
   hal_finalize (priv->hal_context);
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
-  halman = NULL;
+  instance = NULL;
 }
 
 /*           */
@@ -235,13 +237,13 @@ hal_finalize (LibHalContext  *hal_context)
 static void cb_device_added (LibHalContext *ctx, const char *udi)
 {
   DBG ("HAL: device added");
-  g_signal_emit (halman, signals[VOLUME_CHANGED], 0);
+  g_signal_emit (instance, signals[VOLUME_CHANGED], 0);
 }
 
 static void cb_device_removed (LibHalContext *ctx, const char *udi)
 {
   DBG ("HAL: device removed");
-  g_signal_emit (halman, signals[VOLUME_CHANGED], 0);
+  g_signal_emit (instance, signals[VOLUME_CHANGED], 0);
 }
 
 static void cb_prop_modified (LibHalContext *ctx, const char *udi,
@@ -251,14 +253,14 @@ static void cb_prop_modified (LibHalContext *ctx, const char *udi,
    * way too many of these get triggered when a disc is
    * inserted or removed!
   DBG ("HAL: property modified");
-  g_signal_emit (halman, signals[VOLUME_CHANGED], 0);
+  g_signal_emit (instance, signals[VOLUME_CHANGED], 0);
   */
 }
 
-GObject *
-xfburn_hal_manager_new ()
+static GObject *
+xfburn_hal_manager_new (void)
 {
-  if (G_UNLIKELY (halman != NULL))
+  if (G_UNLIKELY (instance != NULL))
     g_error ("Trying to create a second instance of hal manager!");
   return g_object_new (XFBURN_TYPE_HAL_MANAGER, NULL);
 }
@@ -268,13 +270,13 @@ xfburn_hal_manager_new ()
 /*        */
 
 gchar *
-xfburn_hal_manager_create_global ()
+xfburn_hal_manager_create_global (void)
 {
   XfburnHalManagerPrivate *priv;
 
-  halman = XFBURN_HAL_MANAGER (xfburn_hal_manager_new ());
+  instance = XFBURN_HAL_MANAGER (xfburn_hal_manager_new ());
 
-  priv = XFBURN_HAL_MANAGER_GET_PRIVATE (halman);
+  priv = XFBURN_HAL_MANAGER_GET_PRIVATE (instance);
 
   if (priv->error) {
     gchar *error_msg, *ret;
@@ -289,27 +291,27 @@ xfburn_hal_manager_create_global ()
 }
 
 XfburnHalManager *
-xfburn_hal_manager_get_global ()
+xfburn_hal_manager_get_global (void)
 {
-  if (G_UNLIKELY (halman == NULL))
+  if (G_UNLIKELY (instance == NULL))
     g_error ("There is no instance of a hal manager!");
-  return halman;
+  return instance;
 }
 
 void
-xfburn_hal_manager_shutdown ()
+xfburn_hal_manager_shutdown (void)
 {
-  if (G_UNLIKELY (halman == NULL))
+  if (G_UNLIKELY (instance == NULL))
     g_error ("There is no instance of a hal manager!");
-  g_object_unref (halman);
-  halman = NULL;
+  g_object_unref (instance);
+  instance = NULL;
 }
 
 void
-xfburn_hal_manager_send_volume_changed ()
+xfburn_hal_manager_send_volume_changed (void)
 {
   //gdk_threads_enter ();
-  g_signal_emit (halman, signals[VOLUME_CHANGED], 0);
+  g_signal_emit (instance, signals[VOLUME_CHANGED], 0);
   //gdk_threads_leave ();
 }
 
diff --git a/xfburn/xfburn-hal-manager.h b/xfburn/xfburn-hal-manager.h
index da10af6..89bdcf9 100644
--- a/xfburn/xfburn-hal-manager.h
+++ b/xfburn/xfburn-hal-manager.h
@@ -52,12 +52,12 @@ typedef struct
   void (*volume_changed) (XfburnHalManager *halman);
 } XfburnHalManagerClass;
 
-GType xfburn_hal_manager_get_type ();
+GType xfburn_hal_manager_get_type (void);
 //GObject *xfburn_hal_manager_new (); /* use _create_global / _get_instance instead */
-gchar *xfburn_hal_manager_create_global ();
-XfburnHalManager * xfburn_hal_manager_get_global ();
-void xfburn_hal_manager_shutdown ();
-void xfburn_hal_manager_send_volume_changed ();
+gchar *xfburn_hal_manager_create_global (void);
+XfburnHalManager * xfburn_hal_manager_get_global (void);
+void xfburn_hal_manager_shutdown (void);
+void xfburn_hal_manager_send_volume_changed (void);
 int xfburn_hal_manager_get_devices (XfburnHalManager *halman, GList **devices);
 gboolean xfburn_hal_manager_check_ask_umount (XfburnHalManager *halman, XfburnDevice *device);
 
diff --git a/xfburn/xfburn-main-window.c b/xfburn/xfburn-main-window.c
index b587643..9e0e7ec 100644
--- a/xfburn/xfburn-main-window.c
+++ b/xfburn/xfburn-main-window.c
@@ -683,7 +683,7 @@ xfburn_main_window_new (void)
 }
 
 XfburnMainWindow *
-xfburn_main_window_get_instance ()
+xfburn_main_window_get_instance (void)
 {
   if (!instance)
     g_warning ("No existing instance of XfburnMainWindow");
diff --git a/xfburn/xfburn-main.c b/xfburn/xfburn-main.c
index 192d2aa..a3bd942 100644
--- a/xfburn/xfburn-main.c
+++ b/xfburn/xfburn-main.c
@@ -39,6 +39,7 @@
 #include <gst/gst.h>
 #endif
 
+#include "xfburn-main.h"
 #include "xfburn-global.h"
 #include "xfburn-device-list.h"
 #include "xfburn-utils.h"
@@ -55,6 +56,8 @@
 /* internal prototypes */
 static gboolean parse_option (const gchar *option_name, const gchar *value,
 			      gpointer data, GError **error);
+static void xfburn_main_enter_main_window (void);
+static void print_available_transcoders (void);
 
 /* globals */
 static int window_counter = 0;
@@ -99,7 +102,7 @@ static GOptionEntry optionentries[] = {
 
 /* public functions */
 void
-xfburn_main_enter_window ()
+xfburn_main_enter_window (void)
 {
   /* if a main window is present, then it is in control */
   if (window_counter != -42)
@@ -107,7 +110,7 @@ xfburn_main_enter_window ()
 }
 
 void 
-xfburn_main_leave_window ()
+xfburn_main_leave_window (void)
 {
   /* if a main window is present, then it is in control */
   if (window_counter == -42)
@@ -118,8 +121,8 @@ xfburn_main_leave_window ()
     g_idle_add ((GSourceFunc) gtk_main_quit, NULL );
 }
 
-void
-xfburn_main_enter_main_window ()
+static void
+xfburn_main_enter_main_window (void)
 {
   /* mark the window_counter as having a main window */
   window_counter = -42;
@@ -169,8 +172,8 @@ static gboolean parse_option (const gchar *option_name, const gchar *value,
 }
 
 
-void
-print_available_transcoders ()
+static void
+print_available_transcoders (void)
 {
   g_print ("Valid transcoders are:\n");
   g_print ("\tbasic\tCan only burn uncompressed CD quality .wav files.\n");
diff --git a/xfburn/xfburn-main.h b/xfburn/xfburn-main.h
index d803546..69a421c 100644
--- a/xfburn/xfburn-main.h
+++ b/xfburn/xfburn-main.h
@@ -25,8 +25,8 @@
 
 G_BEGIN_DECLS
 
-void xfburn_main_leave_window ();
-void xfburn_main_enter_window ();
+void xfburn_main_leave_window (void);
+void xfburn_main_enter_window (void);
 #if 0 /* INITIAL_DIRECTORY_OPTION */
 const gchar *xfburn_main_get_initial_dir ();
 #endif
diff --git a/xfburn/xfburn-notebook-tab.c b/xfburn/xfburn-notebook-tab.c
index 369bc42..a08677b 100644
--- a/xfburn/xfburn-notebook-tab.c
+++ b/xfburn/xfburn-notebook-tab.c
@@ -63,7 +63,7 @@ static guint notebook_tab_signals[LAST_SIGNAL];
 /* class initiliazation */
 /************************/
 GType
-xfburn_notebook_tab_get_type ()
+xfburn_notebook_tab_get_type (void)
 {
   static GType type = 0;
 
diff --git a/xfburn/xfburn-notebook-tab.h b/xfburn/xfburn-notebook-tab.h
index 140ac3c..f4b748c 100644
--- a/xfburn/xfburn-notebook-tab.h
+++ b/xfburn/xfburn-notebook-tab.h
@@ -42,7 +42,7 @@ typedef struct
   void (*button_close_clicked) (XfburnNotebookTab *tab);
 } XfburnNotebookTabClass;
 
-GType xfburn_notebook_tab_get_type ();
+GType xfburn_notebook_tab_get_type (void);
 
 GtkWidget *xfburn_notebook_tab_new (const gchar *label, gboolean show_button_close);
 
diff --git a/xfburn/xfburn-preferences-dialog.c b/xfburn/xfburn-preferences-dialog.c
index c5081e1..6e9d025 100644
--- a/xfburn/xfburn-preferences-dialog.c
+++ b/xfburn/xfburn-preferences-dialog.c
@@ -87,7 +87,7 @@ typedef struct
 static XfceTitledDialogClass *parent_class = NULL;
 
 GType
-xfburn_preferences_dialog_get_type ()
+xfburn_preferences_dialog_get_type (void)
 {
   static GType type = 0;
 
@@ -136,7 +136,7 @@ xfburn_preferences_dialog_init (XfburnPreferencesDialog * obj)
   GtkTreeViewColumn *column_name;
   GtkCellRenderer *cell_icon, *cell_name;
   GtkWidget *button_close;
-  gint index;
+  gint idx;
   
   gtk_window_set_title (GTK_WINDOW (obj), _("Preferences"));
   xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (obj), _("Tune how Xfburn behaves"));
@@ -179,7 +179,7 @@ xfburn_preferences_dialog_init (XfburnPreferencesDialog * obj)
   /* general tab */
   vbox = gtk_vbox_new (FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), BORDER);
-  index = gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), vbox, NULL);
+  idx = gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), vbox, NULL);
   gtk_widget_show (vbox);
 
   vbox2 = gtk_vbox_new (FALSE, 0);
@@ -221,14 +221,14 @@ xfburn_preferences_dialog_init (XfburnPreferencesDialog * obj)
   gtk_list_store_set (icon_store, &iter,
                       SETTINGS_LIST_PIXBUF_COLUMN, icon,
                       SETTINGS_LIST_TEXT_COLUMN, _("General"),
-                      SETTINGS_LIST_INDEX_COLUMN, index,
+                      SETTINGS_LIST_INDEX_COLUMN, idx,
                       -1);
   g_object_unref (G_OBJECT (icon));
   
   /* devices tab */
   vbox = gtk_vbox_new (FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), BORDER);
-  index = gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), vbox, NULL);
+  idx = gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), vbox, NULL);
   gtk_widget_show (vbox);
 
   label = gtk_label_new (_("Devices"));
@@ -309,7 +309,7 @@ xfburn_preferences_dialog_init (XfburnPreferencesDialog * obj)
   gtk_list_store_set (icon_store, &iter,
                       SETTINGS_LIST_PIXBUF_COLUMN, icon,
                       SETTINGS_LIST_TEXT_COLUMN, _("Devices"),
-                      SETTINGS_LIST_INDEX_COLUMN, index,
+                      SETTINGS_LIST_INDEX_COLUMN, idx,
                       -1);
   if (icon)
     g_object_unref (G_OBJECT (icon));
@@ -465,7 +465,7 @@ cb_show_hidden_clicked (GtkButton * Button, gpointer user_data)
 
 /* public */
 GtkWidget *
-xfburn_preferences_dialog_new ()
+xfburn_preferences_dialog_new (void)
 {
   GtkWidget *obj;
 
diff --git a/xfburn/xfburn-preferences-dialog.h b/xfburn/xfburn-preferences-dialog.h
index 4e0b68b..5130c74 100644
--- a/xfburn/xfburn-preferences-dialog.h
+++ b/xfburn/xfburn-preferences-dialog.h
@@ -43,8 +43,8 @@ typedef struct
 
 
 
-GType xfburn_preferences_dialog_get_type ();
-GtkWidget *xfburn_preferences_dialog_new ();
+GType xfburn_preferences_dialog_get_type (void);
+GtkWidget *xfburn_preferences_dialog_new (void);
 
 G_END_DECLS
 
diff --git a/xfburn/xfburn-progress-dialog.c b/xfburn/xfburn-progress-dialog.c
index 3706504..b3a145b 100644
--- a/xfburn/xfburn-progress-dialog.c
+++ b/xfburn/xfburn-progress-dialog.c
@@ -111,7 +111,7 @@ xfburn_progress_dialog_status_get_type (void)
 static GtkDialogClass *parent_class = NULL;
 
 GType
-xfburn_progress_dialog_get_type ()
+xfburn_progress_dialog_get_type (void)
 {
   static GType type = 0;
 
diff --git a/xfburn/xfburn-progress-dialog.h b/xfburn/xfburn-progress-dialog.h
index 94169d1..7c1e47e 100644
--- a/xfburn/xfburn-progress-dialog.h
+++ b/xfburn/xfburn-progress-dialog.h
@@ -61,7 +61,7 @@ typedef struct
 } XfburnProgressDialogClass;
 
 
-GType xfburn_progress_dialog_get_type ();
+GType xfburn_progress_dialog_get_type (void);
 
 void xfburn_progress_dialog_show_buffers (XfburnProgressDialog * dialog, gboolean show);
 void xfburn_progress_dialog_pulse_progress_bar (XfburnProgressDialog * dialog);
diff --git a/xfburn/xfburn-settings.c b/xfburn/xfburn-settings.c
index 1e4676b..061ca5d 100644
--- a/xfburn/xfburn-settings.c
+++ b/xfburn/xfburn-settings.c
@@ -83,7 +83,7 @@ static GObjectClass *parent_class = NULL;
 static XfburnSettings *instance = NULL;
 
 GType
-xfburn_settings_get_type ()
+xfburn_settings_get_type (void)
 {
   static GType type = 0;
 
@@ -327,7 +327,7 @@ value_destroy (Setting * val)
 }
 
 static XfburnSettings*
-get_instance ()
+get_instance (void)
 {
   if (G_LIKELY (instance))
 	return instance;
@@ -341,7 +341,7 @@ get_instance ()
 /* public methods */
 /******************/
 void
-xfburn_settings_init ()
+xfburn_settings_init (void)
 {
   if (G_LIKELY (instance == NULL)) {
 	XfburnSettingsPrivate *priv;
@@ -358,27 +358,27 @@ xfburn_settings_init ()
 }
 
 void
-xfburn_settings_flush ()
+xfburn_settings_flush (void)
 {
-  XfburnSettings *instance = get_instance ();
-  XfburnSettingsPrivate *priv = XFBURN_SETTINGS_GET_PRIVATE (instance);
+  XfburnSettings *settings = get_instance ();
+  XfburnSettingsPrivate *priv = XFBURN_SETTINGS_GET_PRIVATE (settings);
   
   save_settings (priv);
 }
 
 void
-xfburn_settings_free ()
+xfburn_settings_free (void)
 {
-  XfburnSettings *instance = get_instance ();
+  XfburnSettings *settings = get_instance ();
  
-  g_object_unref (instance);
+  g_object_unref (settings);
 }
 
 gboolean
 xfburn_settings_get_boolean (const gchar * key, gboolean fallback)
 {
-  XfburnSettings *instance = get_instance ();
-  XfburnSettingsPrivate *priv = XFBURN_SETTINGS_GET_PRIVATE (instance);
+  XfburnSettings *settings = get_instance ();
+  XfburnSettingsPrivate *priv = XFBURN_SETTINGS_GET_PRIVATE (settings);
   gpointer orig;
   gpointer value;
 
@@ -397,8 +397,8 @@ xfburn_settings_get_boolean (const gchar * key, gboolean fallback)
 gint
 xfburn_settings_get_int (const gchar * key, gint fallback)
 {
-  XfburnSettings *instance = get_instance ();
-  XfburnSettingsPrivate *priv = XFBURN_SETTINGS_GET_PRIVATE (instance);
+  XfburnSettings *settings = get_instance ();
+  XfburnSettingsPrivate *priv = XFBURN_SETTINGS_GET_PRIVATE (settings);
   gpointer orig;
   gpointer value;
 
@@ -417,8 +417,8 @@ xfburn_settings_get_int (const gchar * key, gint fallback)
 gchar *
 xfburn_settings_get_string (const gchar * key, const gchar * fallback)
 {
-  XfburnSettings *instance = get_instance ();
-  XfburnSettingsPrivate *priv = XFBURN_SETTINGS_GET_PRIVATE (instance);
+  XfburnSettings *settings = get_instance ();
+  XfburnSettingsPrivate *priv = XFBURN_SETTINGS_GET_PRIVATE (settings);
   gpointer orig;
   gpointer value;
 
@@ -437,8 +437,8 @@ xfburn_settings_get_string (const gchar * key, const gchar * fallback)
 void
 xfburn_settings_set_boolean (const gchar * key, gboolean value)
 {
-  XfburnSettings *instance = get_instance ();
-  XfburnSettingsPrivate *priv = XFBURN_SETTINGS_GET_PRIVATE (instance);
+  XfburnSettings *settings = get_instance ();
+  XfburnSettingsPrivate *priv = XFBURN_SETTINGS_GET_PRIVATE (settings);
   Setting *setting;
 
   setting = g_new0 (Setting, 1);
@@ -451,8 +451,8 @@ xfburn_settings_set_boolean (const gchar * key, gboolean value)
 void
 xfburn_settings_set_int (const gchar * key, gint value)
 {
-  XfburnSettings *instance = get_instance ();
-  XfburnSettingsPrivate *priv = XFBURN_SETTINGS_GET_PRIVATE (instance);
+  XfburnSettings *settings = get_instance ();
+  XfburnSettingsPrivate *priv = XFBURN_SETTINGS_GET_PRIVATE (settings);
   Setting *setting;
 
   setting = g_new0 (Setting, 1);
@@ -465,8 +465,8 @@ xfburn_settings_set_int (const gchar * key, gint value)
 void
 xfburn_settings_set_string (const gchar * key, const gchar * value)
 {
-  XfburnSettings *instance = get_instance ();
-  XfburnSettingsPrivate *priv = XFBURN_SETTINGS_GET_PRIVATE (instance);
+  XfburnSettings *settings = get_instance ();
+  XfburnSettingsPrivate *priv = XFBURN_SETTINGS_GET_PRIVATE (settings);
   Setting *setting;
 
   setting = g_new0 (Setting, 1);
diff --git a/xfburn/xfburn-settings.h b/xfburn/xfburn-settings.h
index a674d5e..b25e7d5 100644
--- a/xfburn/xfburn-settings.h
+++ b/xfburn/xfburn-settings.h
@@ -45,11 +45,11 @@ typedef struct
   GObjectClass parent_class;
 } XfburnSettingsClass;
 
-GType xfburn_settings_get_type ();
+GType xfburn_settings_get_type (void);
 
-void xfburn_settings_init ();
-void xfburn_settings_free ();
-void xfburn_settings_flush ();
+void xfburn_settings_init (void);
+void xfburn_settings_free (void);
+void xfburn_settings_flush (void);
 
 gint xfburn_settings_get_boolean (const gchar *key, gboolean fallback);
 gint xfburn_settings_get_int (const gchar *key, gint fallback);
diff --git a/xfburn/xfburn-transcoder-basic.c b/xfburn/xfburn-transcoder-basic.c
index b1ba774..d9aeb4d 100644
--- a/xfburn/xfburn-transcoder-basic.c
+++ b/xfburn/xfburn-transcoder-basic.c
@@ -83,7 +83,7 @@ static GObject *parent_class = NULL;
 //static guint signals[LAST_SIGNAL];
 
 GType
-xfburn_transcoder_basic_get_type ()
+xfburn_transcoder_basic_get_type (void)
 {
   static GType type = 0;
 
@@ -366,7 +366,7 @@ needs_swap (char header[44])
 /*        */
 
 GObject *
-xfburn_transcoder_basic_new ()
+xfburn_transcoder_basic_new (void)
 {
   return g_object_new (XFBURN_TYPE_TRANSCODER_BASIC, NULL);
 }
diff --git a/xfburn/xfburn-transcoder-basic.h b/xfburn/xfburn-transcoder-basic.h
index ede65ec..a2027a5 100644
--- a/xfburn/xfburn-transcoder-basic.h
+++ b/xfburn/xfburn-transcoder-basic.h
@@ -48,8 +48,8 @@ typedef struct
   
 } XfburnTranscoderBasicClass;
 
-GType xfburn_transcoder_basic_get_type ();
-GObject *xfburn_transcoder_basic_new ();
+GType xfburn_transcoder_basic_get_type (void);
+GObject *xfburn_transcoder_basic_new (void);
 
 G_END_DECLS
 
diff --git a/xfburn/xfburn-transcoder-gst.c b/xfburn/xfburn-transcoder-gst.c
index 6ef1f49..da17d6f 100644
--- a/xfburn/xfburn-transcoder-gst.c
+++ b/xfburn/xfburn-transcoder-gst.c
@@ -155,7 +155,7 @@ static GObject *parent_class = NULL;
 //static guint signals[LAST_SIGNAL];
 
 GType
-xfburn_transcoder_gst_get_type ()
+xfburn_transcoder_gst_get_type (void)
 {
   static GType type = 0;
 
@@ -682,7 +682,7 @@ on_pad_added (GstElement *element, GstPad *pad, gboolean last, gpointer data)
 
     gchar *error_msg = "File content has a decoder but is not audio.";
 
-    DBG (error_msg);
+    DBG ("%s", error_msg);
     
     gst_caps_unref (caps);
     gst_object_unref (audiopad);
@@ -1025,7 +1025,7 @@ is_initialized (XfburnTranscoder *trans, GError **error)
 /*        */
 
 GObject *
-xfburn_transcoder_gst_new ()
+xfburn_transcoder_gst_new (void)
 {
   return g_object_new (XFBURN_TYPE_TRANSCODER_GST, NULL);
 }
diff --git a/xfburn/xfburn-transcoder-gst.h b/xfburn/xfburn-transcoder-gst.h
index e99b4ad..1d0ad87 100644
--- a/xfburn/xfburn-transcoder-gst.h
+++ b/xfburn/xfburn-transcoder-gst.h
@@ -50,8 +50,8 @@ typedef struct
   
 } XfburnTranscoderGstClass;
 
-GType xfburn_transcoder_gst_get_type ();
-GObject *xfburn_transcoder_gst_new ();
+GType xfburn_transcoder_gst_get_type (void);
+GObject *xfburn_transcoder_gst_new (void);
 
 G_END_DECLS
 
diff --git a/xfburn/xfburn-transcoder.c b/xfburn/xfburn-transcoder.c
index b647d9b..64a721e 100644
--- a/xfburn/xfburn-transcoder.c
+++ b/xfburn/xfburn-transcoder.c
@@ -44,7 +44,7 @@ XfburnTranscoder *transcoder = NULL;
 //static guint signals[LAST_SIGNAL];
 
 GType
-xfburn_transcoder_get_type ()
+xfburn_transcoder_get_type (void)
 {
   static GType type = 0;
 
@@ -225,7 +225,7 @@ xfburn_transcoder_set_global (XfburnTranscoder *trans)
 }
 
 XfburnTranscoder *
-xfburn_transcoder_get_global ()
+xfburn_transcoder_get_global (void)
 {
   g_object_ref (transcoder);
   return transcoder;
diff --git a/xfburn/xfburn-transcoder.h b/xfburn/xfburn-transcoder.h
index 6e695ce..3fe2335 100644
--- a/xfburn/xfburn-transcoder.h
+++ b/xfburn/xfburn-transcoder.h
@@ -58,10 +58,10 @@ typedef struct
   
 } XfburnTranscoderInterface;
 
-GType xfburn_transcoder_get_type ();
+GType xfburn_transcoder_get_type (void);
 
 void xfburn_transcoder_set_global (XfburnTranscoder *trans);
-XfburnTranscoder *xfburn_transcoder_get_global ();
+XfburnTranscoder *xfburn_transcoder_get_global (void);
 
 const gchar *xfburn_transcoder_get_name (XfburnTranscoder *trans);
 const gchar *xfburn_transcoder_get_description (XfburnTranscoder *trans);
diff --git a/xfburn/xfburn-utils.c b/xfburn/xfburn-utils.c
index a3cd58f..9cf052b 100644
--- a/xfburn/xfburn-utils.c
+++ b/xfburn/xfburn-utils.c
@@ -64,16 +64,16 @@ xfburn_default_cursor (GtkWidget * widget)
 gchar *
 xfburn_humanreadable_filesize (guint64 size)
 {
-  if (!xfburn_settings_get_boolean ("human-readable-units", TRUE))
-    return g_strdup_printf ("%lu B", (long unsigned int) size);
-  
-  /* copied from GnomeBaker */
-
   gchar *ret = NULL;
   const gchar *unit_list[5] = { "B ", "KB", "MB", "GB", "TB" };
   gint unit = 0;
   gdouble human_size = (gdouble) size;
 
+  if (!xfburn_settings_get_boolean ("human-readable-units", TRUE))
+    return g_strdup_printf ("%lu B", (long unsigned int) size);
+  
+  /* copied from GnomeBaker */
+
   while (human_size > 1024 && unit < 4) {
     human_size = human_size / 1024;
     unit++;
@@ -181,7 +181,7 @@ xfburn_ask_yes_no (GtkMessageType type, const gchar *primary_text, const gchar *
 static char * libburn_msg_prefix = "libburn-";
 
 void
-xfburn_capture_libburn_messages ()
+xfburn_capture_libburn_messages (void)
 {
   int ret;
 
@@ -196,7 +196,7 @@ xfburn_capture_libburn_messages ()
 }
 
 void
-xfburn_console_libburn_messages ()
+xfburn_console_libburn_messages (void)
 {
   int ret;
 
diff --git a/xfburn/xfburn-utils.h b/xfburn/xfburn-utils.h
index d7a398a..fbf465d 100644
--- a/xfburn/xfburn-utils.h
+++ b/xfburn/xfburn-utils.h
@@ -37,7 +37,7 @@ void xfburn_browse_for_file (GtkEntry *entry, GtkWindow *parent);
 
 gboolean xfburn_ask_yes_no (GtkMessageType type, const gchar *primary_text, const gchar *secondary_text);
 
-void xfburn_capture_libburn_messages ();
-void xfburn_console_libburn_messages ();
+void xfburn_capture_libburn_messages (void);
+void xfburn_console_libburn_messages (void);
 
 #endif
diff --git a/xfburn/xfburn-welcome-tab.c b/xfburn/xfburn-welcome-tab.c
index b12645e..2bfe1b5 100644
--- a/xfburn/xfburn-welcome-tab.c
+++ b/xfburn/xfburn-welcome-tab.c
@@ -69,7 +69,7 @@ static void blank_disc (GtkButton *button, XfburnWelcomeTab *tab);
 static GtkWidget *parent_class = NULL;
 
 GType
-xfburn_welcome_tab_get_type ()
+xfburn_welcome_tab_get_type (void)
 {
   static GType type = 0;
 
diff --git a/xfburn/xfburn-welcome-tab.h b/xfburn/xfburn-welcome-tab.h
index 85255f3..3805b7c 100644
--- a/xfburn/xfburn-welcome-tab.h
+++ b/xfburn/xfburn-welcome-tab.h
@@ -47,7 +47,7 @@ typedef struct
   GtkVBoxClass parent_class;
 } XfburnWelcomeTabClass;
 
-GType xfburn_welcome_tab_get_type ();
+GType xfburn_welcome_tab_get_type (void);
 GtkWidget *xfburn_welcome_tab_new (XfburnCompositionsNotebook *notebook, GtkActionGroup *action_group);
 
 G_END_DECLS



More information about the Xfce4-commits mailing list