diff --git a/src/po/gd.po b/src/po/gd.po
index b014bc3ff..5627d2775 100644
--- a/src/po/gd.po
+++ b/src/po/gd.po
@@ -1,60 +1,54 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: Tux paint anns a' ghàidhlig\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-17 15:55-0700\n"
-"PO-Revision-Date: 2006-03-04 15:51-0000\n"
-"Last-Translator: Niall Tracey <internationiall@hotmail.com>\n"
-"Language-Team:  <internationiall@hotmail.com>\n"
+"POT-Creation-Date: 2010-10-18 08:32-0700\n"
+"PO-Revision-Date: 2011-12-05 17:42+0200\n"
+"Last-Translator: Michael <fios@akerbeltz.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: gd\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Scottish Gaelic\n"
-"X-Poedit-Country: Scotland\n"
+"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "
+"(n > 2 && n < 20) ? 2 : 3 ;\n"
+"X-Generator: Pootle 2.1.6\n"
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #. Response to Black (0, 0, 0) color selected
 #: ../colors.h:86
 msgid "Black!"
 msgstr "Dubh!"
 
-# Is the Gaelic word too ambiguous?
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #. Response to Dark grey (128, 128, 128) color selected
 #: ../colors.h:89
-#, fuzzy
 msgid "Dark grey! Some people spell it “dark gray”."
-msgstr "Glas!"
+msgstr "Dorch-ghlas!"
 
-# Is the Gaelic word too ambiguous?
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #. Response to Light grey (192, 192, 192) color selected
 #: ../colors.h:92
-#, fuzzy
 msgid "Light grey! Some people spell it “light gray”."
-msgstr "Liath!"
+msgstr "Soilleir-ghlas!"
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #. Response to White (255, 255, 255) color selected
 #: ../colors.h:95
 msgid "White!"
 msgstr "Geal!"
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #. Response to Red (255, 0, 0) color selected
 #: ../colors.h:98
 msgid "Red!"
 msgstr "Dearg!"
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
-# Dictionary doesn't not explicitly state any distinction between colour and fruit.
 #. Response to Orange (255, 128, 0) color selected
 #: ../colors.h:101
-#, fuzzy
 msgid "Orange!"
 msgstr "Orains!"
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #. Response to Yellow (255, 255, 0) color selected
 #: ../colors.h:104
 msgid "Yellow!"
@@ -63,22 +57,18 @@ msgstr "Buidhe!"
 #. Response to Light green (160, 228, 128) color selected
 #: ../colors.h:107
 msgid "Light green!"
-msgstr ""
+msgstr "Soilleir-ghorm!"
 
 #. Response to Dark green (33, 148, 70) color selected
 #: ../colors.h:110
 msgid "Dark green!"
-msgstr ""
+msgstr "Dorch-ghorm!"
 
-# Is the Gaelic word too ambiguous?
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #. Response to "Sky" blue (138, 168, 205) color selected
 #: ../colors.h:113
-#, fuzzy
 msgid "Sky blue!"
 msgstr "Liath!"
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #. Response to Blue (50, 100, 255) color selected
 #: ../colors.h:116
 msgid "Blue!"
@@ -87,21 +77,18 @@ msgstr "Gorm!"
 #. Response to Lavender (186, 157, 255) color selected
 #: ../colors.h:119
 msgid "Lavender!"
-msgstr ""
+msgstr "Dath lus na tùise!"
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #. Response to Purple (128, 0, 128) color selected
 #: ../colors.h:122
 msgid "Purple!"
 msgstr "Purpaidh!"
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #. Response to Pink (255, 165, 211) color selected
 #: ../colors.h:125
 msgid "Pink!"
 msgstr "Pinc!"
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #. Response to Brown (128, 80, 0) color selected
 #: ../colors.h:128
 msgid "Brown!"
@@ -110,7 +97,7 @@ msgstr "Donn!"
 #. Response to Tan (226, 189, 166) color selected
 #: ../colors.h:131
 msgid "Tan!"
-msgstr ""
+msgstr "Soilleir-dhonn!"
 
 #. Response to Beige (247, 228, 219) color selected
 #: ../colors.h:134
@@ -152,32 +139,32 @@ msgstr ""
 #. distinct uppercase and lowercase (e.g., 'o' vs. 'O')
 #: ../dirwalk.c:191
 msgid "oO"
-msgstr ""
+msgstr "oO"
 
 #. common punctuation (e.g., '?', '!', '.', ',', etc.)
 #: ../dirwalk.c:194
 msgid ",.?!"
-msgstr ""
+msgstr "’,.?!-"
 
 #. uncommon punctuation (e.g., '@', '#', '*', etc.)
 #: ../dirwalk.c:197
 msgid "`\\%_@$~#{<(^&*"
-msgstr ""
+msgstr "`\\%_@$~#{<(^&*"
 
 #. digits (e.g., '0', '1' and '7')
 #: ../dirwalk.c:200
 msgid "017"
-msgstr ""
+msgstr "017"
 
 #. distinct circle-like characters (e.g., 'O' (capital oh) vs. '0' (zero))
 #: ../dirwalk.c:203
 msgid "O0"
-msgstr ""
+msgstr "O0"
 
 #. distinct line-like characters (e.g., 'l' (lowercase elle) vs. '1' (one) vs. 'I' (capital aye))
 #: ../dirwalk.c:206
 msgid "1Il|"
-msgstr ""
+msgstr "1Il|"
 
 #: ../dirwalk.c:210
 msgid "<1>spare-1a"
@@ -198,15 +185,13 @@ msgstr ""
 #. Congratulations #1
 #: ../great.h:37
 msgid "Great!"
-msgstr "'S math sin!"
+msgstr "’S math sin!"
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #. Congratulations #2
 #: ../great.h:40
 msgid "Cool!"
 msgstr "Sgoinneil!"
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #. Congratulations #3
 #: ../great.h:43
 msgid "Keep it up!"
@@ -215,51 +200,48 @@ msgstr "Cùm ort!"
 #. Congratulations #4
 #: ../great.h:46
 msgid "Good job!"
-msgstr ""
+msgstr "Glè mhath!"
 
 #. Input Method: English mode
 #: ../im.c:75
 msgid "English"
-msgstr ""
+msgstr "Beurla"
 
 #. Input Method: Japanese Romanized Hiragana mode
 #: ../im.c:78
 msgid "Hiragana"
-msgstr ""
+msgstr "Hiragana"
 
 #. Input Method: Japanese Romanized Katakana mode
 #: ../im.c:81
 msgid "Katakana"
-msgstr ""
+msgstr "Katakana"
 
 #. Input Method: Korean Hangul 2-Bul mode
 #: ../im.c:84
 msgid "Hangul"
-msgstr ""
+msgstr "Hangul"
 
 #. Input Method: Thai mode
 #: ../im.c:87
 msgid "Thai"
-msgstr ""
+msgstr "Tàidh"
 
 #. Input Method: Traditional Chinese mode
 #: ../im.c:90
 msgid "ZH_TW"
-msgstr ""
+msgstr "ZH_TW"
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #. Square shape tool (4 equally-lengthed sides at right angles)
 #: ../shapes.h:171 ../shapes.h:172
 msgid "Square"
 msgstr "Ceàrnag"
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #. Rectangle shape tool (4 sides at right angles)
 #: ../shapes.h:175 ../shapes.h:176
 msgid "Rectangle"
-msgstr "Ceart-cheàrnag"
+msgstr "Ceart-cheàrnach"
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #. Circle shape tool (X radius and Y radius are the same)
 #: ../shapes.h:179 ../shapes.h:180
 msgid "Circle"
@@ -268,84 +250,81 @@ msgstr "Cearcall"
 #. Ellipse shape tool (X radius and Y radius may differ)
 #: ../shapes.h:183 ../shapes.h:184
 msgid "Ellipse"
-msgstr ""
+msgstr "Eileaps"
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #. Triangle shape tool (3 sides)
 #: ../shapes.h:187 ../shapes.h:188
 msgid "Triangle"
 msgstr "Triantan"
 
-# Stòr-dàta (SMO)
 #. Pentagone shape tool (5 sides)
 #: ../shapes.h:191 ../shapes.h:192
 msgid "Pentagon"
 msgstr "Còig-cheàrnach"
 
-# Stòr-dàta (SMO)
 #. Rhombus shape tool (4 sides, not at right angles)
 #: ../shapes.h:195 ../shapes.h:196
 msgid "Rhombus"
 msgstr "Rombas"
 
-# Stòr-dàta (SMO)
 #. Octagon shape tool (8 sides)
 #: ../shapes.h:199 ../shapes.h:200
-#, fuzzy
 msgid "Octagon"
-msgstr "Còig-cheàrnach"
+msgstr "Ochd-cheàrnach"
 
 #. Description of a square
 #: ../shapes.h:208 ../shapes.h:209
 msgid "A square is a rectangle with four equal sides."
 msgstr ""
