2.17.2GLIB_2_17_2

svn path=/trunk/; revision=7032

1 files changed, 79 insertions, 81 deletions

diff --git a/po/en_CA.po b/po/en_CA.po
index dc1fd7094..e92d47f57 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-27 16:12-0400\n"
+"POT-Creation-Date: 2008-06-12 13:04-0400\n"
 "PO-Revision-Date: 2005-08-27 16:20-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
@@ -233,13 +233,6 @@ msgstr "Template '%s' invalid, should not contain a '%s'"
 msgid "Template '%s' doesn't contain XXXXXX"
 msgstr "Template '%s' does not contain XXXXXX"
 
-#: glib/gfileutils.c:1826
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] "%u byte"
-msgstr[1] "%u bytes"
-
 #: glib/gfileutils.c:1834
 #, c-format
 msgid "%.1f KB"
@@ -550,7 +543,7 @@ msgstr "backtracking limit reached"
 msgid "the pattern contains items not supported for partial matching"
 msgstr "the pattern contains items not supported for partial matching"
 
-#: glib/gregex.c:154 gio/glocalfile.c:1971
+#: glib/gregex.c:154 gio/glocalfile.c:1975
 msgid "internal error"
 msgstr "internal error"
 
@@ -857,17 +850,17 @@ msgstr "Text was empty (or contained only whitespace)"
 msgid "Failed to read data from child process"
 msgstr "Failed to read data from child process"
 
-#: glib/gspawn-win32.c:294 glib/gspawn.c:1455
+#: glib/gspawn-win32.c:294 glib/gspawn.c:1467
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr "Failed to create pipe for communicating with child process (%s)"
 
-#: glib/gspawn-win32.c:332 glib/gspawn-win32.c:340 glib/gspawn.c:1119
+#: glib/gspawn-win32.c:332 glib/gspawn-win32.c:340 glib/gspawn.c:1131
 #, c-format
 msgid "Failed to read from child pipe (%s)"
 msgstr "Failed to read from child pipe (%s)"
 
-#: glib/gspawn-win32.c:363 glib/gspawn.c:1324
+#: glib/gspawn-win32.c:363 glib/gspawn.c:1336
 #, c-format
 msgid "Failed to change to directory '%s' (%s)"
 msgstr "Failed to change to directory '%s' (%s)"
@@ -911,47 +904,47 @@ msgstr ""
 "Unexpected error in g_io_channel_win32_poll() reading data from a child "
 "process"
 
-#: glib/gspawn.c:180
+#: glib/gspawn.c:188
 #, c-format
 msgid "Failed to read data from child process (%s)"
 msgstr "Failed to read data from child process (%s)"
 
-#: glib/gspawn.c:317
+#: glib/gspawn.c:325
 #, c-format
 msgid "Unexpected error in select() reading data from a child process (%s)"
 msgstr "Unexpected error in select() reading data from a child process (%s)"
 
-#: glib/gspawn.c:400
+#: glib/gspawn.c:408
 #, c-format
 msgid "Unexpected error in waitpid() (%s)"
 msgstr "Unexpected error in waitpid() (%s)"
 
-#: glib/gspawn.c:1184
+#: glib/gspawn.c:1196
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "Failed to fork (%s)"
 
-#: glib/gspawn.c:1334
+#: glib/gspawn.c:1346
 #, c-format
 msgid "Failed to execute child process \"%s\" (%s)"
 msgstr "Failed to execute child process \"%s\" (%s)"
 
-#: glib/gspawn.c:1344
+#: glib/gspawn.c:1356
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr "Failed to redirect output or input of child process (%s)"
 
-#: glib/gspawn.c:1353
+#: glib/gspawn.c:1365
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "Failed to fork child process (%s)"
 
-#: glib/gspawn.c:1361
+#: glib/gspawn.c:1373
 #, c-format
 msgid "Unknown error executing child process \"%s\""
 msgstr "Unknown error executing child process \"%s\""
 
-#: glib/gspawn.c:1383
+#: glib/gspawn.c:1395
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr "Failed to read enough data from child pid pipe (%s)"
@@ -1073,29 +1066,29 @@ msgstr "Invalid key name: %s"
 msgid "Key file contains unsupported encoding '%s'"
 msgstr "Key file contains unsupported encoding '%s'"
 
