update some strings and the swedish translation

diff --git a/openbox/mouse.c b/openbox/mouse.c
index 27172d525c614c7933b297d1f9108e3947c7edd6..522eba8cbf9c8ccb27b241ae330c8ad4ab6c4083 100644 (file)
--- a/openbox/mouse.c
+++ b/openbox/mouse.c
@@ -311,13 +311,13 @@ gboolean mouse_bind(const gchar *buttonstr, const gchar *contextstr,
     GSList *it;
 
     if (!translate_button(buttonstr, &state, &button)) {
-        g_message(_("Invalid button '%s' in pointer binding"), buttonstr);
+        g_message(_("Invalid button '%s' in mouse binding"), buttonstr);
         return FALSE;
     }
 
     context = frame_context_from_string(contextstr);
     if (!context) {
-        g_message(_("Invalid context '%s' in pointer binding"), contextstr);
+        g_message(_("Invalid context '%s' in mouse binding"), contextstr);
         return FALSE;
     }
 

diff --git a/openbox/translate.c b/openbox/translate.c
index 1ef8e7d58ed4b17dd81a268bc4e1818c8d5800f1..a9ff3e264c0cf774588235766a7d3ebaab42fefe 100644 (file)
--- a/openbox/translate.c
+++ b/openbox/translate.c
@@ -55,7 +55,7 @@ static guint translate_modifier(gchar *str)
              !g_ascii_strcasecmp("H", str))
         mask = modkeys_key_to_mask(OB_MODKEY_KEY_HYPER);
     else
-        g_message(_("Invalid modifier key '%s' in key/pointer binding"), str);
+        g_message(_("Invalid modifier key '%s' in key/mouse binding"), str);
 
     return mask;
 }
@@ -91,10 +91,8 @@ gboolean translate_button(const gchar *str, guint *state, guint *button)
     else if (!g_ascii_strcasecmp("Up", l)) *button = 4;
     else if (!g_ascii_strcasecmp("Down", l)) *button = 5;
     else if (!g_ascii_strncasecmp("Button", l, 6)) *button = atoi(l+6);
-    if (!*button) {
-        g_message(_("Invalid button '%s' in pointer binding"), l);
+    if (!*button)
         goto translation_fail;
-    }
 
     ret = TRUE;
 

diff --git a/po/sv.po b/po/sv.po
index f184d894fbe07531ed6fab69dc5ece2471d07f02..1cea492c6508c340493b3a04adb5dbc933ab15cb 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openbox 3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-05-06 13:44+0200\n"
+"POT-Creation-Date: 2007-05-08 00:55+0200\n"
 "PO-Revision-Date: 2007-05-06 13:44+0200\n"
 "Last-Translator: Mikael Magnusson <mikachu@icculus.org>\n"
 "Language-Team: None\n"
@@ -15,10 +15,34 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: openbox/client_list_menu.c:104
+#: openbox/action.c:922
+#, c-format
+msgid "Invalid action '%s' requested. No such action exists."
+msgstr "Ogiltig action '%s' efterfrågades, men finns inte."
+
+#: openbox/action.c:925
+#, c-format
+msgid "Invalid use of action '%s'. Action will be ignored."
+msgstr "Ogiltigt användande av action '%s', den kommer ignoreras."
+
+#: openbox/action.c:1154 openbox/action.c:1172 openbox/action.c:1185
+#, c-format
+msgid "Failed to execute '%s': %s"
+msgstr "Kunde inte exekvera '%s': %s"
+
+#: openbox/action.c:1193
+#, c-format
+msgid "Failed to convert the path '%s' from utf8"
+msgstr "Lyckades inte konvertera sökvägen '%s' från utf8"
+
+#: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:104
 msgid "Go there..."
 msgstr "Gå dit"
 
+#: openbox/client_list_combined_menu.c:147
+msgid "Windows"
+msgstr "Fönster"
+
 #: openbox/client_list_menu.c:198
 msgid "Desktops"
 msgstr "Skrivbord"
@@ -83,35 +107,80 @@ msgstr "(Av)&Dekorera"
 msgid "&Close"
 msgstr "Stän&g"
 