+"’S e ceart-chearnach le ceithir taobhan co-ionnan a th’ anns a’ cheàrnag."
 
 #. Description of a rectangle
 #: ../shapes.h:212 ../shapes.h:213
 msgid "A rectangle has four sides and four right angles."
-msgstr ""
+msgstr "Tha ceithir taobhan is ceithir ceàrnan cearta aig ceàrnag."
 
 #: ../shapes.h:217 ../shapes.h:219
 msgid ""
 "A circle is a curve where all points have the same distance from the center."
 msgstr ""
+"’S e lùb a th’ anns a’ chearcall far a bheil an aon astar bhon mheadhan aig "
+"gach puing."
 
 #. Description of an ellipse
 #: ../shapes.h:222 ../shapes.h:223
 msgid "An ellipse is a stretched circle."
-msgstr ""
+msgstr "’S e cearcall air a shìneadh a th’ anns an eileaps."
 
 #. Description of a triangle
 #: ../shapes.h:226 ../shapes.h:227
 msgid "A triangle has three sides."
-msgstr ""
+msgstr "Tha trì taobhan aig triantan"
 
 #. Description of a pentagon
 #: ../shapes.h:230 ../shapes.h:231
 msgid "A pentagon has five sides."
-msgstr ""
+msgstr "Tha còig taobhan aig còig-cheàrnach"
 
 #: ../shapes.h:235 ../shapes.h:237
 msgid "A rhombus has four equal sides, and opposite sides are parallel."
 msgstr ""
+"Tha ceithir taobhan dhen aon fhaide aig rombas, is tha na taobhan mu "
+"choinneamh co-shìnte"
 
 #: ../shapes.h:241 ../shapes.h:243
 msgid "An octagon has eight equal sides."
-msgstr ""
+msgstr "Tha ochd taobhan dhen aon fhaide aig ochd-cheàrnach"
 
 #. Title of tool selector (buttons down the left)
 #: ../titles.h:56
 msgid "Tools"
-msgstr ""
+msgstr "Innealan"
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #. Title of color palette (buttons across the bottom)
 #: ../titles.h:59
 msgid "Colors"
 msgstr "Dathan"
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
-# (Paintbrushes -- Bruisean pheant.)
 #. Title of brush selector (buttons down the right for paint and line tools)
 #: ../titles.h:62
 msgid "Brushes"
@@ -354,21 +333,19 @@ msgstr "Bruisean"
 #. Title of eraser selector (buttons down the right for eraser tool)
 #: ../titles.h:65
 msgid "Erasers"
-msgstr ""
+msgstr "Suathain"
 
 #. Title of stamp selector (buttons down the right for stamps tool)
 #: ../titles.h:68
 msgid "Stamps"
-msgstr ""
+msgstr "Stampaichean"
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #. Title of shape selector (buttons down the right for shapes tool)
 #. Shape creation tool (square, circle, etc.)
 #: ../titles.h:71 ../tools.h:71
 msgid "Shapes"
 msgstr "Cumaidhean"
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #. Title of font selector (buttons down the right for text and label tools)
 #: ../titles.h:74
 msgid "Letters"
@@ -378,28 +355,23 @@ msgstr "Litrichean"
 #. "Magic" effects tools (blur, flip image, etc.)
 #: ../titles.h:77 ../tools.h:83
 msgid "Magic"
-msgstr ""
+msgstr "Draoidheachd"
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #. Freehand painting tool
 #: ../tools.h:62
-#, fuzzy
 msgid "Paint"
 msgstr "Peant"
 
 #. Stamp tool (aka Rubber Stamps)
 #: ../tools.h:65
 msgid "Stamp"
-msgstr ""
+msgstr "Stampa"
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #. Line drawing tool
 #: ../tools.h:68
 msgid "Lines"
-msgstr "Loinichean"
+msgstr "Loidhnichean"
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
-# Opera anns a' Ghàidhlig
 #. Text tool
 #: ../tools.h:74
 msgid "Text"
@@ -408,45 +380,40 @@ msgstr "Teacsa"
 #. Label tool
 #: ../tools.h:77
 msgid "Label"
-msgstr ""
+msgstr "Bileag"
 
-# Opera anns a' ghàidhlig
 #. Undo last action
 #: ../tools.h:86
 msgid "Undo"
-msgstr "Mar a bha"
+msgstr "Neo-dhèan"
 
-# Tha mi a creidsinn gun chuala mi an-seo àiteigin, ach chan eil mi cinnteach càite....
 #. Redo undone action
 #: ../tools.h:89
-#, fuzzy
 msgid "Redo"
-msgstr "Dèan a-rithist"
+msgstr "Ath-dhèan"
 
 #. Eraser tool
 #: ../tools.h:92
 msgid "Eraser"
-msgstr ""
+msgstr "Suathan"
 
 #. Start a new picture
 #: ../tools.h:95
 msgid "New"
-msgstr ""
+msgstr "Ùr"
 
 #. Open a saved picture
 #. buttons for the file open dialog
 #. Open dialog: 'Open' button, to load the selected picture
 #: ../tools.h:98 ../tuxpaint.c:7762
 msgid "Open"
-msgstr ""
+msgstr "Fosgail"
 
 #. Save the current picture
 #: ../tools.h:101
 msgid "Save"
-msgstr ""
+msgstr "Sàbhail"
 
-# Stòr-dàta (SMO)
-# Opera anns a' ghàidhlig
 #. Print the current picture
 #: ../tools.h:104
 msgid "Print"
@@ -455,24 +422,24 @@ msgstr "Clò-bhuail"
 #. Quit/exit Tux Paint application
 #: ../tools.h:107
 msgid "Quit"
-msgstr ""
+msgstr "Fàg an-seo"
 
-# Gràmar?
 #. Paint tool instructions
 #: ../tools.h:115
-#, fuzzy
 msgid "Pick a color and a brush shape to draw with."
-msgstr "Tagh dath agus bruis a dhèanamh ris."
+msgstr "Tagh dath is cumadh bruise gus peantadh."
 
 #. Stamp tool instructions
 #: ../tools.h:118
 msgid "Pick a picture to stamp around your drawing."
-msgstr ""
+msgstr "Tagh dealbh gus stampadh mu thimcheall an deilbh agad."
 
 #. Line tool instructions
 #: ../tools.h:121
 msgid "Click to start drawing a line. Let go to complete it."
 msgstr ""
+"Briog gus tòiseachadh air loidhne a pheantadh. Leig às gus crìoch a chur "
+"oirre."
 
 #. Shape tool instructions
 #: ../tools.h:124
@@ -480,150 +447,136 @@ msgid ""
 "Pick a shape. Click to pick the center, drag, then let go when it is the "
 "size you want. Move around to rotate it, and click to draw it."
 msgstr ""
+"Tagh cumadh. Briog gus am meadhan a thaghadh, slaod, is leig às nuair a "
+"bhios am meud air a thogras tu. Gluais mu thimcheall gus car a chur air, is "
+"briog nuair a bhios tu deiseil."
 
-# Gràmar?
 #. Text tool instructions
 #: ../tools.h:127
-#, fuzzy
 msgid ""
 "Choose a style of text. Click on your drawing and you can start typing. "
 "Press [Enter] or [Tab] to complete the text."
 msgstr ""
-"Tagh seorsa teacsa. Briog air an dealbh airson na clò-sgrìobhadh a "
-"thoiseachadh."
+"Tagh seòrsa de theacsa. Briog air an dealbh agad gus tòiseachadh air "
+"sgrìobhadh. Brùth air [A-steach] no [Taba] nuair a bhios tu deiseil."
 
-# Gràmar?
 #. Label tool instructions
 #: ../tools.h:130
-#, fuzzy
 msgid ""
 "Choose a style of text. Click on your drawing and you can start typing. "
 "Press [Enter] or [Tab] to complete the text. By using the selector button "
 "and clicking an exist label, you can move it, edit it and change its text "
 "style."
 msgstr ""
-"Tagh seorsa teacsa. Briog air an dealbh airson na clò-sgrìobhadh a "
-"thoiseachadh."
+"Tagh seòrsa de theacsa. Briog air an dealbh agad gus tòiseachadh air "
+"sgrìobhadh. Brùth air [A-steach] no [Taba] nuair a bhios tu deiseil. Ma "
+"chleachdas tu am putain-taghaidh is ma bhriogas tu air bileag a tha ann mar-"
+"thà, ’s urrainn dhut ga gluasad, ga deasachadh is stoidhle a teacsa "
+"atharrachadh."
 
 #. Magic tool instruction
 #: ../tools.h:136
 msgid "Pick a magical effect to use on your drawing!"