-#: glib/gkeyfile.c:1109 glib/gkeyfile.c:1269 glib/gkeyfile.c:2487
-#: glib/gkeyfile.c:2555 glib/gkeyfile.c:2690 glib/gkeyfile.c:2825
-#: glib/gkeyfile.c:2978 glib/gkeyfile.c:3165 glib/gkeyfile.c:3226
+#: glib/gkeyfile.c:1112 glib/gkeyfile.c:1272 glib/gkeyfile.c:2490
+#: glib/gkeyfile.c:2558 glib/gkeyfile.c:2693 glib/gkeyfile.c:2828
+#: glib/gkeyfile.c:2981 glib/gkeyfile.c:3168 glib/gkeyfile.c:3229
 #, c-format
 msgid "Key file does not have group '%s'"
 msgstr "Key file does not have group '%s'"
 
-#: glib/gkeyfile.c:1281
+#: glib/gkeyfile.c:1284
 #, c-format
 msgid "Key file does not have key '%s'"
 msgstr "Key file does not have key '%s'"
 
-#: glib/gkeyfile.c:1383 glib/gkeyfile.c:1496
+#: glib/gkeyfile.c:1386 glib/gkeyfile.c:1499
 #, c-format
 msgid "Key file contains key '%s' with value '%s' which is not UTF-8"
 msgstr "Key file contains key '%s' with value '%s' which is not UTF-8"
 
-#: glib/gkeyfile.c:1403 glib/gkeyfile.c:1516 glib/gkeyfile.c:1891
+#: glib/gkeyfile.c:1406 glib/gkeyfile.c:1519 glib/gkeyfile.c:1894
 #, c-format
 msgid "Key file contains key '%s' which has value that cannot be interpreted."
 msgstr "Key file contains key '%s' which has value that cannot be interpreted."
 
-#: glib/gkeyfile.c:2106 glib/gkeyfile.c:2318
+#: glib/gkeyfile.c:2109 glib/gkeyfile.c:2321
 #, c-format
 msgid ""
 "Key file contains key '%s' in group '%s' which has value that cannot be "
@@ -1104,37 +1097,37 @@ msgstr ""
 "Key file contains key '%s' in group '%s' which has value that cannot be "
 "interpreted."
 
-#: glib/gkeyfile.c:2502 glib/gkeyfile.c:2705 glib/gkeyfile.c:3237
+#: glib/gkeyfile.c:2505 glib/gkeyfile.c:2708 glib/gkeyfile.c:3240
 #, c-format
 msgid "Key file does not have key '%s' in group '%s'"
 msgstr "Key file does not have key '%s' in group '%s'"
 
-#: glib/gkeyfile.c:3471
+#: glib/gkeyfile.c:3474
 #, c-format
 msgid "Key file contains escape character at end of line"
 msgstr "Key file contains escape character at end of line"
 
-#: glib/gkeyfile.c:3493
+#: glib/gkeyfile.c:3496
 #, c-format
 msgid "Key file contains invalid escape sequence '%s'"
 msgstr "Key file contains invalid escape sequence '%s'"
 
-#: glib/gkeyfile.c:3635
+#: glib/gkeyfile.c:3638
 #, c-format
 msgid "Value '%s' cannot be interpreted as a number."
 msgstr "Value '%s' cannot be interpreted as a number."
 
-#: glib/gkeyfile.c:3649
+#: glib/gkeyfile.c:3652
 #, c-format
 msgid "Integer value '%s' out of range"
 msgstr "Integer value '%s' out of range"
 
-#: glib/gkeyfile.c:3682
+#: glib/gkeyfile.c:3685
 #, c-format
 msgid "Value '%s' cannot be interpreted as a float number."
 msgstr "Value '%s' cannot be interpreted as a float number."
 
-#: glib/gkeyfile.c:3706
+#: glib/gkeyfile.c:3709
 #, c-format
 msgid "Value '%s' cannot be interpreted as a boolean."
 msgstr "Value '%s' cannot be interpreted as a boolean."
