Updated Finnish translation

1 files changed, 247 insertions, 173 deletions

diff --git a/po/fi.po b/po/fi.po
index cfc4c5345..7e8a8efce 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -20,8 +20,8 @@ msgstr ""
 "Project-Id-Version: gedit\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=gedit&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-01-11 18:59+0000\n"
-"PO-Revision-Date: 2016-01-12 00:07+0200\n"
+"POT-Creation-Date: 2016-03-13 07:00+0000\n"
+"PO-Revision-Date: 2016-03-13 12:46+0200\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos+l10n@iki.fi>\n"
 "Language-Team: suomi <gnome-fi-laatu@lists.sourceforge.net>\n"
 "Language: fi\n"
@@ -60,31 +60,27 @@ msgstr ""
 "Monipuolinen liitännäisjärjestelmä mahdollistaa sovelluksen mukauttamisen "
 "tarpeiseesi ja työnkulkuusi."
 
-#: ../data/org.gnome.gedit.desktop.in.in.h:1
-msgid "gedit"
-msgstr "gedit"
-
-#: ../data/org.gnome.gedit.desktop.in.in.h:2 ../gedit/gedit-print-job.c:730
+#: ../data/org.gnome.gedit.desktop.in.in.h:1 ../gedit/gedit-print-job.c:730
 msgid "Text Editor"
 msgstr "Tekstimuokkain"
 
-#: ../data/org.gnome.gedit.desktop.in.in.h:3
+#: ../data/org.gnome.gedit.desktop.in.in.h:2
 msgid "Edit text files"
 msgstr "Muokkaa tekstitiedostoja"
 
-#: ../data/org.gnome.gedit.desktop.in.in.h:4
+#: ../data/org.gnome.gedit.desktop.in.in.h:3
 msgid "gedit Text Editor"
 msgstr "gedit-tekstimuokkain"
 
-#: ../data/org.gnome.gedit.desktop.in.in.h:5
+#: ../data/org.gnome.gedit.desktop.in.in.h:4
 msgid "Text;Editor;"
 msgstr "Text;Editor;teksti;muokkain;editori;tekstieditori;tekstimuokkain;"
 
-#: ../data/org.gnome.gedit.desktop.in.in.h:6
+#: ../data/org.gnome.gedit.desktop.in.in.h:5
 msgid "Open a New Window"
 msgstr "Avaa uusi ikkuna"
 
-#: ../data/org.gnome.gedit.desktop.in.in.h:7
+#: ../data/org.gnome.gedit.desktop.in.in.h:6
 msgid "Open a New Document"
 msgstr "Avaa uusi asiakirja"
 
@@ -609,7 +605,7 @@ msgstr "[TIEDOSTO...] [+RIVI[:SARAKE]]"
 msgid "There was an error displaying the help."
 msgstr "Ohjetta näyttäessä tapahtui virhe."
 
-#: ../gedit/gedit-app.c:977
+#: ../gedit/gedit-app.c:967
 #, c-format
 msgid "%s: invalid encoding."
 msgstr "%s: virheellinen koodaus."
@@ -639,13 +635,13 @@ msgid "_Cancel"
 msgstr "_Peru"
 
 #: ../gedit/gedit-close-confirmation-dialog.c:306
-#: ../gedit/resources/gtk/menus-default.ui.h:10
-#: ../gedit/resources/gtk/menus-traditional.ui.h:4
+#: ../gedit/resources/gtk/menus.ui.h:10
 msgid "_Save As…"
 msgstr "_Tallenna nimellä…"
 
 #: ../gedit/gedit-close-confirmation-dialog.c:306
-#: ../gedit/gedit-commands-file.c:855 ../gedit/resources/gtk/menus-osx.ui.h:7
+#: ../gedit/gedit-commands-file.c:855
+#: ../gedit/resources/gtk/menus-traditional.ui.h:7
 #: ../gedit/resources/ui/gedit-window.ui.h:7
 #: ../plugins/snippets/snippets/manager.py:867
 #: ../plugins/snippets/snippets/manager.py:905
@@ -798,7 +794,8 @@ msgctxt "window title"
 msgid "Open"
 msgstr "Avaa"
 
-#: ../gedit/gedit-commands-file.c:463 ../gedit/resources/gtk/menus-osx.ui.h:4
+#: ../gedit/gedit-commands-file.c:463
+#: ../gedit/resources/gtk/menus-traditional.ui.h:4
 #: ../gedit/resources/ui/gedit-window.ui.h:3
 #: ../plugins/filebrowser/resources/ui/gedit-file-browser-menus.ui.h:1
 #: ../plugins/quickopen/quickopen/popup.py:39
@@ -969,7 +966,7 @@ msgstr "gedit on pieni ja kevyt tekstimuokkain GNOME-työpöytäympäristölle."
 #: ../gedit/gedit-commands-help.c:132
 msgid "translator-credits"
 msgstr ""
