[gnumeric] Dead Kittens: even more pruning of GTK_STOCK_ stuff.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Dead Kittens: even more pruning of GTK_STOCK_ stuff.
- Date: Sun, 28 Dec 2014 01:34:49 +0000 (UTC)
commit 816a5fd8f51a0087f0243d1d8b5e83c30dee1250
Author: Morten Welinder <terra gnome org>
Date: Sat Dec 27 20:34:02 2014 -0500
Dead Kittens: even more pruning of GTK_STOCK_ stuff.
This starts the button part of the mess.
component/gnumeric.c | 3 +-
plugins/gda/plugin-gda.c | 6 +-
po/POTFILES.in | 1 +
po/da.po | 663 +++++++++++++++++-----------------
src/dialogs/dialog-password.c | 5 +-
src/dialogs/dialog-so-styled.c | 4 +-
src/dialogs/dialog-solver.c | 2 +-
src/dialogs/dialog-stf-format-page.c | 4 +-
src/gui-file.c | 8 +-
src/gui-util.h | 22 ++
src/sheet-object-component.c | 8 +-
src/sheet-object-graph.c | 6 +-
src/sheet-object-image.c | 2 +-
src/sheet-object.c | 13 +-
src/tools/gnm-solver.c | 3 +-
src/wbc-gtk-actions.c | 10 +-
src/wbc-gtk-edit.c | 2 +-
src/wbc-gtk.c | 6 +-
18 files changed, 406 insertions(+), 362 deletions(-)
---
diff --git a/component/gnumeric.c b/component/gnumeric.c
index 5182c9f..21d26fb 100644
--- a/component/gnumeric.c
+++ b/component/gnumeric.c
@@ -29,6 +29,7 @@
#include <gnm-plugin.h>
#include <gnumeric-conf.h>
#include <gui-file.h>
+#include <gui-util.h>
#include <gutils.h>
#include <print-cell.h>
#include <print.h>
@@ -197,7 +198,7 @@ cb_gognm_save (G_GNUC_UNUSED GtkAction *a, WBCGtk *wbcg)
static GtkActionEntry const actions[] = {
/* File */
- { "FileSaveEmbed", GTK_STOCK_SAVE, NULL,
+ { "FileSaveEmbed", GNM_N_STOCK_SAVE, NULL,
NULL, N_("Save the embedded workbook"),
G_CALLBACK (cb_gognm_save) }
};
diff --git a/plugins/gda/plugin-gda.c b/plugins/gda/plugin-gda.c
index b2def50..c3f5e4f 100644
--- a/plugins/gda/plugin-gda.c
+++ b/plugins/gda/plugin-gda.c
@@ -262,10 +262,8 @@ query_connection_info (const gchar *dsn, const gchar *user, const gchar *passwor
dialog = gtk_dialog_new_with_buttons(_("Database Connection"),
NULL,
GTK_DIALOG_MODAL,
- GTK_STOCK_OK,
- GTK_RESPONSE_ACCEPT,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_REJECT,
+ GNM_STOCK_OK, GTK_RESPONSE_ACCEPT,
+ GNM_STOCK_CANCEL, GTK_RESPONSE_REJECT,
NULL);
login = gdaui_login_new (NULL);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 050a045..f87b02c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -305,6 +305,7 @@ src/gnm-so-polygon.c
src/gui-clipboard.c
src/gui-file.c
src/gui-util.c
+src/gui-util.h
src/gutils.c
src/history.c
src/hlink.c
diff --git a/po/da.po b/po/da.po
index 48671fe..2cbfb75 100644
--- a/po/da.po
+++ b/po/da.po
@@ -80,7 +80,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnumeric\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-26 11:42-0500\n"
+"POT-Creation-Date: 2014-12-27 20:12-0500\n"
"PO-Revision-Date: 2014-12-19 14:05-0500\n"
"Last-Translator: Joe Hansen <joedalton2 yahoo dk>\n"
"Language-Team: Danish <dansk dansk-gruppen dk>\n"
@@ -955,9 +955,9 @@ msgstr "Ukendt version"
msgid "%s version %s"
msgstr "%s version %s"
-#: ../plugins/fn-info/functions.c:1406 ../src/dialogs/dialog-cell-format.c:897
-#: ../src/dialogs/dialog-cell-format.c:2374
-#: ../src/dialogs/dialog-cell-format.c:2382 ../src/wbc-gtk.c:3403
+#: ../plugins/fn-info/functions.c:1406 ../src/dialogs/dialog-cell-format.c:876
+#: ../src/dialogs/dialog-cell-format.c:2354
+#: ../src/dialogs/dialog-cell-format.c:2362 ../src/wbc-gtk.c:3403
msgid "Automatic"
msgstr "Automatisk"
@@ -1110,24 +1110,24 @@ msgstr ""
msgid "Database Connection"
msgstr "Databaseforbindelse"
-#: ../plugins/gda/plugin-gda.c:365
+#: ../plugins/gda/plugin-gda.c:363
#, c-format
msgid "Error: could not open connection to %s"
msgstr "Fejl: kunne ikke åbne forbindelse til %s"
-#: ../plugins/gda/plugin-gda.c:409
+#: ../plugins/gda/plugin-gda.c:407
msgid "Format: execSQL(dsn,user,password,sql)"
msgstr "Format: execSQL(dsn,bruger,adgangskode,sql)"
-#: ../plugins/gda/plugin-gda.c:429 ../plugins/gda/plugin-gda.c:508
+#: ../plugins/gda/plugin-gda.c:427 ../plugins/gda/plugin-gda.c:506
msgid "More than one statement in SQL string"
msgstr "Mere end et udtryk i SQL-streng"
-#: ../plugins/gda/plugin-gda.c:486
+#: ../plugins/gda/plugin-gda.c:484
msgid "Format: readDBTable(dsn,user,password,table)"
msgstr "Format: readDBTable(dsn,bruger,adgangskode,tabel)"
-#: ../plugins/gda/plugin-gda.c:537 ../plugins/gnome-db/plugin-gnomedb.c:20
+#: ../plugins/gda/plugin-gda.c:535 ../plugins/gnome-db/plugin-gnomedb.c:20
#, c-format
msgid "Could not run GNOME database configuration tool ('%s')"
msgstr "Kunne ikke køre GNOME's databasekonfigurationsværktøj ('%s')"
@@ -1374,17 +1374,17 @@ msgstr "Begrænsning"
#: ../plugins/mps/mps.c:593 ../plugins/mps/mps.c:655
#: ../src/dialogs/dialog-doc-metadata.c:1919
-#: ../src/dialogs/dialog-simulation.c:221 ../src/tools/gnm-solver.c:1455
-#: ../src/tools/gnm-solver.c:1503 ../src/tools/gnm-solver.c:1563
+#: ../src/dialogs/dialog-simulation.c:221 ../src/tools/gnm-solver.c:1456
+#: ../src/tools/gnm-solver.c:1504 ../src/tools/gnm-solver.c:1564
msgid "Value"
msgstr "Værdi"
#: ../plugins/mps/mps.c:594 ../src/dialogs/dialog-formula-guru.c:898
-#: ../src/dialogs/dialog-search.c:442 ../src/tools/gnm-solver.c:1456
+#: ../src/dialogs/dialog-search.c:442 ../src/tools/gnm-solver.c:1457
msgid "Type"
msgstr "Type"
-#: ../plugins/mps/mps.c:595 ../src/tools/gnm-solver.c:1564
+#: ../plugins/mps/mps.c:595 ../src/tools/gnm-solver.c:1565
msgid "Limit"
msgstr "Grænse"
@@ -4513,7 +4513,7 @@ msgid "Simplex algorithm for Solver (LP Solve)."
msgstr ""
#: ../src/dialogs/dialog-about.c:79
-msgid "Jean Brefort"
+msgid "Jean Bréfort"
msgstr ""
#: ../src/dialogs/dialog-about.c:80
@@ -4582,7 +4582,7 @@ msgstr "Oprindelig værdi"
msgid "Kjell Eikland"
msgstr ""
-#: ../src/dialogs/dialog-about.c:96 ../src/dialogs/dialog-about.c:122
+#: ../src/dialogs/dialog-about.c:96 ../src/dialogs/dialog-about.c:124
#, fuzzy
msgid "LP-solve"
msgstr "Løs"
@@ -4597,298 +4597,306 @@ msgid "Custom UI tools"
msgstr "Tilpas sidefod"
#: ../src/dialogs/dialog-about.c:99
-msgid "John Gotts"
+msgid "Jody Goldberg"
msgstr ""
#: ../src/dialogs/dialog-about.c:100
+msgid "John Gotts"
+msgstr ""
+
+#: ../src/dialogs/dialog-about.c:101
#, fuzzy
msgid "RPM packaging"
msgstr "Erstatter"
-#: ../src/dialogs/dialog-about.c:101
+#: ../src/dialogs/dialog-about.c:102
#, fuzzy
msgid "Andreas J. Gülzow"
msgstr "Jon K. Hellan, Gnumeric-hacker."
-#: ../src/dialogs/dialog-about.c:102
+#: ../src/dialogs/dialog-about.c:103
msgid "Statistics and GUI master"
msgstr ""
-#: ../src/dialogs/dialog-about.c:103
+#: ../src/dialogs/dialog-about.c:104
#, fuzzy
msgid "Jon Kåre Hellan"
msgstr "Jon K. Hellan, Gnumeric-hacker."
-#: ../src/dialogs/dialog-about.c:104
+#: ../src/dialogs/dialog-about.c:105
msgid "UI polish and all round bug fixer"
msgstr ""
-#: ../src/dialogs/dialog-about.c:105
+#: ../src/dialogs/dialog-about.c:106
+msgid "Miguel de Icaza"
+msgstr ""
+
+#: ../src/dialogs/dialog-about.c:107
msgid "Ross Ihaka"
msgstr ""
-#: ../src/dialogs/dialog-about.c:106
+#: ../src/dialogs/dialog-about.c:108
#, fuzzy
msgid "Special functions"
msgstr "Finansielle afledede"
-#: ../src/dialogs/dialog-about.c:107
+#: ../src/dialogs/dialog-about.c:109
msgid "Jukka-Pekka Iivonen"
msgstr ""
-#: ../src/dialogs/dialog-about.c:108
+#: ../src/dialogs/dialog-about.c:110
msgid "Solver, lots of worksheet functions, and general trailblazer"
msgstr ""
-#: ../src/dialogs/dialog-about.c:109
+#: ../src/dialogs/dialog-about.c:111
msgid "Jakub Jelínek"
msgstr ""
-#: ../src/dialogs/dialog-about.c:110
+#: ../src/dialogs/dialog-about.c:112
msgid "One of the original core contributors"
msgstr ""
-#: ../src/dialogs/dialog-about.c:111
+#: ../src/dialogs/dialog-about.c:113
msgid "Chris Lahey"
msgstr ""
-#: ../src/dialogs/dialog-about.c:112
+#: ../src/dialogs/dialog-about.c:114
#, fuzzy
msgid "The original value format engine and libgoffice work"
msgstr "Chris Lahey, talformatsmotor."
-#: ../src/dialogs/dialog-about.c:113
+#: ../src/dialogs/dialog-about.c:115
msgid "Takashi Matsuda"
msgstr ""
-#: ../src/dialogs/dialog-about.c:114
+#: ../src/dialogs/dialog-about.c:116
#, fuzzy
msgid "The original text plugin"
msgstr "Takashi Matsuda, oprindeligt tekstmodul."
-#: ../src/dialogs/dialog-about.c:115
+#: ../src/dialogs/dialog-about.c:117
msgid "Michael Meeks"
msgstr ""
-#: ../src/dialogs/dialog-about.c:116
+#: ../src/dialogs/dialog-about.c:118
msgid "Started the MS Excel import/export engine, and 'GnmStyle'"
msgstr ""
-#: ../src/dialogs/dialog-about.c:117
+#: ../src/dialogs/dialog-about.c:119
msgid "Lutz Muller"
msgstr ""
-#: ../src/dialogs/dialog-about.c:118
+#: ../src/dialogs/dialog-about.c:120
#, fuzzy
msgid "SheetObject improvement"
msgstr "Lutz Muller, SheetObject-forbedringer"
-#: ../src/dialogs/dialog-about.c:119
+#: ../src/dialogs/dialog-about.c:121
msgid "Yukihiro Nakai"
msgstr ""
-#: ../src/dialogs/dialog-about.c:120
+#: ../src/dialogs/dialog-about.c:122
msgid "Support for non-Latin languages"
msgstr ""
-#: ../src/dialogs/dialog-about.c:121
+#: ../src/dialogs/dialog-about.c:123
msgid "Peter Notebaert"
msgstr ""
-#: ../src/dialogs/dialog-about.c:123
+#: ../src/dialogs/dialog-about.c:125
msgid "Emmanuel Pacaud"
msgstr ""
-#: ../src/dialogs/dialog-about.c:124
+#: ../src/dialogs/dialog-about.c:126
msgid "Many plot types for charting engine."
msgstr ""
-#: ../src/dialogs/dialog-about.c:125
+#: ../src/dialogs/dialog-about.c:127
msgid "Federico M. Quintero"
msgstr "Federico M. Quintero"
-#: ../src/dialogs/dialog-about.c:126
+#: ../src/dialogs/dialog-about.c:128
#, fuzzy
msgid "canvas support"
msgstr "Kontraktsupport"
-#: ../src/dialogs/dialog-about.c:127
+#: ../src/dialogs/dialog-about.c:129
msgid "Mark Probst"
msgstr ""
-#: ../src/dialogs/dialog-about.c:128 ../src/dialogs/dialog-about.c:134
+#: ../src/dialogs/dialog-about.c:130 ../src/dialogs/dialog-about.c:136
#, fuzzy
msgid "Guile support"
msgstr "Ariel Rios, Guile-understøttelse."
-#: ../src/dialogs/dialog-about.c:129
+#: ../src/dialogs/dialog-about.c:131
#, fuzzy
msgid "Rasca"
msgstr "Omfang"
-#: ../src/dialogs/dialog-about.c:130
+#: ../src/dialogs/dialog-about.c:132
#, fuzzy
msgid "HTML, troff, LaTeX exporters"
msgstr "Rasca-, HTML-, troff- og LaTeX-eksportering."
-#: ../src/dialogs/dialog-about.c:131
+#: ../src/dialogs/dialog-about.c:133
msgid "Vincent Renardias"
msgstr ""
-#: ../src/dialogs/dialog-about.c:132
+#: ../src/dialogs/dialog-about.c:134
#, fuzzy
msgid "original CSV support, French localization"
msgstr "Vincent Renardias, oprindelig CSV-understøttelse, fransk lokalisering."
-#: ../src/dialogs/dialog-about.c:133
+#: ../src/dialogs/dialog-about.c:135
msgid "Ariel Rios"
msgstr ""
-#: ../src/dialogs/dialog-about.c:135
+#: ../src/dialogs/dialog-about.c:137
msgid "Jakub Steiner"
msgstr "Jakub Steiner"
-#: ../src/dialogs/dialog-about.c:136
+#: ../src/dialogs/dialog-about.c:138
msgid "Icons and Images"
msgstr "Ikoner og billeder"
-#: ../src/dialogs/dialog-about.c:137
+#: ../src/dialogs/dialog-about.c:139
msgid "Uwe Steinmann"
msgstr "Uwe Steinmann"
-#: ../src/dialogs/dialog-about.c:138
+#: ../src/dialogs/dialog-about.c:140
#, fuzzy
msgid "Paradox Importer"
msgstr "Parametre"
-#: ../src/dialogs/dialog-about.c:139
+#: ../src/dialogs/dialog-about.c:141
msgid "Arturo Tena"
msgstr "Arturo Tena"
-#: ../src/dialogs/dialog-about.c:140
+#: ../src/dialogs/dialog-about.c:142
msgid "Initial work on OLE2 for libgsf"
msgstr "Oprindeligt arbejde på OLE2 til libgsf"
-#: ../src/dialogs/dialog-about.c:141
+#: ../src/dialogs/dialog-about.c:143
msgid "Almer S. Tigelaar"
msgstr "Almer S. Tigelaar"
-#: ../src/dialogs/dialog-about.c:142
+#: ../src/dialogs/dialog-about.c:144
msgid "Consolidation and Structured Text importer"
msgstr ""
-#: ../src/dialogs/dialog-about.c:143
+#: ../src/dialogs/dialog-about.c:145
msgid "Bruno Unna"
msgstr "Bruno Unna"
-#: ../src/dialogs/dialog-about.c:144
+#: ../src/dialogs/dialog-about.c:146
#, fuzzy
msgid "Pieces of MS Excel import"
msgstr "Linjer at importere"
-#: ../src/dialogs/dialog-about.c:145
+#: ../src/dialogs/dialog-about.c:147
msgid "Arief Mulya Utama"
msgstr "Arief Mulya Utama"
-#: ../src/dialogs/dialog-about.c:146
+#: ../src/dialogs/dialog-about.c:148
msgid "Telecommunications functions"
msgstr "Funktioner til telekommunikation"
-#: ../src/dialogs/dialog-about.c:147
+#: ../src/dialogs/dialog-about.c:149
msgid "Daniel Veillard"
msgstr "Daniel Veillard"
-#: ../src/dialogs/dialog-about.c:148
+#: ../src/dialogs/dialog-about.c:150
msgid "Initial XML support"
msgstr "Oprindelig XML-understøttelse"
-#: ../src/dialogs/dialog-about.c:149
+#: ../src/dialogs/dialog-about.c:151
msgid "Vladimir Vuksan"
msgstr "Vladimir Vuksan"
-#: ../src/dialogs/dialog-about.c:150
+#: ../src/dialogs/dialog-about.c:152
msgid "Some financial functions"
msgstr "Nogle finansielle funktioner"
-#: ../src/dialogs/dialog-about.c:151
+#: ../src/dialogs/dialog-about.c:153
msgid "Morten Welinder"
msgstr "Morten Welinder"
-#: ../src/dialogs/dialog-about.c:152
+#: ../src/dialogs/dialog-about.c:154
msgid "All round powerhouse"
msgstr ""
-#: ../src/dialogs/dialog-about.c:153
+#: ../src/dialogs/dialog-about.c:155
msgid "Kevin Breit"
msgstr "Kevin Breit"
-#: ../src/dialogs/dialog-about.c:154
+#: ../src/dialogs/dialog-about.c:156
msgid "Thomas Canty"
msgstr "Thomas Canty"
-#: ../src/dialogs/dialog-about.c:155
+#: ../src/dialogs/dialog-about.c:157
msgid "Adrian Custer"
msgstr "Adrian Custer"
-#: ../src/dialogs/dialog-about.c:156
+#: ../src/dialogs/dialog-about.c:158
msgid "Adrian Likins"
msgstr "Adrian Likins"
-#: ../src/dialogs/dialog-about.c:157
+#: ../src/dialogs/dialog-about.c:159
msgid "Aaron Weber"
msgstr "Aaron Weber"
-#: ../src/dialogs/dialog-about.c:158
+#: ../src/dialogs/dialog-about.c:160
msgid "Alexander Kirillov"
msgstr "Alexander Kirillov"
-#: ../src/dialogs/dialog-about.c:433
+#: ../src/dialogs/dialog-about.c:435
msgid "Gnumeric is the result of"
msgstr "Gnumeric er et resultat af"
#. Overlap.
-#: ../src/dialogs/dialog-about.c:439
+#: ../src/dialogs/dialog-about.c:441
msgid "the efforts of many people."
msgstr "indsatsen fra mange mennesker."
#. Overlap.
-#: ../src/dialogs/dialog-about.c:445
+#: ../src/dialogs/dialog-about.c:447
msgid "Your help is much appreciated!"
msgstr "Din hjælp er værdsat!"
-#: ../src/dialogs/dialog-about.c:493
+#: ../src/dialogs/dialog-about.c:495
msgid "We apologize if anyone was left out."
msgstr "Vi undskylder hvis vi har glemt nogen."
#. Overlap.
-#: ../src/dialogs/dialog-about.c:500
+#: ../src/dialogs/dialog-about.c:502
msgid "Please contact us to correct mistakes."
msgstr "Kontakt os for at rette fejl."
#. Overlap.
-#: ../src/dialogs/dialog-about.c:507
+#: ../src/dialogs/dialog-about.c:509
msgid "Report problems at http://bugzilla.gnome.org";
msgstr "Indrapporter fejl på http://bugzilla.gnome.org";
#. Overlap.
-#: ../src/dialogs/dialog-about.c:511 ../src/dialogs/dialog-about.c:517
+#: ../src/dialogs/dialog-about.c:513 ../src/dialogs/dialog-about.c:519
msgid "We aim to please!"
msgstr ""
-#: ../src/dialogs/dialog-about.c:540
+#: ../src/dialogs/dialog-about.c:542
msgid "About Gnumeric"
msgstr "Om Gnumeric"
-#: ../src/dialogs/dialog-about.c:543
+#: ../src/dialogs/dialog-about.c:545
msgid "Visit the Gnumeric website"
msgstr "Gå til Gnumeric's hjemmeside"
-#: ../src/dialogs/dialog-about.c:545
+#: ../src/dialogs/dialog-about.c:547
#, fuzzy
msgid "Copyright © 1998-2014"
msgstr "Ophavsret 1998-2010"
-#: ../src/dialogs/dialog-about.c:546
+#: ../src/dialogs/dialog-about.c:548
msgid "Free, Fast, Accurate - Pick Any Three!"
msgstr "Fri, hurtig, præcis - vælg alle tre!"
@@ -5624,21 +5632,21 @@ msgstr "Ny cellekommentar (%s)"
#. xgettext: This refers to a "none underline"
#: ../src/dialogs/dialog-cell-format.c:73
-#: ../src/dialogs/dialog-cell-format.c:884
+#: ../src/dialogs/dialog-cell-format.c:863
#, fuzzy
msgctxt "underline"
msgid "None"
msgstr "Ingen"
#: ../src/dialogs/dialog-cell-format.c:74
-#: ../src/dialogs/dialog-cell-format.c:885
+#: ../src/dialogs/dialog-cell-format.c:864
#, fuzzy
msgctxt "underline"
msgid "Single"
msgstr "Enkelt"
#: ../src/dialogs/dialog-cell-format.c:75
-#: ../src/dialogs/dialog-cell-format.c:886
+#: ../src/dialogs/dialog-cell-format.c:865
#, fuzzy
msgctxt "underline"
msgid "Double"
@@ -5646,7 +5654,7 @@ msgstr "Dobbelt"
#. xgettext: This refers to a "single low underline"
#: ../src/dialogs/dialog-cell-format.c:77
-#: ../src/dialogs/dialog-cell-format.c:887
+#: ../src/dialogs/dialog-cell-format.c:866
#, fuzzy
msgctxt "underline"
msgid "Single Low"
@@ -5654,80 +5662,80 @@ msgstr "Enkelt"
#. xgettext: This refers to a "double low underline"
#: ../src/dialogs/dialog-cell-format.c:79
-#: ../src/dialogs/dialog-cell-format.c:888
+#: ../src/dialogs/dialog-cell-format.c:867
#, fuzzy
msgctxt "underline"
msgid "Double Low"
msgstr "Dobbelt"
-#: ../src/dialogs/dialog-cell-format.c:485 ../src/dialogs/dialog-search.c:155
+#: ../src/dialogs/dialog-cell-format.c:464 ../src/dialogs/dialog-search.c:155
#: ../src/func.c:1630 ../src/wbc-gtk-actions.c:2733
msgid "Number"
msgstr "Tal"
-#: ../src/dialogs/dialog-cell-format.c:1732 ../src/dialogs/data-slicer.ui.h:2
+#: ../src/dialogs/dialog-cell-format.c:1711 ../src/dialogs/data-slicer.ui.h:2
msgid "Source"
msgstr "Kilde"
-#: ../src/dialogs/dialog-cell-format.c:1733
+#: ../src/dialogs/dialog-cell-format.c:1712
msgid "Criteria"
msgstr "Kriterium"
-#: ../src/dialogs/dialog-cell-format.c:1748
-#: ../src/dialogs/dialog-cell-format.c:1757 ../src/dialogs/so-scrollbar.ui.h:4
+#: ../src/dialogs/dialog-cell-format.c:1727
+#: ../src/dialogs/dialog-cell-format.c:1736 ../src/dialogs/so-scrollbar.ui.h:4
msgid "Min:"
msgstr "Min:"
-#: ../src/dialogs/dialog-cell-format.c:1749
-#: ../src/dialogs/dialog-cell-format.c:1761 ../src/dialogs/so-scrollbar.ui.h:5
+#: ../src/dialogs/dialog-cell-format.c:1728
+#: ../src/dialogs/dialog-cell-format.c:1740 ../src/dialogs/so-scrollbar.ui.h:5
msgid "Max:"
msgstr "Maks:"
-#: ../src/dialogs/dialog-cell-format.c:1753
+#: ../src/dialogs/dialog-cell-format.c:1732
#: ../src/dialogs/doc-meta-data.ui.h:34 ../src/dialogs/so-radiobutton.ui.h:4
msgid "Value:"
msgstr "Værdi:"
-#: ../src/dialogs/dialog-cell-format.c:1843
+#: ../src/dialogs/dialog-cell-format.c:1822
msgid "None (silently accept invalid input)"
msgstr "Ingen (acceptér stiltiende ugyldige inddata)"
-#: ../src/dialogs/dialog-cell-format.c:1851
+#: ../src/dialogs/dialog-cell-format.c:1830
msgid "Stop (never allow invalid input)"
msgstr "Stop (tillad aldrig ugyldige inddata)"
-#: ../src/dialogs/dialog-cell-format.c:1860
+#: ../src/dialogs/dialog-cell-format.c:1839
msgid "Warning (accept/discard invalid input)"
msgstr "Advarsel (accepter/fjern ugyldige inddata)"
-#: ../src/dialogs/dialog-cell-format.c:1869
+#: ../src/dialogs/dialog-cell-format.c:1848
msgid "Information (allow invalid input)"
msgstr "Information (tillad ugyldige inddata)"
-#: ../src/dialogs/dialog-cell-format.c:2106
+#: ../src/dialogs/dialog-cell-format.c:2085
msgid "The validation criteria are unusable. Disable validation?"
msgstr ""
-#: ../src/dialogs/dialog-cell-format.c:2312 ../src/dialogs/cell-format.ui.h:1
+#: ../src/dialogs/dialog-cell-format.c:2291 ../src/dialogs/cell-format.ui.h:17
msgid "Format Cells"
msgstr "Formatér celler"
-#: ../src/dialogs/dialog-cell-format.c:2374
-#: ../src/dialogs/cell-format-cond.ui.h:8 ../src/dialogs/cell-format.ui.h:41
+#: ../src/dialogs/dialog-cell-format.c:2354
+#: ../src/dialogs/cell-format-cond.ui.h:8 ../src/dialogs/cell-format.ui.h:57
msgid "Border"
msgstr "Kanter"
-#: ../src/dialogs/dialog-cell-format.c:2378 ../src/wbc-gtk.c:3450
+#: ../src/dialogs/dialog-cell-format.c:2358 ../src/wbc-gtk.c:3450
msgid "Clear Background"
msgstr "Ryd baggrund"
-#: ../src/dialogs/dialog-cell-format.c:2378
-#: ../src/dialogs/cell-format-cond.ui.h:9 ../src/dialogs/cell-format.ui.h:74
+#: ../src/dialogs/dialog-cell-format.c:2358
+#: ../src/dialogs/cell-format-cond.ui.h:9 ../src/dialogs/cell-format.ui.h:90
#: ../src/wbc-gtk.c:3452 ../src/wbc-gtk.c:3453
msgid "Background"
msgstr "Baggrund"
-#: ../src/dialogs/dialog-cell-format.c:2382
+#: ../src/dialogs/dialog-cell-format.c:2362
msgid "Pattern"
msgstr "Mønster"
@@ -6391,8 +6399,8 @@ msgstr "Ark"
#: ../src/dialogs/dialog-goto-cell.c:390 ../src/dialogs/dialog-search.c:441
#: ../src/dialogs/hf-config.ui.h:22 ../src/dialogs/tabulate.ui.h:3
-#: ../src/sheet-control-gui.c:2255 ../src/tools/gnm-solver.c:1454
-#: ../src/tools/gnm-solver.c:1502
+#: ../src/sheet-control-gui.c:2255 ../src/tools/gnm-solver.c:1455
+#: ../src/tools/gnm-solver.c:1503
msgid "Cell"
msgstr "Celle"
@@ -6492,12 +6500,12 @@ msgstr "Inddata data"
msgid "Merge Field"
msgstr "Flet felt"
-#: ../src/dialogs/dialog-password.c:26
+#: ../src/dialogs/dialog-password.c:27
#, c-format
msgid "%s is encrypted"
msgstr "%s er krypteret"
-#: ../src/dialogs/dialog-password.c:28
+#: ../src/dialogs/dialog-password.c:29
msgid ""
"Encrypted files require a password\n"
"before they can be opened."
@@ -6505,7 +6513,7 @@ msgstr ""
"Krypterede filer kræver en adgangskode\n"
"før de kan åbnes."
-#: ../src/dialogs/dialog-password.c:59
+#: ../src/dialogs/dialog-password.c:60
msgid "Password :"
msgstr "Adgangskode :"
@@ -6653,7 +6661,7 @@ msgid "Auto Correct"
msgstr "Automatiske rettelser"
#: ../src/dialogs/dialog-preferences.c:1217
-#: ../src/dialogs/cell-format-cond.ui.h:7 ../src/dialogs/cell-format.ui.h:22
+#: ../src/dialogs/cell-format-cond.ui.h:7 ../src/dialogs/cell-format.ui.h:38
#: ../src/widgets/gnm-fontbutton.c:1158
msgid "Font"
msgstr "Skrifttype"
@@ -7413,12 +7421,12 @@ msgstr "Fejl"
msgid "Cancelled"
msgstr "Afbrudt"
-#: ../src/dialogs/dialog-solver.c:582 ../src/tools/gnm-solver.c:1481
+#: ../src/dialogs/dialog-solver.c:582 ../src/tools/gnm-solver.c:1482
#, fuzzy
msgid "Feasible"
msgstr "Mulig"
-#: ../src/dialogs/dialog-solver.c:586 ../src/tools/gnm-solver.c:1484
+#: ../src/dialogs/dialog-solver.c:586 ../src/tools/gnm-solver.c:1485
msgid "Optimal"
msgstr ""
@@ -7448,10 +7456,6 @@ msgstr "Stop"
msgid "Stop the running solver"
msgstr "Stop den kørende løsningsalgoritme"
-#: ../src/dialogs/dialog-solver.c:693
-msgid "OK"
-msgstr "O.k."
-
#: ../src/dialogs/dialog-solver.c:705
msgid "Solver Status:"
msgstr "Status for løsningsalgoritme:"
@@ -7693,7 +7697,7 @@ msgid "Widgets"
msgstr "Kontroller"
#: ../src/dialogs/dialog-workbook-attr.c:199
-#: ../src/dialogs/cell-format-cond.ui.h:10 ../src/dialogs/cell-format.ui.h:79
+#: ../src/dialogs/cell-format-cond.ui.h:10 ../src/dialogs/cell-format.ui.h:95
msgid "Protection"
msgstr "Beskyttelse"
@@ -7940,11 +7944,11 @@ msgstr "indeholder ikke"
msgid "Count or percentage:"
msgstr "Antal eller procent:"
-#: ../src/dialogs/autofilter-top10.ui.h:3 ../src/dialogs/cell-format.ui.h:24
+#: ../src/dialogs/autofilter-top10.ui.h:3 ../src/dialogs/cell-format.ui.h:40
msgid "Top"
msgstr "Top"
-#: ../src/dialogs/autofilter-top10.ui.h:4 ../src/dialogs/cell-format.ui.h:28
+#: ../src/dialogs/autofilter-top10.ui.h:4 ../src/dialogs/cell-format.ui.h:44
#: ../src/wbc-gtk.c:3147
msgid "Bottom"
msgstr "Bund"
@@ -7993,19 +7997,19 @@ msgstr "Anvend _justering"
msgid "_Edges"
msgstr "_Hjørner"
-#: ../src/dialogs/autoformat.ui.h:10 ../src/dialogs/cell-format.ui.h:3
+#: ../src/dialogs/autoformat.ui.h:10 ../src/dialogs/cell-format.ui.h:19
msgid "_Left"
msgstr "_Venstre"
-#: ../src/dialogs/autoformat.ui.h:11 ../src/dialogs/cell-format.ui.h:9
+#: ../src/dialogs/autoformat.ui.h:11 ../src/dialogs/cell-format.ui.h:25
msgid "_Right"
msgstr "_Højre"
-#: ../src/dialogs/autoformat.ui.h:12 ../src/dialogs/cell-format.ui.h:13
+#: ../src/dialogs/autoformat.ui.h:12 ../src/dialogs/cell-format.ui.h:29
msgid "_Top"
msgstr "_Top"
-#: ../src/dialogs/autoformat.ui.h:13 ../src/dialogs/cell-format.ui.h:15
+#: ../src/dialogs/autoformat.ui.h:13 ../src/dialogs/cell-format.ui.h:31
msgid "_Bottom"
msgstr "_Bund"
@@ -8103,11 +8107,11 @@ msgstr ""
msgid "Number Format"
msgstr "Talformat"
-#: ../src/dialogs/cell-format-cond.ui.h:6 ../src/dialogs/cell-format.ui.h:21
+#: ../src/dialogs/cell-format-cond.ui.h:6 ../src/dialogs/cell-format.ui.h:37
msgid "Alignment"
msgstr "Justering"
-#: ../src/dialogs/cell-format-cond.ui.h:11 ../src/dialogs/cell-format.ui.h:89
+#: ../src/dialogs/cell-format-cond.ui.h:11 ../src/dialogs/cell-format.ui.h:105
msgid "Validation"
msgstr "Datagyldighedskontrol"
@@ -8120,379 +8124,379 @@ msgstr "Stil:"
msgid "_Edit Style"
msgstr "_Rediger stil"
+#: ../src/dialogs/cell-format.ui.h:1
+msgid "Any Value (no validation)"
+msgstr ""
+
#: ../src/dialogs/cell-format.ui.h:2
+msgid "Whole numbers"
+msgstr ""
+
+#: ../src/dialogs/cell-format.ui.h:3
+#, fuzzy
+msgid "Numbers"
+msgstr "Tal"
+
+#: ../src/dialogs/cell-format.ui.h:4
+#, fuzzy
+msgid "In a list"
+msgstr "En simpel liste"
+
+#: ../src/dialogs/cell-format.ui.h:5 ../src/dialogs/hf-config.ui.h:8
+#: ../src/wbc-gtk-actions.c:2748
+msgid "Date"
+msgstr "Dato"
+
+#: ../src/dialogs/cell-format.ui.h:6 ../src/dialogs/hf-config.ui.h:10
+#: ../src/tools/analysis-exp-smoothing.c:728
+#: ../src/tools/analysis-exp-smoothing.c:1048
+#: ../src/tools/analysis-kaplan-meier.c:123 ../src/wbc-gtk-actions.c:2751
+msgid "Time"
+msgstr "Tid"
+
+#: ../src/dialogs/cell-format.ui.h:7
+msgid "Text length"
+msgstr ""
+
+# skal passe med tekst senere (dækker kun over et enkelt tegn, brugerdefineret virker som overkill)
+#: ../src/dialogs/cell-format.ui.h:8 ../src/dialogs/dialog-stf-export.ui.h:16
+#, fuzzy
+msgid "Custom"
+msgstr "_Selvvalgt"
+
+#: ../src/dialogs/cell-format.ui.h:9
+msgid "min <= val <= max (between)"
+msgstr ""
+
+#: ../src/dialogs/cell-format.ui.h:10
+msgid "val <= min || max <= val (not between)"
+msgstr ""
+
+#: ../src/dialogs/cell-format.ui.h:11
+msgid "val == bound (equal to)"
+msgstr ""
+
+#: ../src/dialogs/cell-format.ui.h:12
+msgid "val <> bound (not equal to)"
+msgstr ""
+
+#: ../src/dialogs/cell-format.ui.h:13
+msgid "val > bound (greater than)"
+msgstr ""
+
+#: ../src/dialogs/cell-format.ui.h:14
+msgid "val < bound (less than)"
+msgstr ""
+
+#: ../src/dialogs/cell-format.ui.h:15
+msgid "val >= bound (greater than or equal)"
+msgstr ""
+
+#: ../src/dialogs/cell-format.ui.h:16
+msgid "val <= bound (less than or equal)"
+msgstr ""
+
+#: ../src/dialogs/cell-format.ui.h:18
msgid "<b>Horizontal alignment</b>"
msgstr "<b>Vandret justering</b>"
-#: ../src/dialogs/cell-format.ui.h:4
+#: ../src/dialogs/cell-format.ui.h:20
msgid "_General"
msgstr "_Generelt"
-#: ../src/dialogs/cell-format.ui.h:5
+#: ../src/dialogs/cell-format.ui.h:21
msgid "Center across _selection"
msgstr "Centrer hen over _markering"
-#: ../src/dialogs/cell-format.ui.h:6
+#: ../src/dialogs/cell-format.ui.h:22
msgid "_Indent:"
msgstr "_Indryk"
-#: ../src/dialogs/cell-format.ui.h:7
+#: ../src/dialogs/cell-format.ui.h:23
msgid "<b>Vertical alignment</b>"
msgstr "<b>Lodret justering</b>"
-#: ../src/dialogs/cell-format.ui.h:8
+#: ../src/dialogs/cell-format.ui.h:24
msgid "Ce_nter"
msgstr "Centrér"
-#: ../src/dialogs/cell-format.ui.h:10
+#: ../src/dialogs/cell-format.ui.h:26
msgid "_Fill"
msgstr "_Udfyld"
-#: ../src/dialogs/cell-format.ui.h:11
+#: ../src/dialogs/cell-format.ui.h:27
msgid "_Justify"
msgstr "_Justér"
-#: ../src/dialogs/cell-format.ui.h:12
+#: ../src/dialogs/cell-format.ui.h:28
msgid "D_istributed"
msgstr "_Fordelt"
-#: ../src/dialogs/cell-format.ui.h:14
+#: ../src/dialogs/cell-format.ui.h:30
msgid "C_enter"
msgstr "_Centrér"
-#: ../src/dialogs/cell-format.ui.h:16
+#: ../src/dialogs/cell-format.ui.h:32
msgid "J_ustify"
msgstr "J_ustér"
-#: ../src/dialogs/cell-format.ui.h:17
+#: ../src/dialogs/cell-format.ui.h:33
msgid "_Distributed"
msgstr "F_ordelt"
-#: ../src/dialogs/cell-format.ui.h:18
+#: ../src/dialogs/cell-format.ui.h:34
msgid "<b>Control</b>"
msgstr "<b>Kontrol</b>"
-#: ../src/dialogs/cell-format.ui.h:19
+#: ../src/dialogs/cell-format.ui.h:35
msgid "_Wrap text"
msgstr "_Ombryd tekst"
-#: ../src/dialogs/cell-format.ui.h:20
+#: ../src/dialogs/cell-format.ui.h:36
msgid "Shrin_k to fit"
msgstr "Forminds_k for at passe"
-#: ../src/dialogs/cell-format.ui.h:23
+#: ../src/dialogs/cell-format.ui.h:39
msgid "Reverse Diagonal"
msgstr "Omvendt diagonal"
-#: ../src/dialogs/cell-format.ui.h:25
+#: ../src/dialogs/cell-format.ui.h:41
msgid "Diagonal"
msgstr "Diagonal"
#. start sub menu
-#: ../src/dialogs/cell-format.ui.h:26 ../src/sheet-control-gui.c:2235
+#: ../src/dialogs/cell-format.ui.h:42 ../src/sheet-control-gui.c:2235
#: ../src/wbc-gtk.c:3139
msgid "Left"
msgstr "Venstre"
-#: ../src/dialogs/cell-format.ui.h:27 ../src/sheet-control-gui.c:2238
+#: ../src/dialogs/cell-format.ui.h:43 ../src/sheet-control-gui.c:2238
#: ../src/wbc-gtk.c:3141
msgid "Right"
msgstr "Højre"
-#: ../src/dialogs/cell-format.ui.h:29 ../src/widgets/gnumeric-text-view.c:282
+#: ../src/dialogs/cell-format.ui.h:45 ../src/widgets/gnumeric-text-view.c:282
msgid "None"
msgstr "Ingen"
#. Cell border
-#: ../src/dialogs/cell-format.ui.h:31
+#: ../src/dialogs/cell-format.ui.h:47
msgctxt "border"
msgid "None"
msgstr "Ingen"
-#: ../src/dialogs/cell-format.ui.h:32
+#: ../src/dialogs/cell-format.ui.h:48
msgid "Outline"
msgstr "Omrids"
-#: ../src/dialogs/cell-format.ui.h:33
+#: ../src/dialogs/cell-format.ui.h:49
msgid "Inside Vertical"
msgstr "Indvendig lodret"
-#: ../src/dialogs/cell-format.ui.h:34
+#: ../src/dialogs/cell-format.ui.h:50
msgid "Inside"
msgstr "Indvendig"
-#: ../src/dialogs/cell-format.ui.h:35
+#: ../src/dialogs/cell-format.ui.h:51
msgid "Inside Horizontal"
msgstr "Indvendig vandret"
-#: ../src/dialogs/cell-format.ui.h:36
+#: ../src/dialogs/cell-format.ui.h:52
msgid "<b>Line</b>"
msgstr "<b>Linje</b>"
-#: ../src/dialogs/cell-format.ui.h:37
+#: ../src/dialogs/cell-format.ui.h:53
msgid "Style:"
msgstr "Stil:"
#. Cell border line
-#: ../src/dialogs/cell-format.ui.h:39
+#: ../src/dialogs/cell-format.ui.h:55
msgctxt "line"
msgid "None"
msgstr "Ingen"
-#: ../src/dialogs/cell-format.ui.h:40
+#: ../src/dialogs/cell-format.ui.h:56
msgid "C_olor:"
msgstr "_Farve:"
-#: ../src/dialogs/cell-format.ui.h:42
+#: ../src/dialogs/cell-format.ui.h:58
msgid "<b>Background</b>"
msgstr "<b>Baggrund</b>"
# stikprøve kolliderer med at det bruges i betydningen "et eksempel"
-#: ../src/dialogs/cell-format.ui.h:43
+#: ../src/dialogs/cell-format.ui.h:59
msgid "<b>Sample</b>"
msgstr "<b>Prøve</b>"
-#: ../src/dialogs/cell-format.ui.h:44
+#: ../src/dialogs/cell-format.ui.h:60
msgid "<b>Pattern</b>"
msgstr "<b>Mønster</b>"
-#: ../src/dialogs/cell-format.ui.h:45
+#: ../src/dialogs/cell-format.ui.h:61
msgid "Solid"
msgstr "Ensfarvet"
-#: ../src/dialogs/cell-format.ui.h:47
+#: ../src/dialogs/cell-format.ui.h:63
#, no-c-format
msgid "75% Grey"
msgstr "75% grå"
-#: ../src/dialogs/cell-format.ui.h:49
+#: ../src/dialogs/cell-format.ui.h:65
#, no-c-format
msgid "50% Grey"
msgstr "50% grå"
-#: ../src/dialogs/cell-format.ui.h:51
+#: ../src/dialogs/cell-format.ui.h:67
#, no-c-format
msgid "25% Grey"
msgstr "25% grå"
-#: ../src/dialogs/cell-format.ui.h:53
+#: ../src/dialogs/cell-format.ui.h:69
#, no-c-format
msgid "12.5% Grey"
msgstr "12,5% grå"
-#: ../src/dialogs/cell-format.ui.h:55
+#: ../src/dialogs/cell-format.ui.h:71
#, no-c-format
msgid "6.25% Grey"
msgstr "6,25% grå"
-#: ../src/dialogs/cell-format.ui.h:56
+#: ../src/dialogs/cell-format.ui.h:72
msgid "Horizontal Stripe"
msgstr "Vandret stribe"
-#: ../src/dialogs/cell-format.ui.h:57
+#: ../src/dialogs/cell-format.ui.h:73
msgid "Vertical Stripe"
msgstr "Lodret stribe"
-#: ../src/dialogs/cell-format.ui.h:58
+#: ../src/dialogs/cell-format.ui.h:74
msgid "Reverse Diagonal Stripe"
msgstr "Omvendt diagonal stribe"
-#: ../src/dialogs/cell-format.ui.h:59
+#: ../src/dialogs/cell-format.ui.h:75
msgid "Diagonal Stripe"
msgstr "Diagonal stribe"
-#: ../src/dialogs/cell-format.ui.h:60
+#: ../src/dialogs/cell-format.ui.h:76
msgid "Diagonal Crosshatch"
msgstr "Diagonal krydsskravering"
-#: ../src/dialogs/cell-format.ui.h:61
+#: ../src/dialogs/cell-format.ui.h:77
msgid "Thick Diagonal Crosshatch"
msgstr "Tyk diagonal krydsskravering"
-#: ../src/dialogs/cell-format.ui.h:62
+#: ../src/dialogs/cell-format.ui.h:78
msgid "Thin Horizontal Stripe"
msgstr "Tynd vandret stribe"
-#: ../src/dialogs/cell-format.ui.h:63
+#: ../src/dialogs/cell-format.ui.h:79
msgid "Thin Vertical Stripe"
msgstr "Tynd lodret stribe"
-#: ../src/dialogs/cell-format.ui.h:64
+#: ../src/dialogs/cell-format.ui.h:80
msgid "Thin Reverse Diagonal Stripe"
msgstr "Tynd omvendt diagonal stribe"
-#: ../src/dialogs/cell-format.ui.h:65
+#: ../src/dialogs/cell-format.ui.h:81
msgid "Thin Diagonal Stripe"
msgstr "Tynd diagonal stribe"
-#: ../src/dialogs/cell-format.ui.h:66
+#: ../src/dialogs/cell-format.ui.h:82
msgid "Thin Horizontal Crosshatch"
msgstr "Tynd vandret krydsskravering"
-#: ../src/dialogs/cell-format.ui.h:67
+#: ../src/dialogs/cell-format.ui.h:83
msgid "Thin Diagonal Crosshatch"
msgstr "Tynd diagonal krydsskravering"
-#: ../src/dialogs/cell-format.ui.h:68
+#: ../src/dialogs/cell-format.ui.h:84
msgid "Foreground Solid"
msgstr "Ensfarvet forgrund"
-#: ../src/dialogs/cell-format.ui.h:69
+#: ../src/dialogs/cell-format.ui.h:85
msgid "Small Circles"
msgstr "Små cirkler"
-#: ../src/dialogs/cell-format.ui.h:70
+#: ../src/dialogs/cell-format.ui.h:86
msgid "Semi Circles"
msgstr "Halvcirkler"
-#: ../src/dialogs/cell-format.ui.h:71
+#: ../src/dialogs/cell-format.ui.h:87
msgid "Thatch"
msgstr "Stråtag"
-#: ../src/dialogs/cell-format.ui.h:72
+#: ../src/dialogs/cell-format.ui.h:88
msgid "Large Circles"
msgstr "Store cirkler"
-#: ../src/dialogs/cell-format.ui.h:73
+#: ../src/dialogs/cell-format.ui.h:89
msgid "Bricks"
msgstr "Mursten"
-#: ../src/dialogs/cell-format.ui.h:75
+#: ../src/dialogs/cell-format.ui.h:91
msgid "_Lock"
msgstr "_Låst"
-#: ../src/dialogs/cell-format.ui.h:76
+#: ../src/dialogs/cell-format.ui.h:92
msgid "Hi_de"
msgstr "Skjul"
-#: ../src/dialogs/cell-format.ui.h:77
+#: ../src/dialogs/cell-format.ui.h:93
msgid "Locking cells or hiding formulæ only affects protected worksheets."
msgstr ""
"Låsning af celler eller skjulning af formler påvirker kun beskyttede "
"arbejdsark."
-#: ../src/dialogs/cell-format.ui.h:78
+#: ../src/dialogs/cell-format.ui.h:94
msgid "_Protect worksheet"
msgstr "_Beskyt arbejdsark"
-#: ../src/dialogs/cell-format.ui.h:80
+#: ../src/dialogs/cell-format.ui.h:96
msgid "<span weight=\"bold\">Criteria</span>"
msgstr "<span weight=\"bold\">Kriterium</span>"
-#: ../src/dialogs/cell-format.ui.h:81
+#: ../src/dialogs/cell-format.ui.h:97
msgid "Allo_w:"
msgstr "_Tillad:"
-#: ../src/dialogs/cell-format.ui.h:82
+#: ../src/dialogs/cell-format.ui.h:98
msgid "Con_dition:"
msgstr "Betingelse:"
-#: ../src/dialogs/cell-format.ui.h:83
+#: ../src/dialogs/cell-format.ui.h:99
msgid "Ignore _blank cells"
msgstr "Ignorér tomme celler"
-#: ../src/dialogs/cell-format.ui.h:84
+#: ../src/dialogs/cell-format.ui.h:100
#, fuzzy
msgid "I_n-cell dropdown"
msgstr "Menuvalg i celle"
-#: ../src/dialogs/cell-format.ui.h:85
+#: ../src/dialogs/cell-format.ui.h:101
#, fuzzy
msgid "<b>Error alerts</b>"
msgstr "Fejlbesked"
-#: ../src/dialogs/cell-format.ui.h:86
+#: ../src/dialogs/cell-format.ui.h:102
msgid "Ac_tion:"
msgstr "_Handling:"
-#: ../src/dialogs/cell-format.ui.h:87
+#: ../src/dialogs/cell-format.ui.h:103
msgid "Titl_e:"
msgstr "Titel:"
-#: ../src/dialogs/cell-format.ui.h:88
+#: ../src/dialogs/cell-format.ui.h:104
msgid "_Message:"
msgstr "Meddelelse:"
-#: ../src/dialogs/cell-format.ui.h:90
+#: ../src/dialogs/cell-format.ui.h:106
msgid "_Show input message when cell is selected"
msgstr "Vis indtastningsmeddelelse når cellen vælges"
-#: ../src/dialogs/cell-format.ui.h:91
+#: ../src/dialogs/cell-format.ui.h:107
msgid "Input Message"
msgstr "Indtastningsmeddelelse"
-#: ../src/dialogs/cell-format.ui.h:92
-msgid "Any Value (no validation)"
-msgstr ""
-
-#: ../src/dialogs/cell-format.ui.h:93
-msgid "Whole numbers"
-msgstr ""
-
-#: ../src/dialogs/cell-format.ui.h:94
-#, fuzzy
-msgid "Numbers"
-msgstr "Tal"
-
-#: ../src/dialogs/cell-format.ui.h:95
-#, fuzzy
-msgid "In a list"
-msgstr "En simpel liste"
-
-#: ../src/dialogs/cell-format.ui.h:96 ../src/dialogs/hf-config.ui.h:8
-#: ../src/wbc-gtk-actions.c:2748
-msgid "Date"
-msgstr "Dato"
-
-#: ../src/dialogs/cell-format.ui.h:97 ../src/dialogs/hf-config.ui.h:10
-#: ../src/tools/analysis-exp-smoothing.c:728
-#: ../src/tools/analysis-exp-smoothing.c:1048
-#: ../src/tools/analysis-kaplan-meier.c:123 ../src/wbc-gtk-actions.c:2751
-msgid "Time"
-msgstr "Tid"
-
-#: ../src/dialogs/cell-format.ui.h:98
-msgid "Text length"
-msgstr ""
-
-# skal passe med tekst senere (dækker kun over et enkelt tegn, brugerdefineret virker som overkill)
-#: ../src/dialogs/cell-format.ui.h:99 ../src/dialogs/dialog-stf-export.ui.h:16
-#, fuzzy
-msgid "Custom"
-msgstr "_Selvvalgt"
-
-#: ../src/dialogs/cell-format.ui.h:100
-msgid "min <= val <= max (between)"
-msgstr ""
-
-#: ../src/dialogs/cell-format.ui.h:101
-msgid "val <= min || max <= val (not between)"
-msgstr ""
-
-#: ../src/dialogs/cell-format.ui.h:102
-msgid "val == bound (equal to)"
-msgstr ""
-
-#: ../src/dialogs/cell-format.ui.h:103
-msgid "val <> bound (not equal to)"
-msgstr ""
-
-#: ../src/dialogs/cell-format.ui.h:104
-msgid "val > bound (greater than)"
-msgstr ""
-
-#: ../src/dialogs/cell-format.ui.h:105
-msgid "val < bound (less than)"
-msgstr ""
-
-#: ../src/dialogs/cell-format.ui.h:106
-msgid "val >= bound (greater than or equal)"
-msgstr ""
-
-#: ../src/dialogs/cell-format.ui.h:107
-msgid "val <= bound (less than or equal)"
-msgstr ""
-
#: ../src/dialogs/cell-sort.ui.h:1
msgid "Sort..."
msgstr "Sortering..."
@@ -11678,7 +11682,7 @@ msgstr "Inddatavariabler:"
msgid "Output variables:"
msgstr "Inddata-_mærkater"
-#: ../src/dialogs/simulation.ui.h:4 ../src/tools/gnm-solver.c:1500
+#: ../src/dialogs/simulation.ui.h:4 ../src/tools/gnm-solver.c:1501
msgid "Variables"
msgstr "Variabler"
@@ -11861,7 +11865,7 @@ msgid "Re_place"
msgstr "_Erstat"
#. ----------------------------------------
-#: ../src/dialogs/solver.ui.h:20 ../src/tools/gnm-solver.c:1559
+#: ../src/dialogs/solver.ui.h:20 ../src/tools/gnm-solver.c:1560
msgid "Constraints"
msgstr "Begrænsninger"
@@ -11914,12 +11918,12 @@ msgstr ""
msgid "="
msgstr ""
-#: ../src/dialogs/solver.ui.h:34 ../src/tools/gnm-solver.c:383
+#: ../src/dialogs/solver.ui.h:34 ../src/tools/gnm-solver.c:384
#, fuzzy
msgid "Int"
msgstr "Inddata"
-#: ../src/dialogs/solver.ui.h:35 ../src/tools/gnm-solver.c:384
+#: ../src/dialogs/solver.ui.h:35 ../src/tools/gnm-solver.c:385
#, fuzzy
msgid "Bool"
msgstr "Fed"
@@ -12564,6 +12568,31 @@ msgstr ""
msgid "The %s plugin is required but is not loaded."
msgstr ""
+#: ../src/gui-util.h:155
+msgctxt "Stock label"
+msgid "_Open"
+msgstr "_Åbn"
+
+#: ../src/gui-util.h:158
+msgctxt "Stock label"
+msgid "_Save"
+msgstr "_Gem"
+
+#: ../src/gui-util.h:161
+msgctxt "Stock label"
+msgid "Save _As"
+msgstr "Gem _som"
+
+#: ../src/gui-util.h:164
+msgctxt "Stock label"
+msgid "_Cancel"
+msgstr "_Annullér"
+
+#: ../src/gui-util.h:167
+msgctxt "Stock label"
+msgid "_OK"
+msgstr "O.k."
+
#: ../src/hlink.c:171 ../src/hlink.c:187
#, fuzzy
msgid "Link target"
@@ -12664,23 +12693,23 @@ msgstr ""
msgid "Drag to move"
msgstr ""
-#: ../src/libgnumeric.c:82
+#: ../src/libgnumeric.c:143
msgid "Display Gnumeric's version"
msgstr "Vis Gnumerics versionsnummer"
-#: ../src/libgnumeric.c:91
+#: ../src/libgnumeric.c:152
msgid "Set the root library directory"
msgstr "Sæt rodkataloget for biblioteker"
-#: ../src/libgnumeric.c:92 ../src/libgnumeric.c:98
+#: ../src/libgnumeric.c:153 ../src/libgnumeric.c:159
msgid "DIR"
msgstr ""
-#: ../src/libgnumeric.c:97
+#: ../src/libgnumeric.c:158
msgid "Adjust the root data directory"
msgstr "Ændr rodkataloget for data"
-#: ../src/libgnumeric.c:114
+#: ../src/libgnumeric.c:175
#, c-format
msgid ""
"gnumeric version '%s'\n"
@@ -12691,12 +12720,12 @@ msgstr ""
"datakatalog := %s\n"
"bibkatalog := %s\n"
-#: ../src/libgnumeric.c:138
+#: ../src/libgnumeric.c:199
#, fuzzy
msgid "Gnumeric Options"
msgstr "Gnumeric: Datagyldighedskontrol"
-#: ../src/libgnumeric.c:138
+#: ../src/libgnumeric.c:199
#, fuzzy
msgid "Show Gnumeric Options"
msgstr "Gnumeric: Datagyldighedskontrol"
@@ -13368,11 +13397,6 @@ msgstr "Ukendt fejl ved gemning af billede"
msgid "Save as"
msgstr "Gem som"
-#: ../src/sheet-object-component.c:270
-#, fuzzy
-msgid "_Save As"
-msgstr "_Gem som"
-
#: ../src/sheet-object-component.c:271 ../src/sheet-object-graph.c:399
#: ../src/sheet-object-image.c:364
msgid "_Save As Image"
@@ -14885,105 +14909,105 @@ msgstr ""
msgid "Advanced Filter (%s)"
msgstr "Avanceret filter (%s)"
-#: ../src/tools/gnm-solver.c:593
+#: ../src/tools/gnm-solver.c:594
#, fuzzy, c-format
msgid "Invalid solver target"
msgstr "Ugyldigt antal parametre"
-#: ../src/tools/gnm-solver.c:605
+#: ../src/tools/gnm-solver.c:606
#, fuzzy, c-format
msgid "Target cell, %s, must contain a formula that evaluates to a number"
msgstr "Målcellen bør indholde et udtryk"
-#: ../src/tools/gnm-solver.c:615
+#: ../src/tools/gnm-solver.c:616
#, fuzzy, c-format
msgid "Invalid solver input range"
msgstr "Ugyldigt scenarienavn"
-#: ../src/tools/gnm-solver.c:626
+#: ../src/tools/gnm-solver.c:627
#, fuzzy, c-format
msgid "Input cell %s contains a formula"
msgstr "Målcellen bør indholde et udtryk"
-#: ../src/tools/gnm-solver.c:641
+#: ../src/tools/gnm-solver.c:642
#, fuzzy, c-format
msgid "Solver constraint #%d is invalid"
msgstr "Søgeintervallet er ugyldigt."
-#: ../src/tools/gnm-solver.c:977
+#: ../src/tools/gnm-solver.c:978
msgid "Timeout"
msgstr "Tidsudløb"
-#: ../src/tools/gnm-solver.c:1234
+#: ../src/tools/gnm-solver.c:1235
#, fuzzy, c-format
msgid "Failed to create file for linear program"
msgstr "Kan ikke oprette midlertidig fil."
-#: ../src/tools/gnm-solver.c:1243
+#: ../src/tools/gnm-solver.c:1244
#, c-format
msgid "Failed to create linear program file"
msgstr "Kunne ikke oprette lineær programfil"
-#: ../src/tools/gnm-solver.c:1263
+#: ../src/tools/gnm-solver.c:1264
#, c-format
msgid "Failed to save linear program"
msgstr "Kunne ikke gemme lineært program"
-#: ../src/tools/gnm-solver.c:1453
+#: ../src/tools/gnm-solver.c:1454
#, fuzzy
msgid "Target"
msgstr "_Listeinterval:"
-#: ../src/tools/gnm-solver.c:1457
+#: ../src/tools/gnm-solver.c:1458
#, fuzzy
msgid "Status"
msgstr "status"
-#: ../src/tools/gnm-solver.c:1470
+#: ../src/tools/gnm-solver.c:1471
#, fuzzy
msgid "Minimize"
msgstr "Minimum"
-#: ../src/tools/gnm-solver.c:1473
+#: ../src/tools/gnm-solver.c:1474
#, fuzzy
msgid "Maximize"
msgstr "Maksimum"
-#: ../src/tools/gnm-solver.c:1504
+#: ../src/tools/gnm-solver.c:1505
#, fuzzy
msgid "Lower"
msgstr "Indlæser"
-#: ../src/tools/gnm-solver.c:1505
+#: ../src/tools/gnm-solver.c:1506
msgid "Upper"
msgstr ""
-#: ../src/tools/gnm-solver.c:1506 ../src/tools/gnm-solver.c:1565
+#: ../src/tools/gnm-solver.c:1507 ../src/tools/gnm-solver.c:1566
#, fuzzy
msgid "Slack"
msgstr "Sort"
-#: ../src/tools/gnm-solver.c:1540
+#: ../src/tools/gnm-solver.c:1541
#, fuzzy
msgid "At limit"
msgstr "Grænse"
-#: ../src/tools/gnm-solver.c:1544
+#: ../src/tools/gnm-solver.c:1545
#, fuzzy
msgid "Outside bounds"
msgstr "Kanter udenom"
-#: ../src/tools/gnm-solver.c:1562
+#: ../src/tools/gnm-solver.c:1563
#, fuzzy
msgid "Condition"
msgstr "Betingelse:"
-#: ../src/tools/gnm-solver.c:1567
+#: ../src/tools/gnm-solver.c:1568
#, fuzzy
msgid "No constraints"
msgstr "Begrænsninger"
-#: ../src/tools/gnm-solver.c:2021
+#: ../src/tools/gnm-solver.c:2022
#, c-format
msgid ""
"Gnumeric is unable to locate the program <i>%s</i> needed for the <i>%s</i> "
@@ -14992,12 +15016,12 @@ msgid ""
"Would you like to locate it yourself?"
msgstr ""
-#: ../src/tools/gnm-solver.c:2025
+#: ../src/tools/gnm-solver.c:2026
#, fuzzy, c-format
msgid "Unable to locate %s"
msgstr "kan ikke åbne filen '%s'"
-#: ../src/tools/gnm-solver.c:2041
+#: ../src/tools/gnm-solver.c:2042
#, c-format
msgid "Locate the %s program"
msgstr ""
@@ -15633,26 +15657,14 @@ msgstr "_Ny"
msgid "Create a new workbook"
msgstr "Opret ny arbejdsbog"
-#: ../src/wbc-gtk-actions.c:2003
-msgid "_Open"
-msgstr "_Åbn"
-
#: ../src/wbc-gtk-actions.c:2004
msgid "Open a file"
msgstr "Importerer en fil"
-#: ../src/wbc-gtk-actions.c:2006
-msgid "_Save"
-msgstr "_Gem"
-
#: ../src/wbc-gtk-actions.c:2007
msgid "Save the current workbook"
msgstr "Gem den aktuelle arbejdsbog"
-#: ../src/wbc-gtk-actions.c:2009
-msgid "Save _As"
-msgstr "Gem _som"
-
#: ../src/wbc-gtk-actions.c:2010
msgid "Save the current workbook with a different name"
msgstr "Gem den aktuelle fil under et andet navn"
@@ -18474,3 +18486,10 @@ msgstr "Navn på skabelon"
#, fuzzy
msgid "A simple list template"
msgstr "Navn på skabelon"
+
+#~ msgid "OK"
+#~ msgstr "O.k."
+
+#, fuzzy
+#~ msgid "_Save As"
+#~ msgstr "_Gem som"
diff --git a/src/dialogs/dialog-password.c b/src/dialogs/dialog-password.c
index e4a4f52..3737552 100644
--- a/src/dialogs/dialog-password.c
+++ b/src/dialogs/dialog-password.c
@@ -2,6 +2,7 @@
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
#include "dialogs.h"
+#include "gui-util.h"
static void
cb_accept_password (G_GNUC_UNUSED GtkWidget *IGNORED, GtkDialog *d)
@@ -37,8 +38,8 @@ dialog_get_password (GtkWindow *parent, const char *filename)
d = gtk_dialog_new_with_buttons ("", parent,
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+ GNM_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GNM_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
NULL);
gtk_window_set_resizable (GTK_WINDOW (d), FALSE);
hb = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
diff --git a/src/dialogs/dialog-so-styled.c b/src/dialogs/dialog-so-styled.c
index 37a513a..537b36f 100644
--- a/src/dialogs/dialog-so-styled.c
+++ b/src/dialogs/dialog-so-styled.c
@@ -157,8 +157,8 @@ dialog_so_styled (WBCGtk *wbcg,
gnumeric_init_help_button (help, "sect-graphics-drawings");
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ GNM_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GNM_STOCK_OK, GTK_RESPONSE_OK,
NULL);
editor = go_style_get_editor (orig, default_style,
diff --git a/src/dialogs/dialog-solver.c b/src/dialogs/dialog-solver.c
index 6bc4768..62a3201 100644
--- a/src/dialogs/dialog-solver.c
+++ b/src/dialogs/dialog-solver.c
@@ -690,7 +690,7 @@ run_solver (SolverState *state, GnmSolverParameters *param)
state->run.ok_button =
go_gtk_dialog_add_button (dialog,
- _("OK"),
+ GNM_STOCK_OK,
GTK_STOCK_OK,
GTK_RESPONSE_YES);
diff --git a/src/dialogs/dialog-stf-format-page.c b/src/dialogs/dialog-stf-format-page.c
index 7719162..6a2c830 100644
--- a/src/dialogs/dialog-stf-format-page.c
+++ b/src/dialogs/dialog-stf-format-page.c
@@ -205,8 +205,8 @@ cb_format_clicked (GtkButton *widget, gpointer _i)
(_("Format Selector"),
GTK_WINDOW (pagedata->dialog),
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
- GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+ GNM_STOCK_OK, GTK_RESPONSE_ACCEPT,
+ GNM_STOCK_CANCEL, GTK_RESPONSE_REJECT,
NULL);
GOFormatSel *format_selector
= GO_FORMAT_SEL (go_format_sel_new_full (TRUE));
diff --git a/src/gui-file.c b/src/gui-file.c
index 67d7a76..3b6d149 100644
--- a/src/gui-file.c
+++ b/src/gui-file.c
@@ -342,8 +342,8 @@ gui_file_open (WBCGtk *wbcg, GnmFileOpenStyle type, char const *default_format)
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (fsel))),
advanced_button, FALSE, TRUE, 6);
gtk_dialog_add_buttons (GTK_DIALOG (fsel),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+ GNM_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GNM_STOCK_OPEN, GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (fsel), GTK_RESPONSE_OK);
@@ -569,8 +569,8 @@ gui_file_save_as (WBCGtk *wbcg, WorkbookView *wb_view, GnmFileSaveAsStyle type,
"title", title,
NULL));
gtk_dialog_add_buttons (GTK_DIALOG (fsel),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE, GTK_RESPONSE_OK,
+ GNM_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GNM_STOCK_SAVE, GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (fsel), GTK_RESPONSE_OK);
diff --git a/src/gui-util.h b/src/gui-util.h
index b522897..98fae17 100644
--- a/src/gui-util.h
+++ b/src/gui-util.h
@@ -144,6 +144,28 @@ void
gnm_cell_renderer_text_copy_background_to_cairo (GtkCellRendererText *crt,
cairo_t *cr);
+
+/*
+ * These macros exist to replace the old gtk+ stock items. Note, that these only
+ * cover strings with mnemonics. I.e., you must handle icons and accelerators
+ * in some other way. (So why do we have them in the first place? To ensure
+ * the user interface is as consistent as possible.)
+ */
+#define GNM_STOCK_OPEN g_dpgettext2(GETTEXT_PACKAGE, "Stock label", GNM_N_STOCK_OPEN)
+#define GNM_N_STOCK_OPEN NC_("Stock label", "_Open")
+
+#define GNM_STOCK_SAVE g_dpgettext2(GETTEXT_PACKAGE, "Stock label", GNM_N_STOCK_SAVE)
+#define GNM_N_STOCK_SAVE NC_("Stock label", "_Save")
+
+#define GNM_STOCK_SAVE_AS g_dpgettext2(GETTEXT_PACKAGE, "Stock label", GNM_N_STOCK_SAVE_AS)
+#define GNM_N_STOCK_SAVE_AS NC_("Stock label", "Save _As")
+
+#define GNM_STOCK_CANCEL g_dpgettext2(GETTEXT_PACKAGE, "Stock label", GNM_N_STOCK_CANCEL)
+#define GNM_N_STOCK_CANCEL NC_("Stock label", "_Cancel")
+
+#define GNM_STOCK_OK g_dpgettext2(GETTEXT_PACKAGE, "Stock label", GNM_N_STOCK_OK)
+#define GNM_N_STOCK_OK NC_("Stock label", "_OK")
+
G_END_DECLS
#endif /* _GNM_GUI_UTIL_H_ */
diff --git a/src/sheet-object-component.c b/src/sheet-object-component.c
index dd0cc53..5d408ee 100644
--- a/src/sheet-object-component.c
+++ b/src/sheet-object-component.c
@@ -194,8 +194,8 @@ soc_cb_save_as (SheetObject *so, SheetControl *sc)
GtkWidget *dlg = gtk_file_chooser_dialog_new (_("Save as"),
GTK_WINDOW (wbcg_toplevel (wbcg)),
GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GNM_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+ GNM_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
NULL);
GtkFileFilter *filter = gtk_file_filter_new ();
gtk_file_filter_add_mime_type (filter, go_component_get_mime_type (soc->component));
@@ -267,8 +267,8 @@ static void
gnm_soc_populate_menu (SheetObject *so, GPtrArray *actions)
{
static SheetObjectAction const soc_actions[] = {
- { GTK_STOCK_SAVE_AS, N_("_Save As"), NULL, 0, soc_cb_save_as },
- { GTK_STOCK_SAVE_AS, N_("_Save As Image"), NULL, 0, soc_cb_save_as_image }
+ { "document-save", GNM_N_STOCK_SAVE, NULL, 0, soc_cb_save_as },
+ { "document-save-as", N_("_Save As Image"), NULL, 0, soc_cb_save_as_image }
};
unsigned int i;
diff --git a/src/sheet-object-graph.c b/src/sheet-object-graph.c
index 31eff74..ff11a16 100644
--- a/src/sheet-object-graph.c
+++ b/src/sheet-object-graph.c
@@ -396,9 +396,9 @@ static void
gnm_sog_populate_menu (SheetObject *so, GPtrArray *actions)
{
static SheetObjectAction const sog_actions[] = {
- { GTK_STOCK_SAVE_AS, N_("_Save As Image"), NULL, 0, sog_cb_save_as, NULL
},
- { NULL, N_("Open in _New Window"), NULL, 0, sog_cb_open_in_new_window, NULL
},
- { NULL, N_("Copy to New Graph S_heet"), NULL, 0, sog_cb_copy_to_new_sheet, NULL
}
+ { "document-save-as", N_("_Save As Image"), NULL, 0, sog_cb_save_as,
NULL },
+ { NULL, N_("Open in _New Window"), NULL, 0, sog_cb_open_in_new_window,
NULL },
+ { NULL, N_("Copy to New Graph S_heet"), NULL, 0, sog_cb_copy_to_new_sheet,
NULL }
};
unsigned int i;
diff --git a/src/sheet-object-image.c b/src/sheet-object-image.c
index b8fb65e..2d7aa0a 100644
--- a/src/sheet-object-image.c
+++ b/src/sheet-object-image.c
@@ -361,7 +361,7 @@ static void
gnm_soi_populate_menu (SheetObject *so, GPtrArray *actions)
{
static SheetObjectAction const soi_action =
- { GTK_STOCK_SAVE_AS, N_("_Save As Image"), NULL, 0, soi_cb_save_as };
+ { "document-save-as", N_("_Save As Image"), NULL, 0, soi_cb_save_as };
gnm_soi_parent_class->populate_menu (so, actions);
go_ptr_array_insert (actions, (gpointer) &soi_action, 1);
}
diff --git a/src/sheet-object.c b/src/sheet-object.c
index e65f14a..1bc0b07 100644
--- a/src/sheet-object.c
+++ b/src/sheet-object.c
@@ -232,7 +232,7 @@ sheet_object_populate_menu_real (SheetObject *so, GPtrArray *actions)
static SheetObjectAction const so_actions [] = {
{ "gtk-properties", NULL, NULL, 0, sheet_object_get_editor,
sheet_object_can_prop},
{ NULL, NULL, NULL, 0, NULL, NULL },
- { "gtk-copy", NULL, NULL, 0, cb_so_copy, NULL },
+ { "edit-copy", N_("_Copy"), NULL, 0, cb_so_copy, NULL },
};
for (i = 0 ; i < G_N_ELEMENTS (so_actions); i++)
g_ptr_array_add (actions, (gpointer) (so_actions + i));
@@ -240,6 +240,7 @@ sheet_object_populate_menu_real (SheetObject *so, GPtrArray *actions)
static SheetObjectAction const so_actions [] = {
{ GTK_STOCK_PROPERTIES, NULL, NULL, 0, sheet_object_get_editor,
sheet_object_can_prop},
{ NULL, NULL, NULL, 0, NULL, NULL },
+#warning "Two high dubious icon names here"
{ GTK_STOCK_LEAVE_FULLSCREEN, N_("Size _& Position"), NULL, 0,
cb_so_size_position, NULL },
{ GTK_STOCK_FULLSCREEN, N_("_Snap to Grid"), NULL, 0, cb_so_snap_to_grid,
NULL },
{ NULL, N_("_Order"), NULL, 1, NULL, NULL },
@@ -249,11 +250,11 @@ sheet_object_populate_menu_real (SheetObject *so, GPtrArray *actions)
{ NULL, N_("Pus_h to Back"), NULL, 0, cb_so_push_to_back,
NULL },
{ NULL, NULL, NULL, -1, NULL, NULL },
{ NULL, NULL, NULL, 0, NULL, NULL },
- { GTK_STOCK_CUT, NULL, NULL, 0, cb_so_cut, NULL },
- { GTK_STOCK_COPY, NULL, NULL, 0, cb_so_copy, NULL },
- { GTK_STOCK_DELETE, NULL, NULL, 0, cb_so_delete, NULL },
+ { "edit-cut", N_("Cu_t"), NULL, 0, cb_so_cut, NULL },
+ { "edit-copy", N_("_Copy"), NULL, 0, cb_so_copy, NULL },
+ { "edit-delete", N_("_Delete"), NULL, 0, cb_so_delete, NULL
},
{ NULL, NULL, NULL, 0, NULL, NULL },
- { GTK_STOCK_PRINT, NULL, NULL, 0, cb_so_print,
sheet_object_can_print},
+ { "document-print", N_("Print"), NULL, 0, cb_so_print,
sheet_object_can_print},
};
for (i = 0; i < G_N_ELEMENTS (so_actions); i++)
g_ptr_array_add (actions, (gpointer) (so_actions + i));
@@ -1356,7 +1357,7 @@ sheet_object_build_menu (SheetObjectView *view,
if (a->label != NULL) {
item = gtk_image_menu_item_new_with_mnemonic (_(a->label));
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
- gtk_image_new_from_stock (a->icon, GTK_ICON_SIZE_MENU));
+ gtk_image_new_from_icon_name (a->icon, GTK_ICON_SIZE_MENU));
} else
item = gtk_image_menu_item_new_from_stock (a->icon, NULL);
} else if (a->label != NULL)
diff --git a/src/tools/gnm-solver.c b/src/tools/gnm-solver.c
index 90c6127..9928fd5 100644
--- a/src/tools/gnm-solver.c
+++ b/src/tools/gnm-solver.c
@@ -12,6 +12,7 @@
#include "workbook-control.h"
#include "gnm-marshalers.h"
#include "dao.h"
+#include "gui-util.h"
#include "gnm-i18n.h"
#include <gsf/gsf-impl-utils.h>
#include <gsf/gsf-output-stdio.h>
@@ -2047,7 +2048,7 @@ gnm_sub_solver_locate_binary (const char *binary, const char *solver,
NULL));
g_free (title);
gtk_dialog_add_buttons (GTK_DIALOG (fsel),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GNM_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_EXECUTE, GTK_RESPONSE_OK,
NULL);
g_object_ref (fsel);
diff --git a/src/wbc-gtk-actions.c b/src/wbc-gtk-actions.c
index bd95d2d..4be6256 100644
--- a/src/wbc-gtk-actions.c
+++ b/src/wbc-gtk-actions.c
@@ -1394,8 +1394,8 @@ static GNM_ACTION_DEF (cb_launch_go_component_from_file)
GtkWidget *dlg = gtk_file_chooser_dialog_new (_("Choose object file"),
GTK_WINDOW (wbcg_toplevel (wbcg)),
GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GNM_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+ GNM_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
NULL);
go_components_add_filter (GTK_FILE_CHOOSER (dlg));
if (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_ACCEPT) {
@@ -2000,13 +2000,13 @@ static GtkActionEntry const permanent_actions[] = {
{ "FileNew", "document-new", N_("_New"),
"<control>n", N_("Create a new workbook"),
G_CALLBACK (cb_file_new) },
- { "FileOpen", "document-open", N_("_Open"),
+ { "FileOpen", "document-open", GNM_N_STOCK_OPEN,
"<control>o", N_("Open a file"),
G_CALLBACK (cb_file_open) },
- { "FileSave", "document-save", N_("_Save"),
+ { "FileSave", "document-save", GNM_N_STOCK_SAVE,
"<control>s", N_("Save the current workbook"),
G_CALLBACK (cb_file_save) },
- { "FileSaveAs", "document-save-as", N_("Save _As"),
+ { "FileSaveAs", "document-save-as", GNM_N_STOCK_SAVE_AS,
"<control><shift>s", N_("Save the current workbook with a different name"),
G_CALLBACK (cb_file_save_as) },
{ "FileSend", "gnumeric-link-email", N_("Sen_d To..."),
diff --git a/src/wbc-gtk-edit.c b/src/wbc-gtk-edit.c
index 9702f83..a35b232 100644
--- a/src/wbc-gtk-edit.c
+++ b/src/wbc-gtk-edit.c
@@ -899,7 +899,7 @@ wbcg_edit_start (WBCGtk *wbcg,
go_gtk_dialog_add_button
(GTK_DIALOG (d), _("Remove format"), GTK_STOCK_REMOVE,
GNM_RESPONSE_REMOVE);
- gtk_dialog_add_button (GTK_DIALOG (d), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ gtk_dialog_add_button (GTK_DIALOG (d), GNM_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
gtk_dialog_set_default_response (GTK_DIALOG (d), GTK_RESPONSE_CANCEL);
check = gtk_check_button_new_with_label (_("Show this dialog next time."));
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index 5eb7696..6e08bf1 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -1794,9 +1794,9 @@ wbcg_show_save_dialog (WBCGtk *wbcg, Workbook *wb)
go_gtk_dialog_add_button (GTK_DIALOG(d), _("Discard"),
GTK_STOCK_DELETE, GTK_RESPONSE_NO);
go_gtk_dialog_add_button (GTK_DIALOG(d), _("Don't close"),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ GNM_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
- gtk_dialog_add_button (GTK_DIALOG(d), GTK_STOCK_SAVE, GTK_RESPONSE_YES);
+ gtk_dialog_add_button (GTK_DIALOG(d), GNM_STOCK_SAVE, GTK_RESPONSE_YES);
gtk_dialog_set_default_response (GTK_DIALOG (d), GTK_RESPONSE_YES);
ret = go_gtk_dialog_run (GTK_DIALOG (d), wbcg_toplevel (wbcg));
g_free (msg);
@@ -2893,7 +2893,7 @@ wbcg_validation_msg (WorkbookControl *wbc, ValidationStyle v,
break;
case GNM_VALIDATION_STYLE_INFO :
res0 = GNM_VALIDATION_STATUS_VALID;
- btn0 = GTK_STOCK_OK;
+ btn0 = GNM_STOCK_OK;
btn1 = NULL;
type = GTK_MESSAGE_INFO;
break;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