@@ -1152,7 +1145,7 @@ msgstr "Too large count value passed to %s"
 msgid "Stream is already closed"
 msgstr "Stream is already closed"
 
-#: gio/gcancellable.c:296 gio/glocalfile.c:1964 gio/gsimpleasyncresult.c:611
+#: gio/gcancellable.c:296 gio/glocalfile.c:1968 gio/gsimpleasyncresult.c:611
 #, c-format
 msgid "Operation was cancelled"
 msgstr "Operation was cancelled"
@@ -1166,7 +1159,7 @@ msgstr "Unknown type"
 msgid "%s filetype"
 msgstr "%s filetype"
 
-#: gio/gcontenttype.c:591
+#: gio/gcontenttype.c:606
 #, c-format
 msgid "%s type"
 msgstr "%s type"
@@ -1220,8 +1213,8 @@ msgstr "drive doesn't implement polling for media"
 
 #: gio/gfile.c:811 gio/gfile.c:1039 gio/gfile.c:1172 gio/gfile.c:1403
 #: gio/gfile.c:1456 gio/gfile.c:1512 gio/gfile.c:1594 gio/gfile.c:2651
-#: gio/gfile.c:2696 gio/gfile.c:2746 gio/gfile.c:2786 gio/gfile.c:3110
-#: gio/gfile.c:3512 gio/gfile.c:3595 gio/gfile.c:3678 gio/gfile.c:3758
+#: gio/gfile.c:2702 gio/gfile.c:2830 gio/gfile.c:2870 gio/gfile.c:3194
+#: gio/gfile.c:3596 gio/gfile.c:3679 gio/gfile.c:3762 gio/gfile.c:3842
 #, c-format
 msgid "Operation not supported"
 msgstr "Operation not supported"
@@ -1234,13 +1227,13 @@ msgstr "Operation not supported"
 #. Translators: This is an error message when trying to find
 #. * the enclosing (user visible) mount of a file, but none
 #. * exists.
-#: gio/gfile.c:1291 gio/glocalfile.c:1054 gio/glocalfile.c:1065
-#: gio/glocalfile.c:1078
+#: gio/gfile.c:1291 gio/glocalfile.c:1058 gio/glocalfile.c:1069
+#: gio/glocalfile.c:1082
 #, c-format
 msgid "Containing mount does not exist"
 msgstr "Containing mount does not exist"
 
-#: gio/gfile.c:1933 gio/glocalfile.c:2114
+#: gio/gfile.c:1933 gio/glocalfile.c:2118
 #, c-format
 msgid "Can't copy over directory"
 msgstr "Can't copy over directory"
@@ -1250,7 +1243,7 @@ msgstr "Can't copy over directory"
 msgid "Can't copy directory over directory"
 msgstr "Can't copy directory over directory"
 
-#: gio/gfile.c:2001 gio/glocalfile.c:2123
+#: gio/gfile.c:2001 gio/glocalfile.c:2127
 #, c-format
 msgid "Target file exists"
 msgstr "Target file exists"
@@ -1260,26 +1253,26 @@ msgstr "Target file exists"
 msgid "Can't recursively copy directory"
 msgstr "Can't recursively copy directory"
 
-#: gio/gfile.c:2736
+#: gio/gfile.c:2820
 #, c-format
 msgid "Invalid symlink value given"
 msgstr "Invalid symlink value given"
 
-#: gio/gfile.c:2829
+#: gio/gfile.c:2913
 #, c-format
 msgid "Trash not supported"
 msgstr "Trash not supported"
 
-#: gio/gfile.c:2876
+#: gio/gfile.c:2960
 #, c-format
 msgid "File names cannot contain '%c'"
 msgstr "File names cannot contain '%c'"
 
-#: gio/gfile.c:4812 gio/gvolume.c:357
+#: gio/gfile.c:4896 gio/gvolume.c:357
 msgid "volume doesn't implement mount"
 msgstr "volume doesn't implement mount"
 
-#: gio/gfile.c:4920
+#: gio/gfile.c:5004
 #, c-format
 msgid "No application is registered as handling this file"
 msgstr "No application is registered as handling this file"