-"Jiri Grönroos 2010-2015\n"
+"Jiri Grönroos 2010-2016\n"
 "Ilkka Tuohela, 2005-2009\n"
 "Lauri Nurmi, 2005-2007, 2015\n"
 "Sami Pesonen, 2005\n"
@@ -1006,13 +1003,13 @@ msgstr "”%s” ei löytynyt"
 msgid "Untitled Document %d"
 msgstr "Nimetön asiakirja %d"
 
-#: ../gedit/gedit-documents-panel.c:434
+#: ../gedit/gedit-documents-panel.c:399
 #, c-format
 msgid "Tab Group %i"
 msgstr "välilehtiryhmä %i"
 
-#: ../gedit/gedit-documents-panel.c:534 ../gedit/gedit-window.c:1166
-#: ../gedit/gedit-window.c:1172 ../gedit/gedit-window.c:1180
+#: ../gedit/gedit-documents-panel.c:499 ../gedit/gedit-window.c:1161
+#: ../gedit/gedit-window.c:1167 ../gedit/gedit-window.c:1175
 msgid "Read-Only"
 msgstr "Vain luku"
 
@@ -1086,7 +1083,7 @@ msgstr "Merkistökoodaus:"
 msgid "Line Ending:"
 msgstr "Rivinloppu:"
 
-#: ../gedit/gedit-highlight-mode-selector.c:269 ../gedit/gedit-window.c:1250
+#: ../gedit/gedit-highlight-mode-selector.c:269 ../gedit/gedit-window.c:1245
 #: ../plugins/externaltools/tools/manager.py:108
 #: ../plugins/externaltools/tools/manager.py:317
 #: ../plugins/externaltools/tools/manager.py:433
@@ -1419,10 +1416,8 @@ msgstr "Tiedosto %s on muuttunut levyllä."
 msgid "Drop Changes and _Reload"
 msgstr "_Hylkää muutokset ja lataa uudelleen"
 
-#: ../gedit/gedit-io-error-info-bar.c:1182
-#: ../gedit/resources/gtk/menus-default.ui.h:7
-#: ../gedit/resources/gtk/menus-traditional.ui.h:1
-#: ../gedit/resources/gtk/menus-osx.ui.h:10
+#: ../gedit/gedit-io-error-info-bar.c:1182 ../gedit/resources/gtk/menus.ui.h:7
+#: ../gedit/resources/gtk/menus-traditional.ui.h:10
 msgid "_Reload"
 msgstr "_Lataa uudelleen"
 
@@ -1506,7 +1501,6 @@ msgstr "Ei mitään"
 
 #: ../gedit/gedit-replace-dialog.c:779
 #: ../gedit/resources/ui/gedit-replace-dialog.ui.h:1
-#: ../gedit/resources/ui/gedit-shortcuts.ui.h:20
 msgid "Find and Replace"
 msgstr "Etsi ja korvaa"
 
@@ -1621,7 +1615,7 @@ msgstr "Mac OS Classic"
 msgid "Windows"
 msgstr "Windows"
 
-#: ../gedit/gedit-view.c:464
+#: ../gedit/gedit-view.c:468
 #: ../gedit/resources/ui/gedit-preferences-dialog.ui.h:2
 msgid "_Display line numbers"
 msgstr "Näytä rivi_numerot"
@@ -1630,65 +1624,65 @@ msgstr "Näytä rivi_numerot"
 #. * occurrence, and the second %d is the total number of search
 #. * occurrences.
 #.
-#: ../gedit/gedit-view-frame.c:657
+#: ../gedit/gedit-view-frame.c:671
 #, c-format
 msgid "%d of %d"
 msgstr "%d/%d"
 
 #. create "Wrap Around" menu item.
-#: ../gedit/gedit-view-frame.c:749
+#: ../gedit/gedit-view-frame.c:763
 msgid "_Wrap Around"
 msgstr "_Rivitä"
 
 #. create "Match as Regular Expression" menu item.
-#: ../gedit/gedit-view-frame.c:759
+#: ../gedit/gedit-view-frame.c:773
 msgid "Match as _Regular Expression"
 msgstr "T_äsmää säännöllisenä lausekkeena"
 
 #. create "Match Entire Word Only" menu item.
-#: ../gedit/gedit-view-frame.c:773
+#: ../gedit/gedit-view-frame.c:787
 msgid "Match _Entire Word Only"
 msgstr "Täsmää vain _kokonaisia sanoja"
 
 #. create "Match Case" menu item.
-#: ../gedit/gedit-view-frame.c:787
+#: ../gedit/gedit-view-frame.c:801
 msgid "_Match Case"
 msgstr "_Huomioi kirjainkoko"
 
-#: ../gedit/gedit-view-frame.c:1004
+#: ../gedit/gedit-view-frame.c:1023
 msgid "String you want to search for"
 msgstr "Etsittävä merkkijono"
 