-msgstr ""
+msgstr "Tagh draoidheachd a chleachdas tu air an dealbh agad!"
 
-# Opera anns a' ghàidhlig
 #. Response to 'undo' action
 #: ../tools.h:139
 msgid "Undo!"
-msgstr "Mar a bha!"
+msgstr "Neo-dhèanta!"
 
-# Tha mi a creidsinn gun chuala mi an-seo àiteigin, ach chan eil mi cinnteach càite....
 #. Response to 'redo' action
 #: ../tools.h:142
-#, fuzzy
 msgid "Redo!"
-msgstr "Dèan a-rithist!"
+msgstr "Ath-dhèanta!"
 
 #. Eraser tool
 #: ../tools.h:145
 msgid "Eraser!"
-msgstr ""
+msgstr "Suathan!"
 
 #. Response to 'start a new image' action
 #: ../tools.h:148
 msgid "Pick a color or picture with which to start a new drawing."
-msgstr ""
+msgstr "Tagh dath no dealbh leis an do thòisicheas tu dealbh ùr."
 
 #. Response to 'open' action (while file dialog is being constructed)
 #: ../tools.h:151
 msgid "Open…"
-msgstr ""
+msgstr "Fosgail…"
 
 #. Response to 'save' action
 #: ../tools.h:154
 msgid "Your image has been saved!"
-msgstr ""
+msgstr "Chaidh an dealbh agad a shàbhaladh!"
 
-# Verb from
-# Opera anns a' ghàidhlig
-# Stòr-dàta (SMO)
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #. Response to 'print' action (while printing, or print dialog is being used)
 #: ../tools.h:157
 msgid "Printing…"
-msgstr "Clò-bhualadh..."
+msgstr "A' clò-bhualadh…"
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #. Response to 'quit' (exit) action
 #: ../tools.h:160
 msgid "Bye bye!"
-msgstr "Tìoraidh!"
+msgstr "Mar sin leat!"
 
 #. Instruction while using Line tool (after click, before release)
 #: ../tools.h:164
 msgid "Let go of the button to complete the line."
-msgstr ""
+msgstr "Leis às dhan phutan gus crìocha chur air an loidhne."
 
 #. Instruction while using Shape tool (after first click, before release)
 #: ../tools.h:167
 msgid "Hold the button to stretch the shape."
-msgstr ""
+msgstr "Fuirich air a' phutan gus an cumadh a shìneadh."
 
 #. Instruction while finishing Shape tool (after release, during rotation step before second click)
 #: ../tools.h:170
 msgid "Move the mouse to rotate the shape. Click to draw it."
-msgstr ""
+msgstr "Gluais an luchag gus car a chur air a' chumadh. Briog gus a pheantadh."
 
 #. Notification that 'New' action was aborted (current image would have been lost)
 #: ../tools.h:173
 msgid "OK then… Let’s keep drawing this one!"
-msgstr ""
+msgstr "OK ma-thà… Cumaidh sinn oirnn a' peantadh am fear seo!"
 
-# Gràmar?
-# Is this an appropriate form to use?
 #. Prompt to confirm user wishes to quit
 #: ../tuxpaint.c:1918
-#, fuzzy
 msgid "Do you really want to quit?"
-msgstr "A bheil thu ag iarraidh a falbh?"
+msgstr "Am bu mhiann leat am prògram seo fhàgail dha-rìribh?"
 
-# Neo-choileanta. (but functional)
 #. Quit prompt positive response (quit)
 #: ../tuxpaint.c:1921
-#, fuzzy
 msgid "Yes, I’m done!"
-msgstr "Tha."
+msgstr "Bu mhiann, tha mi deiseil!"
 
-# Neo-choileanta. (but functional)
 #. Quit prompt negative response (don't quit)
 #: ../tuxpaint.c:1924 ../tuxpaint.c:1951
-#, fuzzy
 msgid "No, take me back!"
-msgstr "Chan eil."
+msgstr "Chan bu mhiann, thoir air ais mi!"
 
 #. Current picture is not saved; user is quitting
 #: ../tuxpaint.c:1928
 msgid "If you quit, you’ll lose your picture! Save it?"
-msgstr ""
+msgstr "Ma dh'fhàgas tu an seo, caillidh tu an dealbh agad! An sàbhail sinn e?"
 
 #: ../tuxpaint.c:1929 ../tuxpaint.c:1934
 msgid "Yes, save it!"
-msgstr ""
+msgstr "Sàbhailidh gu dearbh!"
 
 #: ../tuxpaint.c:1930 ../tuxpaint.c:1935
 msgid "No, don’t bother saving!"
-msgstr ""
+msgstr "Cha shàbhail, na bodraig leis!"
 
 #. Current picture is not saved; user is opening another picture
 #: ../tuxpaint.c:1933
 msgid "Save your picture first?"
-msgstr ""
+msgstr "An sàbhail sinn an dealbh agad an toiseach?"
 
 #. Error opening picture
 #: ../tuxpaint.c:1938
 msgid "Can’t open that picture!"
-msgstr ""
+msgstr "Chan urrainn dhomh an dealbh seo fhosgladh!"
 
-# Opera anns a' ghàidhlig
 #. Generic dialog dismissal
 #: ../tuxpaint.c:1941 ../tuxpaint.c:1946 ../tuxpaint.c:1955 ../tuxpaint.c:1962
 #: ../tuxpaint.c:1971
@@ -633,699 +586,616 @@ msgstr "Ceart ma-thà"
 #. Notification that 'Open' dialog has nothing to show
 #: ../tuxpaint.c:1945
 msgid "There are no saved files!"
-msgstr ""
+msgstr "Chan eil dealbhan air an sàbhaladh ann!"
 
-# Gràmar?
-# Is it appropriate to rewrite such actions into the first person?
-# Verb from:
-# Stòr-dàta (SMO)
-# Opera anns a' ghàidhlig
 #. Verification of print action
 #: ../tuxpaint.c:1949
-#, fuzzy
 msgid "Print your picture now?"
-msgstr "An clò-bhuail mi an dealbh?"
+msgstr "An clò-bhuail mi an dealbh agad an-dràsta?"
 
-# Appropriate construction?
-# Verb from:
-# Stòr-dàta (SMO)
-# Opera anns a' ghàidhlig
 #: ../tuxpaint.c:1950
-#, fuzzy
 msgid "Yes, print it!"
-msgstr "Clò-bhuail!"
+msgstr "Clò-bhuail e!"
 
-# Gràmar?
-# Appropriate construction?
-# Verb from:
-# Stòr-dàta (SMO)
-# Opera anns a' ghàidhlig
 #. Confirmation of successful (we hope) printing
 #: ../tuxpaint.c:1954
-#, fuzzy
 msgid "Your picture has been printed!"
 msgstr "Chlò-bhuail mi an dealbh agad!"
 
-# Gràmar?
-# Appropriate construction?
-# Verb from:
-# Stòr-dàta (SMO)
-# Opera anns a' ghàidhlig
 #. We got an error printing
 #: ../tuxpaint.c:1958
-#, fuzzy
 msgid "Sorry! Your picture could not be printed!"
-msgstr "Chlò-bhuail mi an dealbh agad!"
+msgstr "Tha mi duilich! Cha do ghabh an dealbh agad clo-bhualadh!"
 
-# Gràmar?
-# I think that this message is only seen when you try to print a blank page. Am I right in thinking an-dràsta is a more suitable idiomatic translation than fhathast?
 #. Notification that it's too soon to print again (--printdelay option is in effect)
 #: ../tuxpaint.c:1961
 msgid "You can’t print yet!"
-msgstr "Chan urrain dhuit a chlò-bhualadh an-dràstah!"
+msgstr "Chan urrain dhut a chlò-bhualadh fhathast!"
 
 #. Prompt to confirm erasing a picture in the Open dialog
 #: ../tuxpaint.c:1965
 msgid "Erase this picture?"
-msgstr ""
+msgstr "An sguaib mi às dhan dealbh seo?"
 
 #: ../tuxpaint.c:1966
 msgid "Yes, erase it!"
-msgstr ""
+msgstr "Sguaibidh!"
 
 #: ../tuxpaint.c:1967
 msgid "No, don’t erase it!"
-msgstr ""
+msgstr "Cha sguaib!"
 
 #. Reminder that Mouse Button 1 is the button to use in Tux Paint
 #: ../tuxpaint.c:1970
 msgid "Remember to use the left mouse button!"
-msgstr ""
+msgstr "Cuimhnich gun cleachd thu putan clì na luchaige agad!"
 
 #. Sound has been muted (silenced) via keyboard shortcut
 #: ../tuxpaint.c:2567
 msgid "Sound muted."
-msgstr ""
+msgstr "Fuaim air a mhùchadh."
 
 #. Sound has been unmuted (unsilenced) via keyboard shortcut
 #: ../tuxpaint.c:2572
 msgid "Sound unmuted."