-#: openbox/openbox.c:120
+#: openbox/config.c:664
+#, c-format
+msgid "Invalid button '%s' specified in config file"
+msgstr "Ogiltig knapp '%s' angiven i konfigurationsfilen"
+
+#: openbox/keyboard.c:160
+msgid "Conflict with key binding in config file"
+msgstr "Konflikt med annan tangentbindning i konfigurationsfilen"
+
+#: openbox/menu.c:98 openbox/menu.c:106
+#, c-format
+msgid "Unable to find a valid menu file '%s'"
+msgstr "Kunde inte hitta en giltig menyfil '%s'"
+
+#: openbox/menu.c:149
+#, c-format
+msgid "Failed to execute command for pipe-menu '%s': %s"
+msgstr "Misslyckades att köra kommando för pipe-menyn '%s': %s"
+
+#: openbox/menu.c:166
+#, c-format
+msgid "Invalid output from pipe-menu '%s'"
+msgstr "Ogiltig utdata från pipe-menyn '%s'"
+
+#: openbox/menu.c:179
+#, c-format
+msgid "Attempted to access menu '%s' but it does not exist"
+msgstr "Försökte öppna menyn '%s', men den finns inte"
+
+#: openbox/menu.c:331 openbox/menu.c:332
+msgid "More..."
+msgstr "Mer..."
+
+#: openbox/mouse.c:314 openbox/translate.c:95
+#, c-format
+msgid "Invalid button '%s' in mouse binding"
+msgstr "Ogiltig knapp '%s' i musbindning"
+
+#: openbox/mouse.c:320
+#, c-format
+msgid "Invalid context '%s' in mouse binding"
+msgstr "Ogiltig kontext '%s' i musbindning"
+
+#: openbox/openbox.c:119
+#, c-format
 msgid "Unable to change to home directory '%s': %s"
 msgstr "Kunde inte gå till hemkatalogen '%s': %s"
 
-#: openbox/openbox.c:173
+#: openbox/openbox.c:174
 msgid "X server does not support locale."
 msgstr "X-servern stödjer inte lokalisering."
 
-#: openbox/openbox.c:175
+#: openbox/openbox.c:176
 msgid "Cannot set locale modifiers for the X server."
 msgstr ""
 
-#: openbox/openbox.c:240
+#: openbox/openbox.c:241
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr "Kunde inte hitta en giltig konfiguration, använder standardvärden"
 
-#: openbox/openbox.c:375
+#: openbox/openbox.c:376
+#, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr "Restart misslyckades att starta nytt program '%s': %s"
 
-#: openbox/openbox.c:444 openbox/openbox.c:446
+#: openbox/openbox.c:445 openbox/openbox.c:447
 msgid "Copyright (c)"
 msgstr ""
 
-#: openbox/openbox.c:455
+#: openbox/openbox.c:456
 msgid "Syntax: openbox [options]\n"
 msgstr "Syntax: openbox [alternativ]\n"
 
-#: openbox/openbox.c:456
+#: openbox/openbox.c:457
 msgid ""
 "\n"
 "Options:\n"
@@ -119,27 +188,28 @@ msgstr ""
 "\n"
 "Alternativ:\n"
 
-#: openbox/openbox.c:457
+#: openbox/openbox.c:458
 msgid "  --config TYPE       Specify the configuration profile to use\n"
-msgstr "  --config TYP        Ange vilken konfigurationsprofil som ska användas\n"
+msgstr ""
+"  --config TYP        Ange vilken konfigurationsprofil som ska användas\n"
 
-#: openbox/openbox.c:459
+#: openbox/openbox.c:460
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Avaktivera anslutning till sessions-hanteraren\n"
 
-#: openbox/openbox.c:461
+#: openbox/openbox.c:462
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Ersätt den befintliga fönsterhanteraren\n"
 
-#: openbox/openbox.c:462
+#: openbox/openbox.c:463
 msgid "  --help              Display this help and exit\n"
 msgstr "  --help              Visa den här hjälpen och avsluta\n"
 
-#: openbox/openbox.c:463
+#: openbox/openbox.c:464
 msgid "  --version           Display the version and exit\n"
 msgstr "  --version           Visa versionen och avsluta\n"
 
-#: openbox/openbox.c:464
+#: openbox/openbox.c:465
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
@@ -147,27 +217,11 @@ msgstr ""
 "\n"
 "Skicka meddelanden till en exekverande instans av Openbox:\n"
 
-#: openbox/openbox.c:465
+#: openbox/openbox.c:466
 msgid "  --reconfigure       Reload Openbox's configuration\n"
 msgstr "  --reconfigure       Ladda om Openbox konfiguration\n"
 