-#: ../gedit/gedit-view-frame.c:1016
+#: ../gedit/gedit-view-frame.c:1035
 msgid "Line you want to move the cursor to"
 msgstr "Rivi, jolle haluat siirtää kursorin"
 
-#: ../gedit/gedit-window.c:1003
+#: ../gedit/gedit-window.c:998
 msgid "Bracket match is out of range"
 msgstr "Sulkuparin täsmäys on alueen ulkopuolella"
 
-#: ../gedit/gedit-window.c:1008
+#: ../gedit/gedit-window.c:1003
 msgid "Bracket match not found"
 msgstr "Vastaavaa sulkua ei löytynyt"
 
-#: ../gedit/gedit-window.c:1013
+#: ../gedit/gedit-window.c:1008
 #, c-format
 msgid "Bracket match found on line: %d"
 msgstr "Vastaava sulku löytyi riviltä: %d"
 
 #. Translators: "Ln" is an abbreviation for "Line", Col is an abbreviation for "Column". Please,
 #. use abbreviations if possible to avoid space problems.
-#: ../gedit/gedit-window.c:1048
+#: ../gedit/gedit-window.c:1043
 #, c-format
 msgid "  Ln %d, Col %d"
 msgstr "  Rvi %d, Srke %d"
 
-#: ../gedit/gedit-window.c:1232
+#: ../gedit/gedit-window.c:1227
 #, c-format
 msgid "Tab Width: %u"
 msgstr "Sarkaimen leveys: %u"
 
-#: ../gedit/gedit-window.c:1601
+#: ../gedit/gedit-window.c:1596
 msgid "There are unsaved documents"
 msgstr "Tallentamattomia asiakirjoja on avoinna"
 
@@ -1696,9 +1690,7 @@ msgstr "Tallentamattomia asiakirjoja on avoinna"
 msgid "Change side panel page"
 msgstr "Vaihda sivupaneelin sivua"
 
-#: ../gedit/gedit-window.c:2464 ../gedit/resources/gtk/menus-osx.ui.h:35
-#: ../gedit/resources/ui/gedit-shortcuts.ui.h:1
-#: ../gedit/resources/ui/gedit-window.ui.h:1
+#: ../gedit/gedit-window.c:2464 ../gedit/resources/ui/gedit-window.ui.h:1
 msgid "Documents"
 msgstr "Asiakirjat"
 
@@ -1720,9 +1712,8 @@ msgid "Move to New Tab _Group"
 msgstr "Siirr_ä uuteen välilehtiryhmään"
 
 #: ../gedit/resources/gtk/menus-common.ui.h:5
-#: ../gedit/resources/gtk/menus-default.ui.h:22
-#: ../gedit/resources/gtk/menus-traditional.ui.h:20
-#: ../gedit/resources/gtk/menus-osx.ui.h:12
+#: ../gedit/resources/gtk/menus.ui.h:22
+#: ../gedit/resources/gtk/menus-traditional.ui.h:12
 #: ../gedit/resources/ui/gedit-replace-dialog.ui.h:2
 #: ../plugins/time/resources/ui/gedit-time-setup-dialog.ui.h:2
 msgid "_Close"
@@ -1752,229 +1743,224 @@ msgstr "Korosta nykyinen rivi"
 msgid "Text wrapping"
 msgstr "Tekstin rivitys"
 
-#: ../gedit/resources/gtk/menus-default.ui.h:1
-#: ../gedit/resources/gtk/menus-osx.ui.h:9
+#: ../gedit/resources/gtk/menus.ui.h:1
+#: ../gedit/resources/gtk/menus-traditional.ui.h:9
 msgid "_New Window"
 msgstr "_Uusi ikkuna"
 
-#: ../gedit/resources/gtk/menus-default.ui.h:2
-#: ../gedit/resources/gtk/menus-traditional.ui.h:15
+#: ../gedit/resources/gtk/menus.ui.h:2
+#: ../gedit/resources/gtk/menus-traditional.ui.h:23
 msgid "_Preferences"
 msgstr "_Asetukset"
 
-#: ../gedit/resources/gtk/menus-default.ui.h:3
-#: ../gedit/resources/gtk/menus-traditional.ui.h:16
-#: ../gedit/resources/gtk/menus-osx.ui.h:45
+#: ../gedit/resources/gtk/menus.ui.h:3
 msgid "_Keyboard Shortcuts"
 msgstr "_Pikanäppäimet"
 
-#: ../gedit/resources/gtk/menus-default.ui.h:4
-#: ../gedit/resources/gtk/menus-traditional.ui.h:17
-#: ../gedit/resources/gtk/menus-osx.ui.h:46
-#: ../plugins/spell/gedit-spell-plugin.c:239
+#: ../gedit/resources/gtk/menus.ui.h:4
+#: ../gedit/resources/gtk/menus-traditional.ui.h:46
+#: ../plugins/spell/gedit-spell-plugin.c:246
 #: ../plugins/time/resources/ui/gedit-time-dialog.ui.h:7
 msgid "_Help"
 msgstr "O_hje"
 