-msgstr ""
+msgstr "Fuaim air a neo-mhùchadh."
 
 #. Wait while Text tool finishes loading fonts
 #: ../tuxpaint.c:3355
 msgid "Please wait…"
-msgstr "Fuirich mionaid..."
+msgstr "Fuirich greiseag…"
 
 #. Open dialog: 'Erase' button, to erase/deleted the selected picture
 #: ../tuxpaint.c:7765
 msgid "Erase"
-msgstr ""
+msgstr "Sgudail"
 
 #. Open dialog: 'Slides' button, to switch to slide show mode
 #: ../tuxpaint.c:7768
 msgid "Slides"
-msgstr ""
+msgstr "Sleamhnagan"
 
 #. Open dialog: 'Back' button, to dismiss Open dialog without opening a picture
 #: ../tuxpaint.c:7771
 msgid "Back"
-msgstr ""
+msgstr "Air ais"
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
-# Opera anns a' Ghàidhlig
 #. Slideshow: 'Next' button, to load next slide (image)
 #: ../tuxpaint.c:7774
-#, fuzzy
 msgid "Next"
-msgstr "Teacsa"
+msgstr "Air adhart"
 
 #. Slideshow: 'Play' button, to begin a slideshow sequence
 #: ../tuxpaint.c:7777
 msgid "Play"
-msgstr ""
+msgstr "Cluich"
 
 #. Label for 'Letters' buttons (font selector, down the right when the Text tool is being used); used to show the difference between font faces
 #: ../tuxpaint.c:8485
 msgid "Aa"
-msgstr ""
+msgstr "Aa"
 
 #. Admittedly stupid way of determining which keys can be used for
 #. positive and negative responses in dialogs (e.g., [Y] (for 'yes') in English)
 #: ../tuxpaint.c:11730
 msgid "Yes"
-msgstr ""
+msgstr "Seadh"
 
 #: ../tuxpaint.c:11734
 msgid "No"
-msgstr ""
+msgstr "Chan eadh"
 
 #. Prompt to ask whether user wishes to save over old version of their file
 #: ../tuxpaint.c:12730
 msgid "Replace the picture with your changes?"
-msgstr ""
+msgstr "An cuir mi na h-atharrachaidhean ris an aon dealbh?"
 
 #. Positive response to saving over old version
 #. (like a 'File:Save' action in other applications)
 #: ../tuxpaint.c:12734
 msgid "Yes, replace the old one!"
-msgstr ""
+msgstr "Cuiridh, cuir an aite an seann fhear e!"
 
 #. Negative response to saving over old version (saves a new image)
 #. (like a 'File:Save As...' action in other applications)
 #: ../tuxpaint.c:12738
 msgid "No, save a new file!"
-msgstr ""
+msgstr "Cha chuir, sàbhail ann am faidhle ùr e!"
 
 #: ../tuxpaint.c:13963
 msgid "Choose the picture you want, then click “Open”."
-msgstr ""
+msgstr "Tagh an dealbh a tha thu ag iarraidh is briog air \"Fosgail\"."
 
 #. Let user choose images:
 #. Instructions for Slideshow file dialog (FIXME: Make a #define)
 #: ../tuxpaint.c:14976 ../tuxpaint.c:15290
 msgid "Choose the pictures you want, then click “Play”."
-msgstr ""
+msgstr "Tagh na dealbhan a tha thu ag iarraidh is briog air \"Cluich\"."
 
 #: ../tuxpaint.c:21524
 msgid "Pick a color."
-msgstr ""
+msgstr "Tagh dath."
 
-# Gràmar?
 #: ../tuxpaint.desktop.in.h:1
-#, fuzzy
 msgid "A drawing program for children."
-msgstr "Prògram dealbhan na chloinne."
+msgstr "Prògram peantaidh do chloinn."
 
-# Gràmar?
 #: ../tuxpaint.desktop.in.h:2
-#, fuzzy
 msgid "Drawing program"
-msgstr "Prògram dealbhan"
+msgstr "Prògram peantaidh"
 
-# How do you deal with a name like this? (In the genitive, no less!)
 #: ../tuxpaint.desktop.in.h:3
 msgid "Tux Paint"
-msgstr ""
+msgstr "Tux Paint"
 
 #: ../../magic/src/alien.c:64
 msgid "Color Shift"
-msgstr ""
+msgstr "Mùthadh datha"
 
-# Gràmar?
 #: ../../magic/src/alien.c:67
-#, fuzzy
 msgid "Click and move the mouse to change the colors in parts of your picture."
-msgstr "Briog agus slaod airson na breigichean beaga."
+msgstr ""
+"Briog is gluais an luchag gus car a chur air na dathan ann am pàirt dhen "
+"dealbh agad."
 
-# Gràmar?
 #: ../../magic/src/alien.c:68
-#, fuzzy
 msgid "Click to change the colors in your entire picture."
-msgstr "Briog agus slaod airson na breigichean beaga."
+msgstr "Briog gus na dathan san dealbh gu lèir atharrachadh."
 
 #: ../../magic/src/blind.c:92
 msgid "Blind"
-msgstr ""
+msgstr "Sgàil"
 
 #: ../../magic/src/blind.c:97
 msgid ""
 "Click towards the edge of your picture to pull window blinds over it. Move "
 "perpendicularly to open or close the blinds."
 msgstr ""
+"Briog faisg air oir an deilbh agad gus sgàilean-uinneig a shlaodadh thairis. "
+"Gluais gu dìreach gus an sgàilean fhosgladh is a dhùnadh."
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #: ../../magic/src/blocks_chalk_drip.c:132
 msgid "Blocks"
 msgstr "Blocaichean"
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #: ../../magic/src/blocks_chalk_drip.c:134
 msgid "Chalk"
 msgstr "Cailc"
 
 #: ../../magic/src/blocks_chalk_drip.c:136
 msgid "Drip"
-msgstr ""
+msgstr "Sil"
 
 #: ../../magic/src/blocks_chalk_drip.c:146
 msgid "Click and move the mouse around to make the picture blocky."
 msgstr ""
+"Briog is gluais an luchag mu thimcheall gus tèid an dealbh na bhlocaichean."
 
 #: ../../magic/src/blocks_chalk_drip.c:149
 msgid ""
 "Click and move the mouse around to turn the picture into a chalk drawing."
 msgstr ""
+"Briog is gluais an luchag mu thimcheall gus tèid an dealbh na dhealbh cailce."
 
 #: ../../magic/src/blocks_chalk_drip.c:152
 msgid "Click and move the mouse around to make the picture drip."
 msgstr ""
+"Briog is gluais an luchag mu thimcheall gus an dealbh a dhèanamh sileadh."
 
 #: ../../magic/src/blur.c:57
 msgid "Blur"
-msgstr ""
+msgstr "Sgleò"
 
-# Gràmar?
 #: ../../magic/src/blur.c:60
-#, fuzzy
 msgid "Click and move the mouse around to blur the image."
-msgstr "Briog agus slaod airson na breigichean beaga."
+msgstr ""
+"Briog is gluais an luchag mu thimcheall gus sgleò a chur air an dealbh."
 
-# Gràmar?
-# Is the word "lainnir" appropriate/common?
 #: ../../magic/src/blur.c:61
-#, fuzzy
 msgid "Click to blur the entire image."
-msgstr "Briog agus slaod airson lainnir a dhèanamh dealbh."
+msgstr "Briog gus sgleò a chur air an dealbh gu lèir."
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #. Both are named "Bricks", at the moment:
 #: ../../magic/src/bricks.c:104
 msgid "Bricks"
 msgstr "Breigichean"
 
-# Gràmar?
 #: ../../magic/src/bricks.c:111
-#, fuzzy
 msgid "Click and move to draw large bricks."
-msgstr "Briog agus slaod airson na breigichean móra a dhèanamh dealbh."
+msgstr ""
+"Briog is gluais an luchag mu thimcheall gus tèid an dealbh na bhreigichean "
+"mòra."
 
-# Gràmar?
 #: ../../magic/src/bricks.c:113
-#, fuzzy
 msgid "Click and move to draw small bricks."
-msgstr "Briog agus slaod airson na breigichean beaga."
+msgstr ""
+"Briog is gluais an luchag mu thimcheall gus tèid an dealbh na bhreigichean "
+"beaga."
 
 #: ../../magic/src/calligraphy.c:108
 msgid "Calligraphy"
-msgstr ""
+msgstr "Snas-sgrìobhadh"
 
-# Gràmar?
 #: ../../magic/src/calligraphy.c:115
-#, fuzzy
 msgid "Click and move the mouse around to draw in calligraphy."
-msgstr "Briog agus slaod airson na breigichean beaga."
+msgstr ""
+"Briog is gluais an luchag mu thimcheall gus peantadh ann an stoidhle snasail."
 
 #: ../../magic/src/cartoon.c:80
 msgid "Cartoon"
