diff options
author | Kjartan Maraas <kmaraas@gnome.org> | 2007-03-17 08:40:02 +0000 |
---|---|---|
committer | Kjartan Maraas <kmaraas@src.gnome.org> | 2007-03-17 08:40:02 +0000 |
commit | 88b91199d2228bf54a04fdedff47592ce07b7dfa (patch) | |
tree | 95810d367956cf3c8812fdf95f1ee9fab71ef92b | |
parent | 15d871023e8fd1ffe3bf894de58f33a601f67c1b (diff) | |
download | metacity-88b91199d2228bf54a04fdedff47592ce07b7dfa.tar.gz |
Remove #include <pango/pangox.h> since it's apparently not installed
2007-03-17 Kjartan Maraas <kmaraas@gnome.org>
* src/ui.c: Remove #include <pango/pangox.h> since it's
apparently not installed anymore. Builds just fine without it too.
svn path=/trunk/; revision=3119
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | po/ChangeLog | 6 | ||||
-rw-r--r-- | po/nb.po | 40 | ||||
-rw-r--r-- | src/ui.c | 2 |
4 files changed, 31 insertions, 22 deletions
@@ -1,3 +1,8 @@ +2007-03-17 Kjartan Maraas <kmaraas@gnome.org> + + * src/ui.c: Remove #include <pango/pangox.h> since it's + apparently not installed anymore. Builds just fine without it too. + 2007-03-10 Charlie Brej <cbrej@cs.man.ac.uk> * src/metacity.schemas.in: add action_{middle|right}_click_titlebar. diff --git a/po/ChangeLog b/po/ChangeLog index 2c2164da..ec6ba770 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,9 @@ +2007-03-17 Kjartan Maraas <kmaraas@gnome.org> + + reviewed by: <delete if not using a buddy> + + * nb.po: + 2007-03-14 David Lodge <dave@cirt.net> * en_GB.po: Updated English (British) translation @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: metacity 2.15.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-12-29 12:41+0100\n" +"POT-Creation-Date: 2007-02-24 11:41+0100\n" "PO-Revision-Date: 2006-12-29 12:41+0100\n" "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n" "Language-Team: Norwegian (bokmål) <i18n-no@lister.ping.uio.no>\n" @@ -286,7 +286,7 @@ msgstr "Flytt til arbeidsområdet _over" msgid "Move to Workspace _Down" msgstr "Flytt til arbeidsområdet ne_denfor" -#: ../src/menu.c:191 ../src/prefs.c:2194 ../src/prefs.c:2729 +#: ../src/menu.c:191 ../src/prefs.c:2197 ../src/prefs.c:2732 #, c-format msgid "Workspace %d" msgstr "Arbeidsområde %d" @@ -2283,19 +2283,19 @@ msgstr "Fokuseringsmodus for vindu" msgid "Window title font" msgstr "Skrift for vindutittel" -#: ../src/prefs.c:576 ../src/prefs.c:592 ../src/prefs.c:608 ../src/prefs.c:624 -#: ../src/prefs.c:640 ../src/prefs.c:656 ../src/prefs.c:672 ../src/prefs.c:692 -#: ../src/prefs.c:708 ../src/prefs.c:724 ../src/prefs.c:742 ../src/prefs.c:758 -#: ../src/prefs.c:777 ../src/prefs.c:793 ../src/prefs.c:810 ../src/prefs.c:826 -#: ../src/prefs.c:842 ../src/prefs.c:859 ../src/prefs.c:875 ../src/prefs.c:891 -#: ../src/prefs.c:907 ../src/prefs.c:923 ../src/prefs.c:938 ../src/prefs.c:953 -#: ../src/prefs.c:968 ../src/prefs.c:984 ../src/prefs.c:1000 -#: ../src/prefs.c:1016 ../src/prefs.c:1032 +#: ../src/prefs.c:575 ../src/prefs.c:591 ../src/prefs.c:607 ../src/prefs.c:623 +#: ../src/prefs.c:639 ../src/prefs.c:655 ../src/prefs.c:671 ../src/prefs.c:691 +#: ../src/prefs.c:707 ../src/prefs.c:723 ../src/prefs.c:741 ../src/prefs.c:757 +#: ../src/prefs.c:776 ../src/prefs.c:792 ../src/prefs.c:809 ../src/prefs.c:825 +#: ../src/prefs.c:841 ../src/prefs.c:858 ../src/prefs.c:874 ../src/prefs.c:890 +#: ../src/prefs.c:906 ../src/prefs.c:922 ../src/prefs.c:937 ../src/prefs.c:952 +#: ../src/prefs.c:967 ../src/prefs.c:983 ../src/prefs.c:999 +#: ../src/prefs.c:1015 ../src/prefs.c:1031 #, c-format msgid "GConf key \"%s\" is set to an invalid type\n" msgstr "GConf-nøkkel «%s» er satt til en ugyldig type\n" -#: ../src/prefs.c:1077 +#: ../src/prefs.c:1076 #, c-format msgid "" "\"%s\" found in configuration database is not a valid value for mouse button " @@ -2304,12 +2304,12 @@ msgstr "" "«%s» funnet i konfigurasjonsdatabasen er ikke en gyldig verdi for endring av " "musknapp\n" -#: ../src/prefs.c:1101 ../src/prefs.c:1122 ../src/prefs.c:1660 +#: ../src/prefs.c:1100 ../src/prefs.c:1121 ../src/prefs.c:1663 #, c-format msgid "GConf key '%s' is set to an invalid value\n" msgstr "GConf-nøkkel «%s» er satt til en ugyldig verdi\n" -#: ../src/prefs.c:1251 +#: ../src/prefs.c:1250 #, c-format msgid "" "%d stored in GConf key %s is not a reasonable cursor_size; must be in the " @@ -2318,12 +2318,12 @@ msgstr "" "%d lagret i GConf-nøkkel %s er ikke en fornuftig verdi for cursor_size. Må " "være i området 1..128\n" -#: ../src/prefs.c:1331 +#: ../src/prefs.c:1330 #, c-format msgid "Could not parse font description \"%s\" from GConf key %s\n" msgstr "Kunne ikke tolke skriftbeskrivelsen «%s» fra GConf-nøkkel %s\n" -#: ../src/prefs.c:1558 +#: ../src/prefs.c:1557 #, c-format msgid "" "%d stored in GConf key %s is not a reasonable number of workspaces, current " @@ -2332,7 +2332,7 @@ msgstr "" "%d lagret i GConf-nøkkel %s er ikke et lesbart antall arbeidsområder, aktivt " "maksimum er %d\n" -#: ../src/prefs.c:1618 +#: ../src/prefs.c:1617 msgid "" "Workarounds for broken applications disabled. Some applications may not " "behave properly.\n" @@ -2340,17 +2340,17 @@ msgstr "" "Funksjonalitet for å gå rundt ødelagte programmer er deaktivert. Noen " "programmer vil kanskje ikke oppføre seg korrekt.\n" -#: ../src/prefs.c:1687 +#: ../src/prefs.c:1690 #, c-format msgid "%d stored in GConf key %s is out of range 0 to %d\n" msgstr "%d lagret i GConf-nøkkel %s er utenfor området 0 til %d\n" -#: ../src/prefs.c:1830 +#: ../src/prefs.c:1833 #, c-format msgid "Error setting number of workspaces to %d: %s\n" msgstr "Feil under spesifisering av antall arbeidsområder til %d: %s\n" -#: ../src/prefs.c:2224 ../src/prefs.c:2394 +#: ../src/prefs.c:2227 ../src/prefs.c:2397 #, c-format msgid "" "\"%s\" found in configuration database is not a valid value for keybinding " @@ -2359,7 +2359,7 @@ msgstr "" "«%s» funnet i konfigurasjonsdatabasen er ikke en gyldig verdi for " "tastaturbinding «%s»\n" -#: ../src/prefs.c:2810 +#: ../src/prefs.c:2813 #, c-format msgid "Error setting name for workspace %d to \"%s\": %s\n" msgstr "Feil under setting av navn på arbeidsområde %d til «%s»: %s\n" @@ -34,8 +34,6 @@ #include "inlinepixbufs.h" -#include <pango/pangox.h> - #include <string.h> #include <stdlib.h> |