-#: ../gedit/resources/gtk/menus-default.ui.h:5
-#: ../gedit/resources/gtk/menus-traditional.ui.h:18
+#: ../gedit/resources/gtk/menus.ui.h:5
+#: ../gedit/resources/gtk/menus-traditional.ui.h:47
 msgid "_About"
 msgstr "_Tietoja"
 
-#: ../gedit/resources/gtk/menus-default.ui.h:6
-#: ../gedit/resources/gtk/menus-traditional.ui.h:21
+#: ../gedit/resources/gtk/menus.ui.h:6
+#: ../gedit/resources/gtk/menus-traditional.ui.h:13
 msgid "_Quit"
 msgstr "_Lopeta"
 
-#: ../gedit/resources/gtk/menus-default.ui.h:8
-#: ../gedit/resources/gtk/menus-traditional.ui.h:2
-#: ../gedit/resources/gtk/menus-osx.ui.h:11
+#: ../gedit/resources/gtk/menus.ui.h:8
+#: ../gedit/resources/gtk/menus-traditional.ui.h:11
 msgid "_Print…"
 msgstr "_Tulosta…"
 
-#: ../gedit/resources/gtk/menus-default.ui.h:9
-#: ../gedit/resources/gtk/menus-traditional.ui.h:3
-#: ../gedit/resources/gtk/menus-osx.ui.h:25
+#: ../gedit/resources/gtk/menus.ui.h:9
+#: ../gedit/resources/gtk/menus-traditional.ui.h:27
 msgid "_Fullscreen"
 msgstr "Koko näytt_ö"
 
-#: ../gedit/resources/gtk/menus-default.ui.h:11
-#: ../gedit/resources/gtk/menus-traditional.ui.h:5
+#: ../gedit/resources/gtk/menus.ui.h:11
 msgid "Save _All"
 msgstr "Tallenna k_aikki"
 
-#: ../gedit/resources/gtk/menus-default.ui.h:12
-#: ../gedit/resources/gtk/menus-traditional.ui.h:6
-#: ../gedit/resources/gtk/menus-osx.ui.h:28
+#: ../gedit/resources/gtk/menus.ui.h:12
+#: ../gedit/resources/gtk/menus-traditional.ui.h:30
 msgid "_Find…"
 msgstr "_Etsi…"
 
-#: ../gedit/resources/gtk/menus-default.ui.h:13
-#: ../gedit/resources/gtk/menus-traditional.ui.h:7
+#: ../gedit/resources/gtk/menus.ui.h:13
 msgid "_Find and Replace…"
 msgstr "Etsi _ja korvaa…"
 
-#: ../gedit/resources/gtk/menus-default.ui.h:14
-#: ../gedit/resources/gtk/menus-traditional.ui.h:8
-#: ../gedit/resources/gtk/menus-osx.ui.h:32
+#: ../gedit/resources/gtk/menus.ui.h:14
+#: ../gedit/resources/gtk/menus-traditional.ui.h:34
 msgid "_Clear Highlight"
 msgstr "Ä_lä korosta osumia"
 
-#: ../gedit/resources/gtk/menus-default.ui.h:15
-#: ../gedit/resources/gtk/menus-traditional.ui.h:9
+#: ../gedit/resources/gtk/menus.ui.h:15
 msgid "_Go to Line…"
 msgstr "S_iirry riville…"
 
-#: ../gedit/resources/gtk/menus-default.ui.h:16
-#: ../gedit/resources/gtk/menus-traditional.ui.h:10
-#: ../gedit/resources/gtk/menus-osx.ui.h:22
+#: ../gedit/resources/gtk/menus.ui.h:16
 #: ../gedit/resources/ui/gedit-preferences-dialog.ui.h:13
 msgid "View"
 msgstr "Näytä"
 
-#: ../gedit/resources/gtk/menus-default.ui.h:17
-#: ../gedit/resources/gtk/menus-traditional.ui.h:11
-#: ../gedit/resources/gtk/menus-osx.ui.h:23
+#: ../gedit/resources/gtk/menus.ui.h:17
+#: ../gedit/resources/gtk/menus-traditional.ui.h:25
 msgid "Side _Panel"
 msgstr "_Sivupaneeli"
 
-#: ../gedit/resources/gtk/menus-default.ui.h:18
-#: ../gedit/resources/gtk/menus-traditional.ui.h:12
-#: ../gedit/resources/gtk/menus-osx.ui.h:24
+#: ../gedit/resources/gtk/menus.ui.h:18
+#: ../gedit/resources/gtk/menus-traditional.ui.h:26
 msgid "_Bottom Panel"
 msgstr "_Alapaneeli"
 
-#: ../gedit/resources/gtk/menus-default.ui.h:19
-#: ../gedit/resources/gtk/menus-traditional.ui.h:13
-#: ../gedit/resources/gtk/menus-osx.ui.h:26
+#: ../gedit/resources/gtk/menus.ui.h:19
+#: ../gedit/resources/gtk/menus-traditional.ui.h:28
 msgid "_Highlight Mode…"
 msgstr "Korost_ustila…"
 
