On Thu, 01 Nov 2007 17:03:06 +0100
Jean-François Wauthy <[EMAIL PROTECTED]> wrote:
> Unfortunately I can't apply your patch on my working copy. Could you
> send an updated one ?
Weird, I tried to apply the patch to a fresh checkout just then with a patch
-p0 -i patch.diff and it worked fine. Here's an updated one anyway, hope you
have better luck with this one.
Jeff
Index: xfce-mcs-plugins/branches/xfce_4_4/po/en_GB.po
===================================================================
--- xfce-mcs-plugins/branches/xfce_4_4/po/en_GB.po (revision 26234)
+++ xfce-mcs-plugins/branches/xfce_4_4/po/en_GB.po (working copy)
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the xfce-mcs-plugins package.
# Zuza Software Foundation (Translate.org.za), 2004.
# Translate.org.za <[EMAIL PROTECTED]>, 2007.
-#
-#
+#
+#
msgid ""
msgstr ""
"Project-Id-Version: xfce-mcs-plugins 4.4.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-10-31 22:23-0700\n"
-"PO-Revision-Date: 2007-03-25 11:23+1000\n"
+"PO-Revision-Date: 2007-11-01 18:03+1000\n"
"Last-Translator: Jeff Bailes <[EMAIL PROTECTED]>\n"
"Language-Team: English/GB\n"
"MIME-Version: 1.0\n"
@@ -83,12 +83,8 @@
msgstr "Failed to open the File Manager Preferences."
#: ../plugins/fm_plugin/fm_plugin.c:65
-msgid ""
-"Either the Xfce File Manager was not build with support for D-BUS, or the D-"
-"BUS service was not installed properly."
-msgstr ""
-"Either the Xfce File Manager was not build with support for D-BUS, or the D-"
-"BUS service was not installed properly."
+msgid "Either the Xfce File Manager was not build with support for D-BUS, or the D-BUS service was not installed properly."
+msgstr "Either the Xfce File Manager was not build with support for D-BUS, or the D-BUS service was not installed properly."
#. the button label in the xfce-mcs-manager dialog
#: ../plugins/fm_plugin/fm_plugin.c:86
@@ -362,21 +358,13 @@
#: ../plugins/mouse_plugin/mouse-cursor-settings.c:163
#, c-format
-msgid ""
-"Mouse Settings: Unable to move %s to %s. Cursor settings may not be "
-"reapplied correctly on restart."
-msgstr ""
-"Mouse Settings: Unable to move %s to %s. Cursor settings may not be "
-"reapplied correctly on restart."
+msgid "Mouse Settings: Unable to move %s to %s. Cursor settings may not be reapplied correctly on restart."
+msgstr "Mouse Settings: Unable to move %s to %s. Cursor settings may not be reapplied correctly on restart."
#: ../plugins/mouse_plugin/mouse-cursor-settings.c:173
#, c-format
-msgid ""
-"Mouse Settings: Failed to run xrdb. Cursor settings may not be applied "
-"correctly. (Error was: %s)"
-msgstr ""
-"Mouse Settings: Failed to run xrdb. Cursor settings may not be applied "
-"correctly. (Error was: %s)"
+msgid "Mouse Settings: Failed to run xrdb. Cursor settings may not be applied correctly. (Error was: %s)"
+msgstr "Mouse Settings: Failed to run xrdb. Cursor settings may not be applied correctly. (Error was: %s)"
#: ../plugins/mouse_plugin/mouse-cursor-settings.c:485
msgid "Cursor theme"
@@ -473,7 +461,7 @@
#: ../plugins/ui_plugin/ui_plugin.c:122
msgid "System Default"
-msgstr ""
+msgstr "System Default"
#: ../plugins/ui_plugin/ui_plugin.c:501
msgid "Font Selection Dialog"
@@ -481,51 +469,48 @@
#: ../plugins/ui_plugin/ui_plugin.c:529
msgid "DPI Changed"
-msgstr ""
+msgstr "DPI Changed"
#: ../plugins/ui_plugin/ui_plugin.c:531
msgid "DPI was changed successfully"
-msgstr ""
+msgstr "DPI was changed successfully"
#: ../plugins/ui_plugin/ui_plugin.c:532
-msgid ""
-"However, you may need to restart your session for the settings to take "
-"effect."
-msgstr ""
+msgid "However, you may need to restart your session for the settings to take effect."
+msgstr "However, you may need to restart your session for the settings to take effect."
#: ../plugins/ui_plugin/ui_plugin.c:534
msgid "Log Out _Later"
-msgstr ""
+msgstr "Log Out _Later"
#: ../plugins/ui_plugin/ui_plugin.c:536
msgid "Log Out _Now"
-msgstr ""
+msgstr "Log Out _Now"
#: ../plugins/ui_plugin/ui_plugin.c:543
msgid "Exec Error"
-msgstr ""
+msgstr "Exec Error"
#: ../plugins/ui_plugin/ui_plugin.c:544
msgid "Failed to run \"xfce4-session-logout\""
-msgstr ""
+msgstr "Failed to run \"xfce4-session-logout\""
#: ../plugins/ui_plugin/ui_plugin.c:558
msgid "Custom DPI"
-msgstr ""
+msgstr "Custom DPI"
#: ../plugins/ui_plugin/ui_plugin.c:579
-msgid ""
-"Enter your display's DPI below. Numbers that are multiples of 6 usually "
-"work best. The smaller the number, the smaller your fonts will look."
-msgstr ""
+msgid "Enter your display's DPI below. Numbers that are multiples of 6 usually work best. The smaller the number, the smaller your fonts will look."
+msgstr "Enter your display's DPI below. Numbers that are multiples of 6 usually work best. The smaller the number, the smaller your fonts will look."
#: ../plugins/ui_plugin/ui_plugin.c:594
msgid "Custom _DPI:"
-msgstr ""
+msgstr "Custom _DPI:"
-#: ../plugins/ui_plugin/ui_plugin.c:631 ../plugins/ui_plugin/ui_plugin.c:1000
+#: ../plugins/ui_plugin/ui_plugin.c:631
+#: ../plugins/ui_plugin/ui_plugin.c:1000
msgid "Other..."
-msgstr ""
+msgstr "Other..."
#: ../plugins/ui_plugin/ui_plugin.c:887
msgid "User Interface Preferences"
@@ -541,7 +526,7 @@
#: ../plugins/ui_plugin/ui_plugin.c:974
msgid "Font _DPI:"
-msgstr ""
+msgstr "Font _DPI:"
#: ../plugins/ui_plugin/ui_plugin.c:1005
msgid "Font"
@@ -584,26 +569,16 @@
msgstr "Use anti-aliasing for fonts"
#: ../plugins/ui_plugin/ui_plugin.c:1046
-msgid ""
-"Antialiasing is an effect that is applied to the edges of characters to make "
-"the characters look smoother."
-msgstr ""
-"Antialiasing is an effect that is applied to the edges of characters to make "
-"the characters look smoother."
+msgid "Antialiasing is an effect that is applied to the edges of characters to make the characters look smoother."
+msgstr "Antialiasing is an effect that is applied to the edges of characters to make the characters look smoother."
#: ../plugins/ui_plugin/ui_plugin.c:1050
msgid "Use hinting:"
msgstr "Use hinting:"
#: ../plugins/ui_plugin/ui_plugin.c:1055
-msgid ""
-"Hinting is a font-rendering technique that improves the quality of fonts at "
-"small sizes and an at low screen resolutions. Select one of the options to "
-"specify how to apply hinting."
-msgstr ""
-"Hinting is a font-rendering technique that improves the quality of fonts at "
-"small sizes and an at low screen resolutions. Select one of the options to "
-"specify how to apply hinting."
+msgid "Hinting is a font-rendering technique that improves the quality of fonts at small sizes and an at low screen resolutions. Select one of the options to specify how to apply hinting."
+msgstr "Hinting is a font-rendering technique that improves the quality of fonts at small sizes and an at low screen resolutions. Select one of the options to specify how to apply hinting."
#: ../plugins/ui_plugin/ui_plugin.c:1065
msgid "Slight"
@@ -622,12 +597,8 @@
msgstr "Use sub-pixel hinting:"
#: ../plugins/ui_plugin/ui_plugin.c:1076
-msgid ""
-"Select one of the options to specify the subpixel color order for your "
-"fonts. Use this option for LCD or flat-screen displays."
-msgstr ""
-"Select one of the options to specify the subpixel colour order for your "
-"fonts. Use this option for LCD or flat-screen displays."
+msgid "Select one of the options to specify the subpixel color order for your fonts. Use this option for LCD or flat-screen displays."
+msgstr "Select one of the options to specify the subpixel colour order for your fonts. Use this option for LCD or flat-screen displays."
#: ../plugins/ui_plugin/ui_plugin.c:1094
msgid "RGB"
@@ -655,12 +626,8 @@
msgstr "User interface"
#: ../plugins/ui_plugin/ui_plugin.c:1404
-msgid ""
-"You have changed font rendering settings. This change will only affect newly "
-"started applications."
-msgstr ""
-"You have changed font rendering settings. This change will only affect newly "
-"started applications."
+msgid "You have changed font rendering settings. This change will only affect newly started applications."
+msgstr "You have changed font rendering settings. This change will only affect newly started applications."
#: ../plugins/display_plugin/xfce-display-settings.desktop.in.h:1
msgid "Display Settings"
@@ -697,3 +664,4 @@
#, fuzzy
#~ msgid "Theme Name"
#~ msgstr "_Theme"
+
Index: xfwm4/branches/xfce_4_4/po/en_GB.po
===================================================================
--- xfwm4/branches/xfce_4_4/po/en_GB.po (revision 26234)
+++ xfwm4/branches/xfce_4_4/po/en_GB.po (working copy)
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the xfwm4 package.
# Zuza Software Foundation (Translate.org.za), 2004.
# Translate.org.za <[EMAIL PROTECTED]>, 2007.
-#
-#
+#
+#
msgid ""
msgstr ""
"Project-Id-Version: xfwm4 4.4.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-04-09 14:29+0200\n"
-"PO-Revision-Date: 2007-03-25 12:23+1000\n"
+"PO-Revision-Date: 2007-11-01 18:04+1000\n"
"Last-Translator: Jeff Bailes <[EMAIL PROTECTED]>\n"
"Language-Team: English/GB\n"
"MIME-Version: 1.0\n"
@@ -23,10 +23,8 @@
msgstr "Workspace Margins"
#: ../mcs-plugin/margins.c:136
-msgid ""
-"Margins are areas on the edges of the screen where no window will be placed"
-msgstr ""
-"Margins are areas on the edges of the screen where no window will be placed"
+msgid "Margins are areas on the edges of the screen where no window will be placed"
+msgstr "Margins are areas on the edges of the screen where no window will be placed"
#: ../mcs-plugin/margins.c:167
msgid "Left :"
@@ -53,7 +51,8 @@
msgid "Workspaces and Margins"
msgstr "Workspaces and Margins"
-#: ../mcs-plugin/workspaces_plugin.c:162 ../mcs-plugin/wmtweaks_plugin.c:522
+#: ../mcs-plugin/workspaces_plugin.c:162
+#: ../mcs-plugin/wmtweaks_plugin.c:522
#: ../mcs-plugin/workspaces.c:516
msgid "Workspaces"
msgstr "Workspaces"
@@ -72,10 +71,8 @@
msgstr "Window Manager Tweaks"
#: ../mcs-plugin/wmtweaks_plugin.c:400
-msgid ""
-"Skip windows that have \"skip pager\" or \"skip taskbar\" properties set"
-msgstr ""
-"Skip windows that have \"skip pager\" or \"skip taskbar\" properties set"
+msgid "Skip windows that have \"skip pager\" or \"skip taskbar\" properties set"
+msgstr "Skip windows that have \"skip pager\" or \"skip taskbar\" properties set"
#: ../mcs-plugin/wmtweaks_plugin.c:406
msgid "Include hidden (i.e. iconified) windows"
@@ -97,7 +94,8 @@
msgid "Honor the standard ICCCM focus hint"
msgstr "Honor the standard ICCCM focus hint"
-#: ../mcs-plugin/wmtweaks_plugin.c:440 ../mcs-plugin/xfwm4_plugin.c:1698
+#: ../mcs-plugin/wmtweaks_plugin.c:440
+#: ../mcs-plugin/xfwm4_plugin.c:1698
msgid "Focus"
msgstr "Focus"
@@ -130,10 +128,8 @@
msgstr "Switch workspaces using the mouse wheel over the desktop"
#: ../mcs-plugin/wmtweaks_plugin.c:503
-msgid ""
-"Remember and recall previous workspace when switching via keyboard shortcuts"
-msgstr ""
-"Remember and recall previous workspace when switching via keyboard shortcuts"
+msgid "Remember and recall previous workspace when switching via keyboard shortcuts"
+msgstr "Remember and recall previous workspace when switching via keyboard shortcuts"
#: ../mcs-plugin/wmtweaks_plugin.c:510
msgid "Wrap workspaces depending on the actual desktop layout"
@@ -179,14 +175,18 @@
msgid "Opacity of window decorations"
msgstr "Opacity of window decorations"
-#: ../mcs-plugin/wmtweaks_plugin.c:591 ../mcs-plugin/wmtweaks_plugin.c:597
-#: ../mcs-plugin/wmtweaks_plugin.c:603 ../mcs-plugin/wmtweaks_plugin.c:609
+#: ../mcs-plugin/wmtweaks_plugin.c:591
+#: ../mcs-plugin/wmtweaks_plugin.c:597
+#: ../mcs-plugin/wmtweaks_plugin.c:603
+#: ../mcs-plugin/wmtweaks_plugin.c:609
#: ../mcs-plugin/wmtweaks_plugin.c:615
msgid "Transparent"
msgstr "Transparent"
-#: ../mcs-plugin/wmtweaks_plugin.c:592 ../mcs-plugin/wmtweaks_plugin.c:598
-#: ../mcs-plugin/wmtweaks_plugin.c:604 ../mcs-plugin/wmtweaks_plugin.c:610
+#: ../mcs-plugin/wmtweaks_plugin.c:592
+#: ../mcs-plugin/wmtweaks_plugin.c:598
+#: ../mcs-plugin/wmtweaks_plugin.c:604
+#: ../mcs-plugin/wmtweaks_plugin.c:610
#: ../mcs-plugin/wmtweaks_plugin.c:616
msgid "Opaque"
msgstr "Opaque"
@@ -216,7 +216,8 @@
msgid "Button Label|Window Manager Tweaks"
msgstr "Window Manager Tweaks"
-#: ../mcs-plugin/wmtweaks_plugin.c:781 ../mcs-plugin/xfwm4_plugin.c:2359
+#: ../mcs-plugin/wmtweaks_plugin.c:781
+#: ../mcs-plugin/xfwm4_plugin.c:2359
#, c-format
msgid "These settings cannot work with your current window manager (%s)"
msgstr "These settings cannot work with your current window manager (%s)"
@@ -225,7 +226,8 @@
msgid "Change name"
msgstr "Change name"
-#: ../mcs-plugin/workspaces.c:338 ../mcs-plugin/xfwm4_shortcuteditor.c:482
+#: ../mcs-plugin/workspaces.c:338
+#: ../mcs-plugin/xfwm4_shortcuteditor.c:482
#, c-format
msgid "Workspace %d"
msgstr "Workspace %d"
@@ -270,15 +272,18 @@
msgid "Close"
msgstr "Close"
-#: ../mcs-plugin/xfwm4_plugin.c:79 ../mcs-plugin/xfwm4_shortcuteditor.c:364
+#: ../mcs-plugin/xfwm4_plugin.c:79
+#: ../mcs-plugin/xfwm4_shortcuteditor.c:364
msgid "Shade window"
msgstr "Shade window"
-#: ../mcs-plugin/xfwm4_plugin.c:80 ../mcs-plugin/xfwm4_shortcuteditor.c:363
+#: ../mcs-plugin/xfwm4_plugin.c:80
+#: ../mcs-plugin/xfwm4_shortcuteditor.c:363
msgid "Hide window"
msgstr "Hide window"
-#: ../mcs-plugin/xfwm4_plugin.c:81 ../mcs-plugin/xfwm4_shortcuteditor.c:360
+#: ../mcs-plugin/xfwm4_plugin.c:81
+#: ../mcs-plugin/xfwm4_shortcuteditor.c:360
msgid "Maximize window"
msgstr "Maximise window"
@@ -691,7 +696,7 @@
#: ../mcs-plugin/xfwm4_shortcuteditor.c:850
msgid "Cancel"
-msgstr ""
+msgstr "Cancel"
#: ../mcs-plugin/xfwm4_shortcuteditor.c:854
msgid "No shortcut"
@@ -748,7 +753,8 @@
msgid "Context _help"
msgstr "Context _help"
-#: ../src/menu.c:50 ../src/menu.c:51
+#: ../src/menu.c:50
+#: ../src/menu.c:51
msgid "Always on top"
msgstr "Always on top"
@@ -823,3 +829,4 @@
#~ msgid "Unknown application!"
#~ msgstr "Unknown application!"
+
_______________________________________________
Xfce-i18n mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce-i18n