-msgstr ""
+msgstr "Cartùn"
 
 #: ../../magic/src/cartoon.c:87
 msgid "Click and move the mouse around to turn the picture into a cartoon."
-msgstr ""
+msgstr "Briog is gluais an luchag mu thimcheall gus tèid an dealbh na chartùn."
 
 #: ../../magic/src/confetti.c:63
 msgid "Confetti"
-msgstr ""
+msgstr "Confeataidh"
 
 #: ../../magic/src/confetti.c:65
 msgid "Click to throw confetti!"
-msgstr ""
+msgstr "Briog gus confeataidh a thilgeil!"
 
 #: ../../magic/src/distortion.c:121
 msgid "Distortion"
-msgstr ""
+msgstr "Mì-dhealbhadh"
 
-# Gràmar?
-# Is the word "lainnir" appropriate/common?
 #: ../../magic/src/distortion.c:129
-#, fuzzy
 msgid "Click and drag the mouse to cause distortion in your picture."
-msgstr "Briog agus slaod airson lainnir a dhèanamh dealbh."
+msgstr "Briog is gluais an luchag gus mì-dhealbhadh a chur air an dealbh agad."
 
 #: ../../magic/src/emboss.c:76
 msgid "Emboss"
-msgstr ""
+msgstr "Copanaich"
 
 #: ../../magic/src/emboss.c:82
 msgid "Click and drag the mouse to emboss the picture."
-msgstr ""
+msgstr "Briog is gluais an luchag gus copanaich a chur air an dealbh agad."
 
 #: ../../magic/src/fade_darken.c:119
 msgid "Lighten"
-msgstr ""
+msgstr "Soilleir"
 
 #: ../../magic/src/fade_darken.c:121
 msgid "Darken"
-msgstr ""
+msgstr "Dorch"
 
-# Gràmar?
 #: ../../magic/src/fade_darken.c:132
-#, fuzzy
 msgid "Click and move the mouse to lighten parts of your picture."
-msgstr "Briog agus slaod airson na breigichean beaga."
+msgstr ""
+"Briog is gluais an luchag gus pàirt dhen dealbh agad a dhèanamh nas "
+"soilleire."
 
-# Gràmar?
-# Is the word "lainnir" appropriate/common?
 #: ../../magic/src/fade_darken.c:134
-#, fuzzy
 msgid "Click to lighten your entire picture."
-msgstr "Briog agus slaod airson lainnir a dhèanamh dealbh."
+msgstr ""
+"Briog is gluais an luchag gus an dealbh gu lèir a dhèanamh nas soilleire."
 
-# Gràmar?
-# Is the word "lainnir" appropriate/common?
 #: ../../magic/src/fade_darken.c:139
-#, fuzzy
 msgid "Click and move the mouse to darken parts of your picture."
-msgstr "Briog agus slaod airson lainnir a dhèanamh dealbh."
+msgstr ""
+"Briog is gluais an luchag gus pàirt dhen dealbh agad a dhèanamh nas duirche."
 
 #: ../../magic/src/fade_darken.c:141
 msgid "Click to darken your entire picture."
 msgstr ""
+"Briog is gluais an luchag gus an dealbh gu lèir a dhèanamh nas duirche."
 
 #: ../../magic/src/fill.c:87
 msgid "Fill"
-msgstr ""
+msgstr "Lìon"
 
-# Gràmar?
 #: ../../magic/src/fill.c:94
-#, fuzzy
 msgid "Click in the picture to fill that area with color."
-msgstr "Briog anns a' dhealbh airson lìon le dath."
+msgstr "Briog anns an dealbh gus roinn a lìonadh le dath."
 
 #: ../../magic/src/fisheye.c:78
 msgid "Fisheye"
-msgstr ""
+msgstr "Sùil èisg"
 
 #. Needs better name
 #: ../../magic/src/fisheye.c:80
 msgid "Click on part of your picture to create a fisheye effect."
-msgstr ""
+msgstr "Briog air pairt dhen dealbh agad gus buaidh sùil èisg a chruthachadh."
 
 #: ../../magic/src/flower.c:124
 msgid "Flower"
-msgstr ""
+msgstr "Flùr"
 
 #: ../../magic/src/flower.c:130
 msgid "Click and drag to draw a flower stalk. Let go to finish the flower."
 msgstr ""
+"Briog is slaod gus cuiseag flùir a pheantadh. Leig às gus crìoch a chur air "
+"an fhlùir."
 
 #: ../../magic/src/foam.c:104
 msgid "Foam"
-msgstr ""
+msgstr "Cop"
 
-# Gràmar?
 #: ../../magic/src/foam.c:110
-#, fuzzy
 msgid "Click and drag the mouse to cover an area with foamy bubbles."
-msgstr "Briog anns a' dhealbh airson lìon le dath."
+msgstr ""
+"Briog is slaod an luchag gus roinn a chòmhdachadh le builgeanan copach."
 
 #: ../../magic/src/fold.c:84
 msgid "Fold"
-msgstr ""
+msgstr "Paisg"
 
 #: ../../magic/src/fold.c:86
 msgid ""
 "Choose a background color and click to turn the corner of the page over."
-msgstr ""
+msgstr "Tagh dath cùlaibh is briog gus oisean na duilleige a phasgadh."
 
 #: ../../magic/src/glasstile.c:83
 msgid "Glass Tile"
-msgstr ""
+msgstr "Leac ghlainne"
 
 #: ../../magic/src/glasstile.c:90
 msgid "Click and drag the mouse to put glass tile over your picture."
 msgstr ""
+"Briog is slaod an luchag gus pàirt dhen dealbh agad a chòmhdachadh le "
+"leacagan glainne."
 
 #: ../../magic/src/glasstile.c:92
 msgid "Click to cover your entire picture in glass tiles."
 msgstr ""
+"Briog is slaod an luchag gus an dealbh gu lèir a chòmhdachadh le leacagan "
+"glainne."
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #: ../../magic/src/grass.c:92
 msgid "Grass"
 msgstr "Feur"
 
-# Gràmar?
 #: ../../magic/src/grass.c:98
-#, fuzzy
 msgid "Click and move to draw grass. Don’t forget the dirt!"
-msgstr "Briog agus slaod airson feur a dhèanamh dealbh."
+msgstr "Briog is slaod gus feur a pheantadh. Na dìochuimhnich an talamh!"
 
 #: ../../magic/src/kalidescope.c:90
 msgid "Symmetric Left/Right"
-msgstr ""
+msgstr "Co-chothromach clì/deas"
 
 #: ../../magic/src/kalidescope.c:92
 msgid "Symmetric Up/Down"
-msgstr ""
+msgstr "Co-chothromach bàrr/bonn"
 
 #. KAL_BOTH
 #: ../../magic/src/kalidescope.c:94
 msgid "Kaleidoscope"
-msgstr ""
+msgstr "Kaleidoskop"
 
-# Gràmar?
 #: ../../magic/src/kalidescope.c:102
-#, fuzzy
 msgid ""
 "Click and drag the mouse to draw with two brushes that are symmetric across "
 "the left and right of your picture."
-msgstr "Briog anns a' dhealbh airson lìon le dath."
+msgstr ""
+"Briog is slaod an luachag gus peantadh le dà bhruis a tha co-chothromach a "
+"dh'ionnsaigh taobh deas is clì an deilbh agad."
 
-# Gràmar?
 #: ../../magic/src/kalidescope.c:104
-#, fuzzy
 msgid ""
 "Click and drag the mouse to draw with two brushes that are symmetric across "
 "the top and bottom of your picture."
-msgstr "Briog anns a' dhealbh airson lìon le dath."
+msgstr ""
+"Briog is slaod an luachag gus peantadh le dà bhruis a tha co-chothromach a "
+"dh'ionnsaigh bàrr is bonn an deilbh agad."
 
-# Gràmar?
 #. KAL_BOTH
 #: ../../magic/src/kalidescope.c:106
-#, fuzzy
 msgid ""
 "Click and drag the mouse to draw with symmetric brushes (a kaleidoscope)."
-msgstr "Briog anns a' dhealbh airson lìon le dath."
+msgstr ""
+"Briog is slaod an luachag gus peantadh le dà bhruis a tha co-chothromach "
+"(kaleidoscop)."
 
 #: ../../magic/src/light.c:84
 msgid "Light"
-msgstr ""
+msgstr "Lòchran"
 
-# Gràmar?
-# Is the word "lainnir" appropriate/common?
 #: ../../magic/src/light.c:90
-#, fuzzy
 msgid "Click and drag to draw a beam of light on your picture."