-#: ../gedit/resources/gtk/menus-default.ui.h:20
-#: ../gedit/resources/gtk/menus-traditional.ui.h:14
-#: ../gedit/resources/gtk/menus-osx.ui.h:34
-#: ../gedit/resources/ui/gedit-shortcuts.ui.h:48
+#: ../gedit/resources/gtk/menus.ui.h:20
 msgid "Tools"
 msgstr "Työkalut"
 
-#: ../gedit/resources/gtk/menus-default.ui.h:21
-#: ../gedit/resources/gtk/menus-traditional.ui.h:19
-#: ../gedit/resources/gtk/menus-osx.ui.h:37
+#: ../gedit/resources/gtk/menus.ui.h:21
+#: ../gedit/resources/gtk/menus-traditional.ui.h:39
 msgid "_Close All"
 msgstr "Sulje _kaikki"
 
-#: ../gedit/resources/gtk/menus-osx.ui.h:1
-msgid "File"
-msgstr "Tiedosto"
+#: ../gedit/resources/gtk/menus-traditional.ui.h:1
+#| msgid "File"
+msgid "_File"
+msgstr "_Tiedosto"
 
 #. _New is the menu item under the File menu on OS X which creates a new empty document.
-#: ../gedit/resources/gtk/menus-osx.ui.h:3
+#: ../gedit/resources/gtk/menus-traditional.ui.h:3
 msgid "_New"
 msgstr "_Uusi"
 
-#: ../gedit/resources/gtk/menus-osx.ui.h:5
+#: ../gedit/resources/gtk/menus-traditional.ui.h:5
 msgid "Open _Recent"
 msgstr "Avaa _viimeisimpiä"
 
-#: ../gedit/resources/gtk/menus-osx.ui.h:6
+#: ../gedit/resources/gtk/menus-traditional.ui.h:6
 msgid "Reopen Closed _Tab"
 msgstr "_Avaa uudelleen suljettu välilehti"
 
-#: ../gedit/resources/gtk/menus-osx.ui.h:8
+#: ../gedit/resources/gtk/menus-traditional.ui.h:8
 msgid "Save _As…"
 msgstr "_Tallenna nimellä…"
 
-#: ../gedit/resources/gtk/menus-osx.ui.h:13
-msgid "Edit"
-msgstr "Muokkaa"
+#: ../gedit/resources/gtk/menus-traditional.ui.h:14
+#| msgid "Edit"
+msgid "_Edit"
+msgstr "_Muokkaa"
 
-#: ../gedit/resources/gtk/menus-osx.ui.h:14
+#: ../gedit/resources/gtk/menus-traditional.ui.h:15
 msgid "_Undo"
 msgstr "K_umoa"
 
-#: ../gedit/resources/gtk/menus-osx.ui.h:15
+#: ../gedit/resources/gtk/menus-traditional.ui.h:16
 msgid "_Redo"
 msgstr "_Tee uudelleen"
 
-#: ../gedit/resources/gtk/menus-osx.ui.h:16
+#: ../gedit/resources/gtk/menus-traditional.ui.h:17
 msgid "C_ut"
 msgstr "_Leikkaa"
 
-#: ../gedit/resources/gtk/menus-osx.ui.h:17
+#: ../gedit/resources/gtk/menus-traditional.ui.h:18
 msgid "_Copy"
 msgstr "_Kopioi"
 
-#: ../gedit/resources/gtk/menus-osx.ui.h:18
+#: ../gedit/resources/gtk/menus-traditional.ui.h:19
 msgid "_Paste"
 msgstr "_Liitä"
 
-#: ../gedit/resources/gtk/menus-osx.ui.h:19
+#: ../gedit/resources/gtk/menus-traditional.ui.h:20
 #: ../plugins/filebrowser/gedit-file-browser-plugin.c:915
 #: ../plugins/filebrowser/gedit-file-browser-plugin.c:953
 #: ../plugins/filebrowser/resources/ui/gedit-file-browser-menus.ui.h:7
 msgid "_Delete"
 msgstr "_Poista"
 
-#: ../gedit/resources/gtk/menus-osx.ui.h:20
+#: ../gedit/resources/gtk/menus-traditional.ui.h:21
 msgid "Overwrite _Mode"
 msgstr "K_orvaustila"
 
-#: ../gedit/resources/gtk/menus-osx.ui.h:21
+#: ../gedit/resources/gtk/menus-traditional.ui.h:22
 msgid "Select _All"
 msgstr "_Valitse kaikki"
 
-#: ../gedit/resources/gtk/menus-osx.ui.h:27
-msgid "Search"
-msgstr "Etsi"
+#: ../gedit/resources/gtk/menus-traditional.ui.h:24
+#| msgid "View"
+msgid "_View"
+msgstr "_Näytä"
 