@@ -1346,111 +1339,111 @@ msgstr "Unable to find default local directory monitor type"
 msgid "Invalid filename %s"
 msgstr "Invalid filename %s"
 
-#: gio/glocalfile.c:962
+#: gio/glocalfile.c:966
 #, c-format
 msgid "Error getting filesystem info: %s"
 msgstr "Error getting filesystem info: %s"
 
-#: gio/glocalfile.c:1098
+#: gio/glocalfile.c:1102
 #, c-format
 msgid "Can't rename root directory"
 msgstr "Can't rename root directory"
 
-#: gio/glocalfile.c:1116
+#: gio/glocalfile.c:1120
 #, c-format
 msgid "Can't rename file, filename already exist"
 msgstr "Can't rename file: filename already exist"
 
-#: gio/glocalfile.c:1129 gio/glocalfile.c:1993 gio/glocalfile.c:2022
-#: gio/glocalfile.c:2176 gio/glocalfileoutputstream.c:472
+#: gio/glocalfile.c:1133 gio/glocalfile.c:1997 gio/glocalfile.c:2026
+#: gio/glocalfile.c:2180 gio/glocalfileoutputstream.c:472
 #: gio/glocalfileoutputstream.c:517 gio/glocalfileoutputstream.c:925
 #, c-format
 msgid "Invalid filename"
 msgstr "Invalid filename"
 
-#: gio/glocalfile.c:1133
+#: gio/glocalfile.c:1137
 #, c-format
 msgid "Error renaming file: %s"
 msgstr "Error renaming file: %s"
 
-#: gio/glocalfile.c:1252
+#: gio/glocalfile.c:1256
 #, c-format
 msgid "Error opening file: %s"
 msgstr "Error opening file: %s"
 
-#: gio/glocalfile.c:1262
+#: gio/glocalfile.c:1266
 #, c-format
 msgid "Can't open directory"
 msgstr "Can't open directory"
 
-#: gio/glocalfile.c:1322
+#: gio/glocalfile.c:1326
 #, c-format
 msgid "Error removing file: %s"
 msgstr "Error removing file: %s"
 
-#: gio/glocalfile.c:1686
+#: gio/glocalfile.c:1690
 #, c-format
 msgid "Error trashing file: %s"
 msgstr "Error trashing file: %s"
 
-#: gio/glocalfile.c:1709
+#: gio/glocalfile.c:1713
 #, c-format
 msgid "Unable to create trash dir %s: %s"
 msgstr "Unable to create trash dir %s: %s"
 
-#: gio/glocalfile.c:1730
+#: gio/glocalfile.c:1734
 #, c-format
 msgid "Unable to find toplevel directory for trash"
 msgstr "Unable to find toplevel directory for trash"
 
-#: gio/glocalfile.c:1809 gio/glocalfile.c:1829
+#: gio/glocalfile.c:1813 gio/glocalfile.c:1833
 #, c-format
 msgid "Unable to find or create trash directory"
 msgstr "Unable to find or create trash directory"
 
-#: gio/glocalfile.c:1863
+#: gio/glocalfile.c:1867
 #, c-format
 msgid "Unable to create trashing info file: %s"
 msgstr "Unable to create trashing info file: %s"
 
-#: gio/glocalfile.c:1888 gio/glocalfile.c:1963 gio/glocalfile.c:1970
+#: gio/glocalfile.c:1892 gio/glocalfile.c:1967 gio/glocalfile.c:1974
 #, c-format
 msgid "Unable to trash file: %s"
 msgstr "Unable to trash file: %s"
 
-#: gio/glocalfile.c:1997
+#: gio/glocalfile.c:2001
 #, fuzzy, c-format
 msgid "Error creating directory: %s"
 msgstr "Error opening directory '%s': %s"
 
-#: gio/glocalfile.c:2026
+#: gio/glocalfile.c:2030
 #, c-format
 msgid "Error making symbolic link: %s"
 msgstr "Error making symbolic link: %s"
 
-#: gio/glocalfile.c:2086 gio/glocalfile.c:2180
+#: gio/glocalfile.c:2090 gio/glocalfile.c:2184
 #, c-format
 msgid "Error moving file: %s"
 msgstr "Error moving file: %s"
 