-msgstr "Briog agus slaod airson lainnir a dhèanamh dealbh."
+msgstr "Briog is slaod gus biollsgeadh lòchrain a pheantadh air dealbh agad."
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #: ../../magic/src/metalpaint.c:77
-#, fuzzy
 msgid "Metal Paint"
-msgstr "Peant"
+msgstr "Meatailt"
 
-# Gràmar?
 #: ../../magic/src/metalpaint.c:83
-#, fuzzy
 msgid "Click and drag the mouse to paint with a metallic color."
-msgstr "Briog anns a' dhealbh airson lìon le dath."
+msgstr "Briog is slaod an luchag gus peantadh le dath meatailt."
 
-# I was going to look for a verb, but the majority of the tools in the magic menu are nouns, so I though sgàthan was appropriate.
 #: ../../magic/src/mirror_flip.c:94
 msgid "Mirror"
 msgstr "Sgàthan"
 
-# Not too happy with this one -- the best match in TY Gaelic Dictionary.
-# It's an adjective and an adverb, but everything else in the toolbox is a verb or noun....
 #: ../../magic/src/mirror_flip.c:96
-#, fuzzy
 msgid "Flip"
-msgstr "Bun-os-cionn"
+msgstr "Bun as cionn"
 
 #: ../../magic/src/mirror_flip.c:106
 msgid "Click to make a mirror image."
-msgstr ""
+msgstr "Briog gus dealbh sgàthain a dhèanamh dheth."
 
 #: ../../magic/src/mirror_flip.c:109
 msgid "Click to flip the picture upside-down."
-msgstr ""
+msgstr "Briog gus an dèalabh a thoirt bun as cionn."
 
 #: ../../magic/src/mosaic.c:75
 msgid "Mosaic"
-msgstr ""
+msgstr "Mosàig"
 
-# Gràmar?
 #: ../../magic/src/mosaic.c:78
-#, fuzzy
 msgid ""
 "Click and move the mouse to add a mosaic effect to parts of your picture."
-msgstr "Briog agus slaod airson na breigichean beaga."
+msgstr ""
+"Briog is slaod an luchag gus buaidh mosàig a chur ri pàirt dhen dealbh agad."
 
-# Gràmar?
 #: ../../magic/src/mosaic.c:79
-#, fuzzy
 msgid "Click to add a mosaic effect to your entire picture."
-msgstr "Briog agus slaod airson na breigichean beaga."
+msgstr ""
+"Briog is slaod an luchag gus buaidh mosàig a chur ris an dealbh gu lèir."
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #: ../../magic/src/mosaic_shaped.c:134
-#, fuzzy
-#| msgid "Square"
 msgid "Square Mosaic"
-msgstr "Ceàrnag"
+msgstr "Mosàig cheàrnach"
 
 #: ../../magic/src/mosaic_shaped.c:135
 msgid "Hexagon Mosaic"
-msgstr ""
+msgstr "Mosàig shia-cheàrnach"
 
 #: ../../magic/src/mosaic_shaped.c:136
 msgid "Irregular Mosaic"
-msgstr ""
+msgstr "Mosaic neo-rìaghailteach"
 
-# Gràmar?
 #: ../../magic/src/mosaic_shaped.c:141
-#, fuzzy
 msgid ""
 "Click and move the mouse to add a square mosaic to parts of your picture."
-msgstr "Briog agus slaod airson na breigichean beaga."
+msgstr ""
+"Briog is slaod an luchag gus buaidh mosàig cheàrnach a chur ri pàirt dhen "
+"dealbh agad."
 
-# Gràmar?
 #: ../../magic/src/mosaic_shaped.c:142
-#, fuzzy
 msgid "Click to add a square mosaic to your entire picture."
-msgstr "Briog agus slaod airson na breigichean beaga."
+msgstr ""
+"Briog is slaod an luchag gus buaidh mosàig cheàrnach a chur ris an dealbh gu "
+"lèir."
 
-# Gràmar?
 #: ../../magic/src/mosaic_shaped.c:144
-#, fuzzy
 msgid ""
 "Click and move the mouse to add a hexagonal mosaic to parts of your picture."
-msgstr "Briog agus slaod airson na breigichean beaga."
+msgstr ""
+"Briog is slaod an luchag gus buaidh mosàig sia-cheàrnach a chur ri pàirt "
+"dhen dealbh agad."
 
-# Gràmar?
 #: ../../magic/src/mosaic_shaped.c:145
-#, fuzzy
 msgid "Click to add a hexagonal mosaic to your entire picture."
-msgstr "Briog agus slaod airson na breigichean beaga."
+msgstr ""
+"Briog is slaod an luchag gus buaidh mosàig shia-cheàrnach a chur ris an "
+"dealbh gu lèir."
 
-# Gràmar?
 #: ../../magic/src/mosaic_shaped.c:147
-#, fuzzy
 msgid ""
 "Click and move the mouse to add an irregular mosaic to parts of your picture."
-msgstr "Briog agus slaod airson na breigichean beaga."
+msgstr ""
+"Briog is slaod an luchag gus buaidh mosàig neo-rìaghailteach a chur ri pàirt "
+"dhen dealbh agad."
 
-# Gràmar?
 #: ../../magic/src/mosaic_shaped.c:148
-#, fuzzy
 msgid "Click to add an irregular mosaic to your entire picture."
-msgstr "Briog agus slaod airson na breigichean beaga."
+msgstr ""
+"Briog is slaod an luchag gus buaidh mosàig neo-riaghailteach a chur ris an "
+"dealbh gu lèir."
 
 #: ../../magic/src/negative.c:72
 msgid "Negative"
-msgstr ""
+msgstr "Claon-chlò"
 
-# Gràmar?
 #: ../../magic/src/negative.c:80
-#, fuzzy
 msgid "Click and move the mouse around to make your painting negative."
-msgstr "Briog agus slaod airson na breigichean beaga."
+msgstr ""
+"Briog is slaod an luchag gus claon-chlò a chur ri pàirt dhen dealbh agad."
 
-# Gràmar?
 #: ../../magic/src/negative.c:83
-#, fuzzy
 msgid "Click to turn your painting into its negative."
-msgstr "Briog agus slaod airson na breigichean beaga."
+msgstr "Briog is slaod an luchag gus claon-chlò a chur ris an dealbh gu lèir."
 
 #: ../../magic/src/noise.c:63
 msgid "Noise"
-msgstr ""
+msgstr "Riasladh"
 
-# Gràmar?
-# Is the word "lainnir" appropriate/common?
 #: ../../magic/src/noise.c:66
-#, fuzzy
 msgid "Click and move the mouse to add noise to parts of your picture."
-msgstr "Briog agus slaod airson lainnir a dhèanamh dealbh."
+msgstr ""
+"Briog is slaod an luchag gus riasladh a thoirt air pàirt dhen dealbh agad."
 
-# Gràmar?
 #: ../../magic/src/noise.c:67
-#, fuzzy
 msgid "Click to add noise to your entire picture."
-msgstr "Briog agus slaod airson na breigichean beaga."
+msgstr "Briog is slaod an luchag gus riasladh a thoirt air an dealbh gu lèir."
 
 #: ../../magic/src/perspective.c:145
 msgid "Perspective"
-msgstr ""
+msgstr "Buaidh-astair"
 
 #: ../../magic/src/perspective.c:146
 msgid "Zoom"
-msgstr ""
+msgstr "Sùm"
 
-# Gràmar?
 #: ../../magic/src/perspective.c:151
-#, fuzzy
 msgid "Click on the corners and drag where you want to stretch the picture."
-msgstr "Briog agus slaod airson na breigichean beaga."
+msgstr ""
+"Briog air na h-oisean is slaod iad gu far a bheil thu ag iarraidh an dealbh "
+"a shìneadh."
 
-# Gràmar?
 #: ../../magic/src/perspective.c:154
-#, fuzzy
 msgid "Click and drag up to zoom in or drag down to zoom out the picture."
-msgstr "Briog agus slaod airson na breigichean beaga."
+msgstr ""
+"Briog is slaod suas airson sùm a-steach dhan dealbh no sìos airson sùm a-"
+"mach às an dealbh"
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #: ../../magic/src/puzzle.c:79
-#, fuzzy
 msgid "Puzzle"
-msgstr "Purpaidh!"
+msgstr "Toimhseachan!"
 
-# Gràmar?
 #: ../../magic/src/puzzle.c:86
-#, fuzzy
 msgid "Click the part of your picture where would you like a puzzle."
-msgstr "Briog agus slaod airson na breigichean beaga."
+msgstr "Briog air an dealbh far a bheil thu ag iarraidh toimhseachan."
 
 #: ../../magic/src/puzzle.c:87
 msgid "Click to make a puzzle in fullscreen mode."
-msgstr ""
+msgstr "Briog toimhseachan a dhèanamh làn-sgrìn."
 
 #: ../../magic/src/rails.c:101
 msgid "Rails"