-#: ../gedit/resources/gtk/menus-osx.ui.h:29
+#: ../gedit/resources/gtk/menus-traditional.ui.h:29
+#| msgid "Search"
+msgid "_Search"
+msgstr "_Etsi"
+
+#: ../gedit/resources/gtk/menus-traditional.ui.h:31
 msgid "Find Ne_xt"
 msgstr "Etsi _seuraava"
 
-#: ../gedit/resources/gtk/menus-osx.ui.h:30
+#: ../gedit/resources/gtk/menus-traditional.ui.h:32
 msgid "Find Pre_vious"
 msgstr "Etsi _edellinen"
 
-#: ../gedit/resources/gtk/menus-osx.ui.h:31
+#: ../gedit/resources/gtk/menus-traditional.ui.h:33
 msgid "Find and _Replace…"
 msgstr "Etsi _ja korvaa…"
 
-#: ../gedit/resources/gtk/menus-osx.ui.h:33
+#: ../gedit/resources/gtk/menus-traditional.ui.h:35
 msgid "Go to _Line…"
 msgstr "S_iirry riville…"
 
-#: ../gedit/resources/gtk/menus-osx.ui.h:36
+#: ../gedit/resources/gtk/menus-traditional.ui.h:36
+#| msgid "Tools"
+msgid "_Tools"
+msgstr "_Työkalut"
+
+#: ../gedit/resources/gtk/menus-traditional.ui.h:37
+#| msgid "Documents"
+msgid "_Documents"
+msgstr "_Asiakirjat"
+
+#: ../gedit/resources/gtk/menus-traditional.ui.h:38
 msgid "_Save All"
 msgstr "Tallenna k_aikki"
 
-#: ../gedit/resources/gtk/menus-osx.ui.h:38
+#: ../gedit/resources/gtk/menus-traditional.ui.h:40
 msgid "_New Tab Group"
 msgstr "Uusi v_älilehtiryhmä"
 
-#: ../gedit/resources/gtk/menus-osx.ui.h:39
+#: ../gedit/resources/gtk/menus-traditional.ui.h:41
 msgid "P_revious Tab Group"
 msgstr "Edellinen _välilehtiryhmä"
 
-#: ../gedit/resources/gtk/menus-osx.ui.h:40
+#: ../gedit/resources/gtk/menus-traditional.ui.h:42
 msgid "Nex_t Tab Group"
 msgstr "Seuraava vä_lilehtiryhmä"
 
-#: ../gedit/resources/gtk/menus-osx.ui.h:41
+#: ../gedit/resources/gtk/menus-traditional.ui.h:43
 msgid "_Previous Document"
 msgstr "E_dellinen asiakirja"
 
-#: ../gedit/resources/gtk/menus-osx.ui.h:42
+#: ../gedit/resources/gtk/menus-traditional.ui.h:44
 msgid "N_ext Document"
 msgstr "S_euraava asiakirja"
 
-#: ../gedit/resources/gtk/menus-osx.ui.h:43
+#: ../gedit/resources/gtk/menus-traditional.ui.h:45
 msgid "_Move To New Window"
 msgstr "Sii_rrä uuteen ikkunaan"
 
-#: ../gedit/resources/gtk/menus-osx.ui.h:44
-msgid "Help"
-msgstr "Ohje"
-
 #: ../gedit/resources/ui/gedit-encodings-dialog.ui.h:1
 msgid "Character Encodings"
 msgstr "Merkistökoodaukset"
@@ -2301,231 +2287,309 @@ msgstr "Etsi _taaksepäin"
 msgid "Wra_p around"
 msgstr "Jatka _alusta"
 
+#: ../gedit/resources/ui/gedit-shortcuts.ui.h:1
+#| msgid "Documents"
+msgctxt "shortcut window"
+msgid "Documents"
+msgstr "Asiakirjat"
+
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:2
-#| msgid "Create a new document"
+#| msgid "Create a new document in a tab"
+msgctxt "shortcut window"
 msgid "Create a new document in a tab"
 msgstr "Luo uusi asiakirja välilehteen"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:3
-#| msgid "Open a New Document"
+#| msgid "Open a document"
+msgctxt "shortcut window"
 msgid "Open a document"
 msgstr "Avaa asiakirja"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:4
-#| msgid "Save the current file"
+#| msgid "Save the document"
+msgctxt "shortcut window"
 msgid "Save the document"
 msgstr "Tallenna asiakirja"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:5
-#| msgid "Save the current file"
+#| msgid "Save the document with a new filename"
+msgctxt "shortcut window"
 msgid "Save the document with a new filename"
 msgstr "Tallenna asiakirja toisella nimellä"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:6
-#| msgid "Create a new document"
+#| msgid "Save all the documents"
+msgctxt "shortcut window"
 msgid "Save all the documents"
 msgstr "Tallenna kaikki asiakirjat"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:7
-#| msgid "Close Document"
+#| msgid "Close the document"
+msgctxt "shortcut window"
 msgid "Close the document"
 msgstr "Sulje asiakirja"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:8