-#: gio/glocalfile.c:2109
+#: gio/glocalfile.c:2113
 #, c-format
 msgid "Can't move directory over directory"
 msgstr "Can't move directory over directory"
 
-#: gio/glocalfile.c:2136 gio/glocalfileoutputstream.c:777
+#: gio/glocalfile.c:2140 gio/glocalfileoutputstream.c:777
 #: gio/glocalfileoutputstream.c:791 gio/glocalfileoutputstream.c:806
 #: gio/glocalfileoutputstream.c:822 gio/glocalfileoutputstream.c:836
 #, c-format
 msgid "Backup file creation failed"
 msgstr "Backup file creation failed"
 
-#: gio/glocalfile.c:2155
+#: gio/glocalfile.c:2159
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "Error removing target file: %s"
 
-#: gio/glocalfile.c:2169
+#: gio/glocalfile.c:2173
 #, c-format
 msgid "Move between mounts not supported"
 msgstr "Move between mounts not supported"
@@ -1484,53 +1477,53 @@ msgstr "Error stating file '%s': %s"
 msgid " (invalid encoding)"
 msgstr " (invalid encoding)"
 
-#: gio/glocalfileinfo.c:1693
+#: gio/glocalfileinfo.c:1698
 #, c-format
 msgid "Error stating file descriptor: %s"
 msgstr "Error stating file descriptor: %s"
 
-#: gio/glocalfileinfo.c:1738
+#: gio/glocalfileinfo.c:1743
 #, c-format
 msgid "Invalid attribute type (uint32 expected)"
 msgstr "Invalid attribute type (uint32 expected)"
 
-#: gio/glocalfileinfo.c:1756
+#: gio/glocalfileinfo.c:1761
 #, c-format
 msgid "Invalid attribute type (uint64 expected)"
 msgstr "Invalid attribute type (uint64 expected)"
 
-#: gio/glocalfileinfo.c:1775
+#: gio/glocalfileinfo.c:1780
 #, c-format
 msgid "Invalid attribute type (byte string expected)"
 msgstr "Invalid attribute type (byte string expected)"
 
-#: gio/glocalfileinfo.c:1801
+#: gio/glocalfileinfo.c:1806
 #, c-format
 msgid "Error setting permissions: %s"
 msgstr "Error setting permissions: %s"
 
-#: gio/glocalfileinfo.c:1852 gio/glocalfileinfo.c:2020
+#: gio/glocalfileinfo.c:1857 gio/glocalfileinfo.c:2025
 #, c-format
 msgid "Error setting owner: %s"
 msgstr "Error setting owner: %s"
 
-#: gio/glocalfileinfo.c:1875
+#: gio/glocalfileinfo.c:1880
 #, c-format
 msgid "symlink must be non-NULL"
 msgstr "symlink must be non-NULL"
 
-#: gio/glocalfileinfo.c:1885 gio/glocalfileinfo.c:1904
-#: gio/glocalfileinfo.c:1915
+#: gio/glocalfileinfo.c:1890 gio/glocalfileinfo.c:1909
+#: gio/glocalfileinfo.c:1920
 #, c-format
 msgid "Error setting symlink: %s"
 msgstr "Error setting symlink: %s"
 
-#: gio/glocalfileinfo.c:1894
+#: gio/glocalfileinfo.c:1899
 #, c-format
 msgid "Error setting symlink: file is not a symlink"
 msgstr "Error setting symlink: file is not a symlink"
 
-#: gio/glocalfileinfo.c:2075
+#: gio/glocalfileinfo.c:2080
 #, c-format
 msgid "Setting attribute %s not supported"
 msgstr "Setting attribute %s not supported"
@@ -1753,3 +1746,8 @@ msgstr "use a long listing format"
 #: tests/gio-ls.c:37
 msgid "[FILE...]"
 msgstr "[FILE...]"
+
+#~ msgid "%u byte"
+#~ msgid_plural "%u bytes"
+#~ msgstr[0] "%u byte"
+#~ msgstr[1] "%u bytes"