-msgstr ""
+msgstr "Rèilichean"
 
-# Gràmar?
-# Is the word "lainnir" appropriate/common?
 #: ../../magic/src/rails.c:103
-#, fuzzy
 msgid "Click and drag to draw train track rails on your picture."
-msgstr "Briog agus slaod airson lainnir a dhèanamh dealbh."
+msgstr ""
+"Briog is slaod gus rèilichean rathaid-iarainn a pheantadh air an dealbh agad."
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #: ../../magic/src/rainbow.c:107
 msgid "Rainbow"
 msgstr "Bogha-froise"
 
-# Gràmar?
 #: ../../magic/src/rainbow.c:114
 msgid "You can draw in rainbow colors!"
-msgstr "'S urrain dhuit a peantadh le uile dathan na bogha-froise!"
+msgstr "'S urrain dhut peantadh le dathan na bogha-froise!"
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #: ../../magic/src/rain.c:65
-#, fuzzy
 msgid "Rain"
-msgstr "Bogha-froise"
+msgstr "Uisge"
 
-# Gràmar?
 #: ../../magic/src/rain.c:68
-#, fuzzy
 msgid "Click to place a rain drop onto your picture."
-msgstr "Briog agus slaod airson na breigichean beaga."
+msgstr "Briog gus druthag uisge a chur air sn dealbh agad."
 
 #: ../../magic/src/rain.c:69
 msgid "Click to cover your picture with rain drops."
-msgstr ""
+msgstr "Briog gus an dealbh agad a còmhdachadh le druthagan uisge."
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #: ../../magic/src/realrainbow.c:86
-#, fuzzy
-#| msgid "Rainbow"
 msgid "Real Rainbow"
-msgstr "Bogha-froise"
+msgstr "Fìor bhogha-froise"
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #: ../../magic/src/realrainbow.c:88
-#, fuzzy
-#| msgid "Rainbow"
 msgid "ROYGBIV Rainbow"
-msgstr "Bogha-froise"
+msgstr ""
 
 #: ../../magic/src/realrainbow.c:93
 msgid ""
 "Click where you want your rainbow to start, drag to where you want it to "
 "end, and then let go to draw a rainbow."
 msgstr ""
+"Briog gus bogha-froise a thòiseachadh, slaod gu far a bheil thu ag iarraidh "
+"a chrìochnachadh is leig às."
 
 #: ../../magic/src/ripples.c:81
 msgid "Ripples"
-msgstr ""
+msgstr "Frith-thonn"
 
 #: ../../magic/src/ripples.c:87
 msgid "Click to make ripples appear over your picture."
-msgstr ""
+msgstr "Briog gus an nochd frith-thonnan air an dealbh agad."
 
 #: ../../magic/src/rosette.c:93
 msgid "Rosette"
@@ -1333,235 +1203,200 @@ msgstr ""
 
 #: ../../magic/src/rosette.c:93
 msgid "Picasso"
-msgstr ""
+msgstr "Picasso"
 
-# Gràmar?
-# Is the word "lainnir" appropriate/common?
 #: ../../magic/src/rosette.c:98
-#, fuzzy
 msgid "Click and start drawing your rosette."
-msgstr "Briog agus slaod airson lainnir a dhèanamh dealbh."
+msgstr "Briog is slaod gus rosette a pheantadh."
 
-# Gràmar?
 #: ../../magic/src/rosette.c:100
-#, fuzzy
 msgid "You can draw just like Picasso!"
-msgstr "'S urrain dhuit a peantadh le uile dathan na bogha-froise!"
+msgstr "'S urrain dhut peantadh mar Phicasso!"
 
 #: ../../magic/src/sharpen.c:73
 msgid "Edges"
-msgstr ""
+msgstr "Oirean"
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #: ../../magic/src/sharpen.c:74
-#, fuzzy
 msgid "Sharpen"
-msgstr "Cumaidhean"
+msgstr "Bioraich"
 
 #: ../../magic/src/sharpen.c:75
 msgid "Silhouette"
-msgstr ""
+msgstr "Sgàil-riochd"
 
-# Gràmar?
-# Is the word "lainnir" appropriate/common?
 #: ../../magic/src/sharpen.c:78
-#, fuzzy
 msgid "Click and move the mouse to trace edges in parts of your picture."
-msgstr "Briog agus slaod airson lainnir a dhèanamh dealbh."
+msgstr "Briog is slaod gus oirean a nochdadh ann am pàirt dhen dealbh agad."
 
-# Gràmar?
-# Is the word "lainnir" appropriate/common?
 #: ../../magic/src/sharpen.c:79
-#, fuzzy
 msgid "Click to trace edges in your entire picture."
-msgstr "Briog agus slaod airson lainnir a dhèanamh dealbh."
+msgstr "Briog is slaod gus oirean a nochdadh san dealbh gu lèir."
 
-# Gràmar?
-# Is the word "lainnir" appropriate/common?
 #: ../../magic/src/sharpen.c:80
-#, fuzzy
 msgid "Click and move the mouse to sharpen parts of your picture."
-msgstr "Briog agus slaod airson lainnir a dhèanamh dealbh."
+msgstr "Briog is slaod gus pàirt dhen dealbh agad a bhiorachadh."
 
-# Gràmar?
 #: ../../magic/src/sharpen.c:81
-#, fuzzy
 msgid "Click to sharpen the entire picture."
-msgstr "Briog agus slaod airson na breigichean beaga."
+msgstr "Briog is slaod gus an dealbh gu lèir a bhiorachadh."
 
-# Gràmar?
 #: ../../magic/src/sharpen.c:82
-#, fuzzy
 msgid "Click and move the mouse to create a black and white silhouette."
-msgstr "Briog agus slaod airson na breigichean beaga."
+msgstr "Briog is slaod an luchag gus sgàil-riochd dubh is geal a chruthachadh."
 
-# Gràmar?
 #: ../../magic/src/sharpen.c:83
-#, fuzzy
 msgid "Click to create a black and white silhouette of your entire picture."
-msgstr "Briog agus slaod airson na breigichean beaga."
+msgstr "Briog gus an tèid an dealbh gu lèir na sgàil-riochd."
 
 #: ../../magic/src/shift.c:104
 msgid "Shift"
-msgstr ""
+msgstr "Gluais"
 
 #: ../../magic/src/shift.c:110
 msgid "Click and drag to shift your picture around on the canvas."
 msgstr ""
+"Briog is slaod gus an dealbh agad a ghluasad mu thimcheall a' chanabhais."
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #: ../../magic/src/smudge.c:83
 msgid "Smudge"
 msgstr "Smalaich"
 
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
 #. if (which == 1)
 #: ../../magic/src/smudge.c:85
-#, fuzzy
 msgid "Wet Paint"
-msgstr "Peant"
+msgstr "Peant fliuch"
 
 #: ../../magic/src/smudge.c:92
 msgid "Click and move the mouse around to smudge the picture."
-msgstr ""
+msgstr "Briog is gluais an luchag mu thimcheall gus an dealbh a smalachadh."
 
-# Gràmar?
 #. if (which == 1)
 #: ../../magic/src/smudge.c:94
-#, fuzzy
 msgid "Click and move the mouse around to draw with wet, smudgy paint."
-msgstr "Briog agus slaod airson na breigichean beaga."
+msgstr ""
+"Briog is gluais an luchag mu thimcheall gus peantadh le peant fliuch is "
+"smeurach."
 
 #: ../../magic/src/snow.c:68
 msgid "Snow Ball"
-msgstr ""
+msgstr "Bàla sneachda"
 
 #: ../../magic/src/snow.c:69
 msgid "Snow Flake"
-msgstr ""
+msgstr "Bleideag"
 
-# Gràmar?
-# Is the word "lainnir" appropriate/common?
 #: ../../magic/src/snow.c:72
-#, fuzzy
 msgid "Click to add snow balls to your picture."
-msgstr "Briog agus slaod airson lainnir a dhèanamh dealbh."
+msgstr "Briog gus bàlaichean sneachda a chur ris an dealbh agad."
 
-# Gràmar?
-# Is the word "lainnir" appropriate/common?
 #: ../../magic/src/snow.c:73
-#, fuzzy
 msgid "Click to add snow flakes to your picture."
-msgstr "Briog agus slaod airson lainnir a dhèanamh dealbh."
+msgstr "Briog gus bleideagan a chur ris an dealbh agad."
 
 #: ../../magic/src/string.c:120
 msgid "String edges"
-msgstr ""
+msgstr "Teud - oir"
 
 #: ../../magic/src/string.c:123
 msgid "String corner"
-msgstr ""
+msgstr "Teud - oisean"
 
 #: ../../magic/src/string.c:126
 msgid "String 'V'"