-#| msgid "Close Document"
+#| msgid "Close all the documents"
+msgctxt "shortcut window"
 msgid "Close all the documents"
 msgstr "Sulje kaikki asiakirjat"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:9
-#| msgid "Append to current document"
+#| msgid "Reopen the most recently closed document"
+msgctxt "shortcut window"
 msgid "Reopen the most recently closed document"
 msgstr "Avaa viimeksi suljettu asiakirja"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:10
-#| msgid "Show the next page"
+#| msgid "Switch to the next document"
+msgctxt "shortcut window"
 msgid "Switch to the next document"
 msgstr "Vaihda seuraavaan asiakirjaan"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:11
-#| msgid "Show the previous page"
+#| msgid "Switch to the previous document"
+msgctxt "shortcut window"
 msgid "Switch to the previous document"
 msgstr "Vaihda edelliseen asiakirjaan"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:12
-#| msgid "Set Location to First Document"
+#| msgid "Switch to the first - ninth document"
+msgctxt "shortcut window"
 msgid "Switch to the first - ninth document"
 msgstr "Vaihda asiakirjojen 1-9 välillä"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:13
+#| msgid "Windows and Panels"
+msgctxt "shortcut window"
 msgid "Windows and Panels"
 msgstr "Ikkunat ja paneelit"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:14
-#| msgid "Create a new document"
+#| msgid "Create a new document in a window"
+msgctxt "shortcut window"
 msgid "Create a new document in a window"
 msgstr "Luo uusi asiakirja ikkunaan"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:15
-#| msgid "Create a new document"
+#| msgid "Create a new tab group"
+msgctxt "shortcut window"
 msgid "Create a new tab group"
 msgstr "Luo uusi välilehtiryhmä"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:16
-#| msgid "Hide panel"
+#| msgid "Show side panel"
+msgctxt "shortcut window"
 msgid "Show side panel"
 msgstr "Näytä sivupaneeli"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:17
-#| msgid "_Bottom Panel"
+#| msgid "Show bottom panel"
+msgctxt "shortcut window"
 msgid "Show bottom panel"
 msgstr "Näytä alapaneeli"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:18
-#| msgid "_Fullscreen"
+#| msgid "Fullscreen on / off"
+msgctxt "shortcut window"
 msgid "Fullscreen on / off"
 msgstr "Koko näyttö päällä/pois"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:19
-#| msgid "Show the application's version"
+#| msgid "Quit the application"
+msgctxt "shortcut window"
 msgid "Quit the application"
 msgstr "Lopeta sovellus"
 
+#: ../gedit/resources/ui/gedit-shortcuts.ui.h:20
+#| msgid "Find and Replace"
+msgctxt "shortcut window"
+msgid "Find and Replace"
+msgstr "Etsi ja korvaa"
+
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:21
-#| msgctxt "label of the find button"
-#| msgid "_Find"
+#| msgid "Find"
+msgctxt "shortcut window"
 msgid "Find"
 msgstr "Etsi"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:22
+#| msgid "Find the next match"
+msgctxt "shortcut window"
 msgid "Find the next match"
 msgstr "Etsi seuraava osuma"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:23
-#| msgid "Show the previous page"
+#| msgid "Find the previous match"
+msgctxt "shortcut window"
 msgid "Find the previous match"
 msgstr "Etsi edellinen osuma"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:24
-#| msgid "_Clear Highlight"
+#| msgid "Clear highlight"
+msgctxt "shortcut window"
 msgid "Clear highlight"
 msgstr "Tyhjennä korostus"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:25
-#| msgid "_Go to Line…"
+#| msgid "Go to line"
+msgctxt "shortcut window"
 msgid "Go to line"
 msgstr "Siirry riville"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:26
+#| msgid "Copy and Paste"
+msgctxt "shortcut window"
 msgid "Copy and Paste"
 msgstr "Kopioi ja liitä"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:27
+#| msgid "Copy selected text to clipboard"
+msgctxt "shortcut window"
 msgid "Copy selected text to clipboard"
 msgstr "Kopioi valittu teksti leikepöydälle"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:28
+#| msgid "Cut selected text to clipboard"
+msgctxt "shortcut window"
 msgid "Cut selected text to clipboard"
 msgstr "Leikkaa valittu teksti leikepöydälle"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:29
+#| msgid "Paste text from clipboard"
+msgctxt "shortcut window"
 msgid "Paste text from clipboard"
 msgstr "Liitä teksti leikepöydältä"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:30
-#| msgid "Find and Replace"
+#| msgid "Undo and Redo"
+msgctxt "shortcut window"
 msgid "Undo and Redo"
 msgstr "Kumoa ja tee uudelleen"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:31
+#| msgid "Undo previous command"
+msgctxt "shortcut window"
 msgid "Undo previous command"
 msgstr "Kumoa edellinen komento"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:32
