From 4cd7b6c6dc6c625d46dc8e93cb723544983e41fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Mon, 19 Dec 2011 14:55:53 +0100 Subject: [PATCH] .desktop: Drop prefix from X-GNOME-Keywords The field has now been included in the spec, so use the standardized name. --- panels/background/gnome-background-panel.desktop.in.in | 2 +- panels/color/gnome-color-panel.desktop.in.in | 2 +- panels/datetime/gnome-datetime-panel.desktop.in.in | 2 +- panels/display/gnome-display-panel.desktop.in.in | 2 +- panels/info/gnome-info-panel.desktop.in.in | 2 +- panels/keyboard/gnome-keyboard-panel.desktop.in.in | 2 +- panels/mouse/gnome-mouse-panel.desktop.in.in | 2 +- panels/network/gnome-network-panel.desktop.in.in | 2 +- .../online-accounts/gnome-online-accounts-panel.desktop.in.in | 2 +- panels/power/gnome-power-panel.desktop.in.in | 2 +- panels/printers/gnome-printers-panel.desktop.in.in | 2 +- panels/region/gnome-region-panel.desktop.in.in | 2 +- panels/screen/gnome-screen-panel.desktop.in.in | 2 +- panels/sound/data/gnome-sound-panel.desktop.in.in | 2 +- .../universal-access/gnome-universal-access-panel.desktop.in.in | 2 +- .../user-accounts/data/gnome-user-accounts-panel.desktop.in.in | 2 +- panels/wacom/gnome-wacom-panel.desktop.in.in | 2 +- shell/cc-shell-model.c | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/panels/background/gnome-background-panel.desktop.in.in b/panels/background/gnome-background-panel.desktop.in.in index 8d9f7c071..b8f6bcc8c 100644 --- a/panels/background/gnome-background-panel.desktop.in.in +++ b/panels/background/gnome-background-panel.desktop.in.in @@ -10,4 +10,4 @@ Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-Per OnlyShowIn=GNOME;Unity; X-GNOME-Settings-Panel=background # Translators: those are keywords for the background control-center panel -_X-GNOME-Keywords=Wallpaper;Screen;Desktop; +_Keywords=Wallpaper;Screen;Desktop; diff --git a/panels/color/gnome-color-panel.desktop.in.in b/panels/color/gnome-color-panel.desktop.in.in index 09d7d9495..a7f2487f0 100644 --- a/panels/color/gnome-color-panel.desktop.in.in +++ b/panels/color/gnome-color-panel.desktop.in.in @@ -14,4 +14,4 @@ X-GNOME-Bugzilla-Component=color X-GNOME-Bugzilla-Version=@VERSION@ X-GNOME-Settings-Panel=color # Translators: those are keywords for the color control-center panel -_X-GNOME-Keywords=Color;ICC;Profile;Calibrate;Printer;Display; +_Keywords=Color;ICC;Profile;Calibrate;Printer;Display; diff --git a/panels/datetime/gnome-datetime-panel.desktop.in.in b/panels/datetime/gnome-datetime-panel.desktop.in.in index b145608a3..f5b7a1146 100644 --- a/panels/datetime/gnome-datetime-panel.desktop.in.in +++ b/panels/datetime/gnome-datetime-panel.desktop.in.in @@ -10,4 +10,4 @@ Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;X-GNOME-Settings-Panel; OnlyShowIn=GNOME; X-GNOME-Settings-Panel=datetime # Translators: those are keywords for the date and time control-center panel -_X-GNOME-Keywords=Clock;Timezone;Location; +_Keywords=Clock;Timezone;Location; diff --git a/panels/display/gnome-display-panel.desktop.in.in b/panels/display/gnome-display-panel.desktop.in.in index 0e8087719..fc08f5af7 100644 --- a/panels/display/gnome-display-panel.desktop.in.in +++ b/panels/display/gnome-display-panel.desktop.in.in @@ -14,4 +14,4 @@ X-GNOME-Bugzilla-Component=Screen resolution X-GNOME-Bugzilla-Version=@VERSION@ X-GNOME-Settings-Panel=display # Translators: those are keywords for the display control-center panel -_X-GNOME-Keywords=Panel;Projector;xrandr;Screen;Resolution;Refresh; +_Keywords=Panel;Projector;xrandr;Screen;Resolution;Refresh; diff --git a/panels/info/gnome-info-panel.desktop.in.in b/panels/info/gnome-info-panel.desktop.in.in index b9cfeae18..57e9465d5 100644 --- a/panels/info/gnome-info-panel.desktop.in.in +++ b/panels/info/gnome-info-panel.desktop.in.in @@ -16,4 +16,4 @@ X-GNOME-Settings-Panel=info # Translators: those are keywords for the System Information panel # "Preferred Applications" is the old name for the preference, so make # sure that you use the same "translation" for those keywords -_X-GNOME-Keywords=device;system;information;memory;processor;version;default;application;fallback;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun; +_Keywords=device;system;information;memory;processor;version;default;application;fallback;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun; diff --git a/panels/keyboard/gnome-keyboard-panel.desktop.in.in b/panels/keyboard/gnome-keyboard-panel.desktop.in.in index bce8601a0..c1e3a4048 100644 --- a/panels/keyboard/gnome-keyboard-panel.desktop.in.in +++ b/panels/keyboard/gnome-keyboard-panel.desktop.in.in @@ -14,4 +14,4 @@ X-GNOME-Bugzilla-Component=keyboard X-GNOME-Bugzilla-Version=@VERSION@ X-GNOME-Settings-Panel=keyboard # Translators: those are keywords for the keyboard control-center panel -_X-GNOME-Keywords=Shortcut;Repeat;Blink; +_Keywords=Shortcut;Repeat;Blink; diff --git a/panels/mouse/gnome-mouse-panel.desktop.in.in b/panels/mouse/gnome-mouse-panel.desktop.in.in index 4b682258c..179c2d3e0 100644 --- a/panels/mouse/gnome-mouse-panel.desktop.in.in +++ b/panels/mouse/gnome-mouse-panel.desktop.in.in @@ -14,4 +14,4 @@ X-GNOME-Bugzilla-Component=mouse X-GNOME-Bugzilla-Version=@VERSION@ X-GNOME-Settings-Panel=mouse # Translators: those are keywords for the mouse and touchpad control-center panel -_X-GNOME-Keywords=Trackpad;Pointer;Click;Tap;Double;Button;Trackball; +_Keywords=Trackpad;Pointer;Click;Tap;Double;Button;Trackball; diff --git a/panels/network/gnome-network-panel.desktop.in.in b/panels/network/gnome-network-panel.desktop.in.in index e740bafbc..6b4787ac1 100644 --- a/panels/network/gnome-network-panel.desktop.in.in +++ b/panels/network/gnome-network-panel.desktop.in.in @@ -14,4 +14,4 @@ X-GNOME-Bugzilla-Component=network X-GNOME-Bugzilla-Version=@VERSION@ X-GNOME-Settings-Panel=network # Translators: those are keywords for the network control-center panel -_X-GNOME-Keywords=Network;Wireless;IP;LAN;Proxy; +_Keywords=Network;Wireless;IP;LAN;Proxy; diff --git a/panels/online-accounts/gnome-online-accounts-panel.desktop.in.in b/panels/online-accounts/gnome-online-accounts-panel.desktop.in.in index 7dd71f9c2..b3caf2847 100644 --- a/panels/online-accounts/gnome-online-accounts-panel.desktop.in.in +++ b/panels/online-accounts/gnome-online-accounts-panel.desktop.in.in @@ -14,4 +14,4 @@ X-GNOME-Bugzilla-Component=Online Accounts X-GNOME-Bugzilla-Version=@VERSION@ X-GNOME-Settings-Panel=online-accounts # Translators: those are keywords for the online-accounts control-center panel -_X-GNOME-Keywords=Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact; +_Keywords=Google;Facebook;Twitter;Yahoo;Web;Online;Chat;Calendar;Mail;Contact; diff --git a/panels/power/gnome-power-panel.desktop.in.in b/panels/power/gnome-power-panel.desktop.in.in index 08227810b..82bedaa55 100644 --- a/panels/power/gnome-power-panel.desktop.in.in +++ b/panels/power/gnome-power-panel.desktop.in.in @@ -14,4 +14,4 @@ X-GNOME-Bugzilla-Component=power X-GNOME-Bugzilla-Version=@VERSION@ X-GNOME-Settings-Panel=power # Translators: those are keywords for the power control-center panel -_X-GNOME-Keywords=Power;Sleep;Suspend;Hibernate;Battery; +_Keywords=Power;Sleep;Suspend;Hibernate;Battery; diff --git a/panels/printers/gnome-printers-panel.desktop.in.in b/panels/printers/gnome-printers-panel.desktop.in.in index 1f7705cfb..7361bffb0 100644 --- a/panels/printers/gnome-printers-panel.desktop.in.in +++ b/panels/printers/gnome-printers-panel.desktop.in.in @@ -11,4 +11,4 @@ Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel; OnlyShowIn=GNOME; X-GNOME-Settings-Panel=printers # Translators: those are keywords for the printing control-center panel -_X-GNOME-Keywords=Printer;Queue;Print;Paper;Ink;Toner; +_Keywords=Printer;Queue;Print;Paper;Ink;Toner; diff --git a/panels/region/gnome-region-panel.desktop.in.in b/panels/region/gnome-region-panel.desktop.in.in index b31c47bb8..91ef135a4 100644 --- a/panels/region/gnome-region-panel.desktop.in.in +++ b/panels/region/gnome-region-panel.desktop.in.in @@ -14,4 +14,4 @@ X-GNOME-Bugzilla-Component=region X-GNOME-Bugzilla-Version=@VERSION@ X-GNOME-Settings-Panel=region # Translators: those are keywords for the region control-center panel -_X-GNOME-Keywords=Language;Layout;Keyboard; +_Keywords=Language;Layout;Keyboard; diff --git a/panels/screen/gnome-screen-panel.desktop.in.in b/panels/screen/gnome-screen-panel.desktop.in.in index e6758aa23..cb59790c5 100644 --- a/panels/screen/gnome-screen-panel.desktop.in.in +++ b/panels/screen/gnome-screen-panel.desktop.in.in @@ -14,4 +14,4 @@ X-GNOME-Bugzilla-Component=screen X-GNOME-Bugzilla-Version=@VERSION@ X-GNOME-Settings-Panel=screen # Translators: those are keywords for the brightness and lock control-center panel -_X-GNOME-Keywords=Brightness;Lock;Dim;Blank;Monitor; +_Keywords=Brightness;Lock;Dim;Blank;Monitor; diff --git a/panels/sound/data/gnome-sound-panel.desktop.in.in b/panels/sound/data/gnome-sound-panel.desktop.in.in index 0d59827ee..b1475f8f4 100644 --- a/panels/sound/data/gnome-sound-panel.desktop.in.in +++ b/panels/sound/data/gnome-sound-panel.desktop.in.in @@ -14,4 +14,4 @@ X-GNOME-Bugzilla-Component=sound X-GNOME-Bugzilla-Version=@VERSION@ X-GNOME-Settings-Panel=sound # Translators: those are keywords for the sound control-center panel -_X-GNOME-Keywords=Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset; +_Keywords=Card;Microphone;Volume;Fade;Balance;Bluetooth;Headset; diff --git a/panels/universal-access/gnome-universal-access-panel.desktop.in.in b/panels/universal-access/gnome-universal-access-panel.desktop.in.in index 7f2d3415a..05a46493c 100644 --- a/panels/universal-access/gnome-universal-access-panel.desktop.in.in +++ b/panels/universal-access/gnome-universal-access-panel.desktop.in.in @@ -14,4 +14,4 @@ X-GNOME-Bugzilla-Component=Universal Access X-GNOME-Bugzilla-Version=@VERSION@ X-GNOME-Settings-Panel=universal-access # Translators: those are keywords for the universal access control-center panel -_X-GNOME-Keywords=Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;size;AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys +_Keywords=Keyboard;Mouse;a11y;Accessibility;Contrast;Zoom;Screen Reader;text;font;size;AccessX;Sticky Keys;Slow Keys;Bounce Keys;Mouse Keys diff --git a/panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in b/panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in index 89d51bc65..24a8bb3fc 100644 --- a/panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in +++ b/panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in @@ -14,4 +14,4 @@ X-GNOME-Bugzilla-Component=user-accounts X-GNOME-Bugzilla-Version=@VERSION@ X-GNOME-Settings-Panel=user-accounts # Translators: those are keywords for the user accounts control-center panel -_X-GNOME-Keywords=Login;Name;Fingerprint;Avatar;Logo;Face;Password; +_Keywords=Login;Name;Fingerprint;Avatar;Logo;Face;Password; diff --git a/panels/wacom/gnome-wacom-panel.desktop.in.in b/panels/wacom/gnome-wacom-panel.desktop.in.in index 0d059ff89..23cf0fae0 100644 --- a/panels/wacom/gnome-wacom-panel.desktop.in.in +++ b/panels/wacom/gnome-wacom-panel.desktop.in.in @@ -14,4 +14,4 @@ X-GNOME-Bugzilla-Component=wacom X-GNOME-Bugzilla-Version=@VERSION@ X-GNOME-Settings-Panel=wacom # Translators: those are keywords for the wacom tablet control-center panel -_X-GNOME-Keywords=Tablet;Wacom;Stylus;Eraser;Mouse; +_Keywords=Tablet;Wacom;Stylus;Eraser;Mouse; diff --git a/shell/cc-shell-model.c b/shell/cc-shell-model.c index 2dd0e6d05..a93c7b62f 100644 --- a/shell/cc-shell-model.c +++ b/shell/cc-shell-model.c @@ -24,7 +24,7 @@ #define GNOME_SETTINGS_PANEL_ID_KEY "X-GNOME-Settings-Panel" #define GNOME_SETTINGS_PANEL_CATEGORY GNOME_SETTINGS_PANEL_ID_KEY -#define GNOME_SETTINGS_PANEL_ID_KEYWORDS "X-GNOME-Keywords" +#define GNOME_SETTINGS_PANEL_ID_KEYWORDS "Keywords" G_DEFINE_TYPE (CcShellModel, cc_shell_model, GTK_TYPE_LIST_STORE)