-msgstr ""
+msgstr "Teud - saighead"
 
 #: ../../magic/src/string.c:134
 msgid ""
 "Click and drag to draw string art. Drag top-bottom to draw less or more "
 "lines, left or right to make a bigger hole."
 msgstr ""
+"Briog is slaod gus ealain teuda a pheantadh. Slaod suas is sìos airson "
+"barrachd no nas lugha de loidhnichean, is gu clì no deas airson toll nas "
+"motha no nas lugha."
 
-# Gràmar?
-# Is the word "lainnir" appropriate/common?
 #: ../../magic/src/string.c:137
-#, fuzzy
 msgid "Click and drag to draw arrows made of string art."
-msgstr "Briog agus slaod airson lainnir a dhèanamh dealbh."
+msgstr "Briog is slaod gus saigheadan de dh'ealain teuda a pheantadh."
 
 #: ../../magic/src/string.c:140
 msgid "Draw string art arrows with free angles."
-msgstr ""
+msgstr "Briog is slaod gus saigheadan le ceàrnan saora a pheantadh."
 
 #: ../../magic/src/tint.c:71
 msgid "Tint"
-msgstr ""
+msgstr "Dathadh"
 
 #: ../../magic/src/tint.c:72
 msgid "Color & White"
-msgstr ""
+msgstr "Dath ┐ geal"
 
-# Gràmar?
 #: ../../magic/src/tint.c:75
-#, fuzzy
 msgid ""
 "Click and move the mouse around to change the color of parts of your picture."
-msgstr "Briog agus slaod airson na breigichean beaga."
+msgstr ""
+"Briog is gluais an luchag mu thimcheall gus na dathan ann am pàirt dhen "
+"dealbh agad atharrachadh."
 
-# Gràmar?
 #: ../../magic/src/tint.c:76
-#, fuzzy
 msgid "Click to change the color of your entire picture."
-msgstr "Briog agus slaod airson na breigichean beaga."
+msgstr "Briog gus an dath atharrachadh san dealbh gu lèir."
 
-# Gràmar?
 #: ../../magic/src/tint.c:77
-#, fuzzy
 msgid ""
 "Click and move the mouse around to turn parts of your picture into white and "
 "a color you choose."
-msgstr "Briog agus slaod airson na breigichean beaga."
+msgstr ""
+"Briog is slaod an luchag mu thimcheall gus pàirt dhen dealbh agad a "
+"thionndadh tu geal is dath a thaghas tu."
 
-# Gràmar?
 #: ../../magic/src/tint.c:78
-#, fuzzy
 msgid "Click to turn your entire picture into white and a color you choose."
-msgstr "Briog agus slaod airson na breigichean beaga."
+msgstr ""
+"Briog gus pàirt an dealbh gu lèir a thionndadh tu geal is dath a thaghas tu."
 
 #: ../../magic/src/toothpaste.c:65
 msgid "Toothpaste"
-msgstr ""
+msgstr "Uachdar fhiaclan"
 
-# Gràmar?
 #: ../../magic/src/toothpaste.c:68
-#, fuzzy
 msgid "Click and drag to squirt toothpaste onto your picture."
-msgstr "Briog agus slaod airson na breigichean beaga."
+msgstr "Briog is slaod gus uachdar fhiaclan a spùtadh air an dealbh agad."
 
 #: ../../magic/src/tornado.c:127
 msgid "Tornado"
-msgstr ""
+msgstr "Gailleann"
 
-# Gràmar?
 # Is the word "lainnir" appropriate/common?
 #: ../../magic/src/tornado.c:133
-#, fuzzy
 msgid "Click and drag to draw a tornado funnel on your picture."
-msgstr "Briog agus slaod airson lainnir a dhèanamh dealbh."
+msgstr "Briog is slaod gus fuinneall gaillinn a pheantadh air an dealbh agad."
 
 #: ../../magic/src/tv.c:74
 msgid "TV"
-msgstr ""
+msgstr "TBh"
 
-# Gràmar?
 #: ../../magic/src/tv.c:79
-#, fuzzy
 msgid ""
 "Click and drag to make parts of your picture look like they are on "
 "television."
-msgstr "Briog agus slaod airson na breigichean beaga."
+msgstr ""
+"Briog is slaod gus coltas a thoirt air pàirt dhen dealbh agad nam b' ann air "
+"an tbh a bhiodh iad."
 
 #: ../../magic/src/tv.c:82
 msgid "Click to make your picture look like it's on television."
 msgstr ""
+"Briog  gus coltas a thoirt air an dealbh agad nam b' ann air an tbh a bhiodh "
+"e."
 
 #: ../../magic/src/waves.c:80
 msgid "Waves"
-msgstr ""
+msgstr "Stuadhan"
 
 #: ../../magic/src/waves.c:81
 msgid "Wavelets"
-msgstr ""
+msgstr "Tonnagan"
 
 #: ../../magic/src/waves.c:88
 msgid ""
@@ -1569,6 +1404,9 @@ msgid ""
 "shorter waves, the bottom for taller waves, the left for small waves, and "
 "the right for long waves."
 msgstr ""
+"Briog gus an tèid an dealbh agad na thonnan còmhnard. Briog mun bhàrr airson "
+"thonnan as giorra, mun bhonn airson thonnan as àirde, mu chlì airson thonnan "
+"as lugha, is mu dheas airson thonnan as fhaide."
 
 #: ../../magic/src/waves.c:89
 msgid ""
@@ -1576,83 +1414,6 @@ msgid ""
 "waves, the bottom for taller waves, the left for small waves, and the right "
 "for long waves."
 msgstr ""
-
-# Gràmar?
-# Is the word "lainnir" appropriate/common?
-#, fuzzy
-#~ msgid ""
-#~ "Click and drag to draw the blind, move left or right to open or close."
-#~ msgstr "Briog agus slaod airson lainnir a dhèanamh dealbh."
-
-# Gràmar?
-#, fuzzy
-#~ msgid ""
-#~ "Click and move the mouse to add a mosaic squared effect to parts of your "
-#~ "picture."
-#~ msgstr "Briog agus slaod airson na breigichean beaga."
-
-# Gràmar?
-#, fuzzy
-#~ msgid "Click to add a mosaic squared effect to your entire picture."
-#~ msgstr "Briog agus slaod airson na breigichean beaga."
-
-# Gràmar?
-#, fuzzy
-#~ msgid ""
-#~ "Click and move the mouse to add a mosaic hexagonal effect to parts of "
-#~ "your picture."
-#~ msgstr "Briog agus slaod airson na breigichean beaga."
-
-# Gràmar?
-#, fuzzy
-#~ msgid "Click to add a mosaic hexagonal effect to your entire picture."
-#~ msgstr "Briog agus slaod airson na breigichean beaga."
-
-# Gràmar?
-# Is the word "lainnir" appropriate/common?
-#, fuzzy
-#~ msgid "Click and drag to draw string art aligned to the edges."
-#~ msgstr "Briog agus slaod airson lainnir a dhèanamh dealbh."
-
-# Gràmar?
-# Is the word "lainnir" appropriate/common?
-#, fuzzy
-#~ msgid ""
-#~ "Click and drag to draw a tornado stalk. Let go to finish the tornado."
-#~ msgstr "Briog agus slaod airson lainnir a dhèanamh dealbh."
-
-# Gràmar?
-#, fuzzy
-#~ msgid "Click to give your entire picture an \"alien\" appearance."
-#~ msgstr "Briog agus slaod airson na breigichean beaga."
-
-# Gràmar?
-#, fuzzy
-#~ msgid "Click and move the mouse to add noise to the image."
-#~ msgstr "Briog agus slaod airson na breigichean beaga."
-
-# Gràmar?
-#, fuzzy
-#~ msgid "Click and move the mouse to trace the edges of objects in the image."
-#~ msgstr "Briog agus slaod airson na breigichean beaga."
-
-# Gràmar?
-#, fuzzy
-#~ msgid "Click and move the mouse to sharpen the image."
-#~ msgstr "Briog agus slaod airson na breigichean beaga."
-
-# Gràmar?
-#, fuzzy
-#~ msgid "Click to add snow to the entire image."
-#~ msgstr "Briog agus slaod airson na breigichean beaga."
-
-# Gràmar?
-#, fuzzy
-#~ msgid "Click and move the mouse around convert the image to greyscale."
-#~ msgstr "Briog agus slaod airson na breigichean beaga."
-
-# Is this word appropriate/common?
-# Teach Yourself Gaelic Dictionary: Boyd Robertson & Ian Taylor
-#, fuzzy
-#~ msgid "Sparkles"
-#~ msgstr "Lainnir"
+"Briog gus an tèid an dealbh agad na thonnan dìreach. Briog mun bhàrr airson "
+"thonnan as giorra, mun bhonn airson thonnan as àirde, mu chlì airson thonnan "
+"as lugha, is mu dheas airson thonnan as fhaide."