-#| msgid "Run command"
+#| msgid "Redo previous command"
+msgctxt "shortcut window"
 msgid "Redo previous command"
 msgstr "Tee uudelleen edellinen komento"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:33
-#: ../plugins/docinfo/resources/ui/gedit-docinfo-plugin.ui.h:3
+#| msgid "Selection"
+msgctxt "shortcut window"
 msgid "Selection"
 msgstr "Valinta"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:34
-#| msgid "Select _All"
+#| msgid "Select all text"
+msgctxt "shortcut window"
 msgid "Select all text"
 msgstr "Valitse kaikki teksti"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:35
-#| msgid "Edit"
+#| msgid "Editing"
+msgctxt "shortcut window"
 msgid "Editing"
-msgstr "Muokkaa"
+msgstr "Muokkaaminen"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:36
+#| msgid "Toggle insert / overwrite"
+msgctxt "shortcut window"
 msgid "Toggle insert / overwrite"
 msgstr "Vaihda syötön ja korvauksen välillä"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:37
-#| msgid "Highlight current line"
+#| msgid "Delete current line"
+msgctxt "shortcut window"
 msgid "Delete current line"
 msgstr "Poista nykyinen rivi"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:38
-#| msgid "Export selected snippets"
+#| msgid "Join selected lines"
+msgctxt "shortcut window"
 msgid "Join selected lines"
 msgstr "Yhdistä valitut rivit"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:39
-#| msgid "Current line"
+#| msgid "Move current line up"
+msgctxt "shortcut window"
 msgid "Move current line up"
 msgstr "Siirrä nykyinen rivi ylöspäin"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:40
-#| msgid "Current line"
+#| msgid "Move current line down"
+msgctxt "shortcut window"
 msgid "Move current line down"
 msgstr "Siirrä nykyinen rivi alaspäin"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:41
-#| msgid "Current word"
+#| msgid "Move current word left"
+msgctxt "shortcut window"
 msgid "Move current word left"
 msgstr "Siirrä nykyinen sana vasemmalle"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:42
-#| msgid "Current word"
+#| msgid "Move current word right"
+msgctxt "shortcut window"
 msgid "Move current word right"
 msgstr "Siirrä nykyinen sana oikealle"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:43
+#| msgid "Convert to uppercase"
+msgctxt "shortcut window"
 msgid "Convert to uppercase"
 msgstr "Muuta suuriksi kirjaimiksi"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:44
+#| msgid "Convert to lowercase"
+msgctxt "shortcut window"
 msgid "Convert to lowercase"
 msgstr "Muuta pieniksi kirjaimiksi"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:45
-#| msgid "_Ignore case"
+#| msgid "Invert case"
+msgctxt "shortcut window"
 msgid "Invert case"
 msgstr "Käänteinen kirjainkoko"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:46
+#| msgid "Increment number at cursor"
+msgctxt "shortcut window"
 msgid "Increment number at cursor"
 msgstr "Kasvata kohdistettua numeroarvoa"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:47
+#| msgid "Decrement number at cursor"
+msgctxt "shortcut window"
 msgid "Decrement number at cursor"
 msgstr "Vähennä kohdistettua numeroarvoa"
 
+#: ../gedit/resources/ui/gedit-shortcuts.ui.h:48
+#| msgid "Tools"
+msgctxt "shortcut window"
+msgid "Tools"
+msgstr "Työkalut"
+
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:49
-#| msgid "Check Spelling"
+#| msgid "Check spelling"
+msgctxt "shortcut window"
 msgid "Check spelling"
-msgstr "Tarkista oikeinkirjoitus\t"
+msgstr "Tarkista oikeinkirjoitus"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:50
-#| msgid "Current document"
+#| msgid "Print the document"
+msgctxt "shortcut window"
 msgid "Print the document"
 msgstr "Tulosta asiakirja"
 
 #: ../gedit/resources/ui/gedit-shortcuts.ui.h:51
+#| msgid "Show completion window"
+msgctxt "shortcut window"
 msgid "Show completion window"
 msgstr "Näytä täydennysikkuna"
 
@@ -2630,6 +2694,10 @@ msgstr "A_siakirjan tilastot"
 msgid "Document"
 msgstr "Asiakirja"
 
+#: ../plugins/docinfo/resources/ui/gedit-docinfo-plugin.ui.h:3
+msgid "Selection"
+msgstr "Valinta"
+
 #: ../plugins/docinfo/resources/ui/gedit-docinfo-plugin.ui.h:4
 msgid "Lines"
 msgstr "Rivejä"
@@ -3658,6 +3726,12 @@ msgstr "Lisää päiväys/aika"
 msgid "Inserts current date and time at the cursor position."
 msgstr "Lisää päiväys ja aika kohdistimen kohdalle."
 
+#~ msgid "gedit"
+#~ msgstr "gedit"
+
+#~ msgid "Help"
+#~ msgstr "Ohje"
+
 #~ msgid "Question"
 #~ msgstr "Kysymys"