-#: openbox/openbox.c:466
-msgid ""
-"\n"
-"Options for internal use:\n"
-msgstr ""
-"\n"
-"Alternativ för intern användning:\n"
-
 #: openbox/openbox.c:467
-msgid "  --sm-save-file FILE Specify file to load a saved session from\n"
-msgstr "  --sm-save-file FIL  Specifiera fil att ladda en sparad session från\n"
-
-#: openbox/openbox.c:468
-msgid "  --sm-client-id ID   Specify session management ID\n"
-msgstr "  --sm-client-id ID   Ange ett sessions-hanterings-ID\n"
-
-#: openbox/openbox.c:469
 msgid ""
 "\n"
 "Debugging options:\n"
@@ -175,19 +229,19 @@ msgstr ""
 "\n"
 "Debug-alternativ:\n"
 
-#: openbox/openbox.c:470
+#: openbox/openbox.c:468
 msgid "  --sync              Run in synchronous mode\n"
 msgstr "  --sync              Kör i synkroniserat läge\n"
 
-#: openbox/openbox.c:471
+#: openbox/openbox.c:469
 msgid "  --debug             Display debugging output\n"
 msgstr "  --debug             Visa debuginformation\n"
 
-#: openbox/openbox.c:472
+#: openbox/openbox.c:470
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr "  --debug-focus       Visa debuginformation för fokushantering\n"
 
-#: openbox/openbox.c:473
+#: openbox/openbox.c:471
 #, c-format
 msgid ""
 "\n"
@@ -196,29 +250,66 @@ msgstr ""
 "\n"
 "Rapportera buggar till %s\n"
 
-#: openbox/openbox.c:531
+#: openbox/openbox.c:519
 msgid "--config requires an argument\n"
 msgstr "--config kräver ett argument\n"
 
-#: openbox/openbox.c:540
-msgid "--sm-save-file requires an argument\n"
-msgstr "--sm-save-file kräver ett argument\n"
+#: openbox/screen.c:85 openbox/screen.c:186
+#, c-format
+msgid "A window manager is already running on screen %d"
+msgstr "En fönsterhanterare körs redan på skärm %d"
 
-#: openbox/openbox.c:548
-msgid "--sm-client-id requires an argument\n"
-msgstr "--sm-client-id kräver ett argument\n"
+#: openbox/screen.c:122
+#, c-format
+msgid "Could not acquire window manager selection on screen %d"
+msgstr "Kunde inte erhålla fönsterhanterarmarkeringen på skärm %d"
+
+#: openbox/screen.c:143
+#, c-format
+msgid "The WM on screen %d is not exiting"
+msgstr "Fönsterhanteraren på skärm %d avslutar inte"
 
 #: openbox/session.c:100
 #, c-format
 msgid "Unable to make directory '%s': %s"
 msgstr "Kunde inte skapa katalogen '%s': %s"
 
-#: openbox/session.c:425
+#: openbox/session.c:426
 #, c-format
 msgid "Unable to save the session to '%s': %s"
 msgstr "Kunde inte spara sessionen till '%s': %s"
 
-#: openbox/session.c:533
+#: openbox/session.c:534
 #, c-format
 msgid "Error while saving the session to '%s': %s"
 msgstr "Fel inträffade när sessionen skulle sparas till '%s': %s"
+
+#: openbox/startupnotify.c:240
+#, c-format
+msgid "Running %s\n"
+msgstr "Kör %s\n"
+
+#: openbox/translate.c:58
+#, c-format
+msgid "Invalid modifier key '%s' in key/mouse binding"
+msgstr "Ogiltig modifikationstangent '%s' i tangent/musbindning"
+
+#: openbox/translate.c:137
+#, c-format
+msgid "Invalid key code '%s' in key binding"
+msgstr "Ogiltig tangentkod '%s' i tantentbindning"
+
+#: openbox/translate.c:144
+#, c-format
+msgid "Invalid key name '%s' in key binding"
+msgstr "Ogiltigt tangentnamn '%s' i tangentbindning"
+
+#: openbox/translate.c:150
+#, c-format
+msgid "Requested key '%s' does not exist on the display"
+msgstr "Efterfrågad tangent '%s' finns inte på displayen"
+
+#: openbox/xerror.c:39
+#, c-format
+msgid "X Error: %s"
+msgstr "X Fel: %s"