-
Notifications
You must be signed in to change notification settings - Fork 0
/
glib-stable-branch.patch
11696 lines (10433 loc) · 263 KB
/
glib-stable-branch.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
index f8cccca02..c29c30947 100644
--- a/gio/gdesktopappinfo.c
+++ b/gio/gdesktopappinfo.c
@@ -2963,6 +2963,7 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo *info,
g_free (sn_id);
g_list_free (launched_uris);
+ g_clear_pointer (&wrapped_argv, g_strfreev);
goto out;
}
diff --git a/gio/gportalsupport.h b/gio/gportalsupport.h
index f7bb6ae82..5fe5d8267 100644
--- a/gio/gportalsupport.h
+++ b/gio/gportalsupport.h
@@ -19,6 +19,7 @@
*/
#ifndef __G_PORTAL_SUPPORT_H__
+#define __G_PORTAL_SUPPORT_H__
#include <glib.h>
diff --git a/gio/gproxyresolver.c b/gio/gproxyresolver.c
index 7ac64df63..61f61a797 100644
--- a/gio/gproxyresolver.c
+++ b/gio/gproxyresolver.c
@@ -245,6 +245,9 @@ g_proxy_resolver_lookup_finish (GProxyResolver *resolver,
g_return_val_if_fail (G_IS_PROXY_RESOLVER (resolver), NULL);
+ if (g_async_result_is_tagged (result, g_proxy_resolver_lookup_async))
+ return g_task_propagate_pointer (G_TASK (result), error);
+
iface = G_PROXY_RESOLVER_GET_IFACE (resolver);
proxy_uris = (* iface->lookup_finish) (resolver, result, error);
diff --git a/gio/tests/proxy-test.c b/gio/tests/proxy-test.c
index f936a9383..e040c63b6 100644
--- a/gio/tests/proxy-test.c
+++ b/gio/tests/proxy-test.c
@@ -20,7 +20,6 @@
#include <string.h>
-#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_34
#include <gio/gio.h>
/* Overview:
@@ -194,6 +193,7 @@ g_test_proxy_resolver_lookup_async (GProxyResolver *resolver,
proxies = g_proxy_resolver_lookup (resolver, uri, cancellable, &error);
task = g_task_new (resolver, NULL, callback, user_data);
+ g_task_set_source_tag (task, g_test_proxy_resolver_lookup_async);
if (proxies == NULL)
g_task_return_error (task, error);
else
@@ -207,6 +207,9 @@ g_test_proxy_resolver_lookup_finish (GProxyResolver *resolver,
GAsyncResult *result,
GError **error)
{
+ g_assert_true (g_task_is_valid (result, resolver));
+ g_assert_true (g_task_get_source_tag (G_TASK (result)) == g_test_proxy_resolver_lookup_async);
+
return g_task_propagate_pointer (G_TASK (result), error);
}
@@ -917,6 +920,18 @@ async_got_error (GObject *source,
g_assert (*error != NULL);
}
+static void
+async_resolver_got_error (GObject *source,
+ GAsyncResult *result,
+ gpointer user_data)
+{
+ GError **error = user_data;
+
+ g_assert (error != NULL && *error == NULL);
+ g_proxy_resolver_lookup_finish (G_PROXY_RESOLVER (source),
+ result, error);
+ g_assert (*error != NULL);
+}
static void
assert_direct (GSocketConnection *conn)
@@ -1166,13 +1181,24 @@ test_invalid_uris_sync (gpointer fixture,
do_echo_test (conn);
g_object_unref (conn);
g_clear_pointer (&last_proxies, g_strfreev);
+
+ /* Trying to use something that is not a URI at all should fail. */
+ conn = g_socket_client_connect_to_uri (client, "asdf", 0, NULL, &error);
+ g_assert_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT);
+ g_clear_error (&error);
+ g_clear_pointer (&last_proxies, g_strfreev);
+
+ /* Should still fail if using GProxyResolver directly. */
+ g_proxy_resolver_lookup (g_proxy_resolver_get_default (), "asdf", NULL, &error);
+ g_assert_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT);
+ g_clear_error (&error);
}
static void
test_invalid_uris_async (gpointer fixture,
gconstpointer user_data)
{
- GSocketConnection *conn;
+ GSocketConnection *conn = NULL;
GError *error = NULL;
gchar *uri;
@@ -1204,29 +1230,44 @@ test_invalid_uris_async (gpointer fixture,
* we should succeed.
*/
uri = g_strdup_printf ("invalid-then-simple://127.0.0.1:%u", server.server_port);
- conn = NULL;
g_socket_client_connect_to_uri_async (client, uri, 0, NULL,
async_got_conn, &conn);
g_free (uri);
while (conn == NULL)
g_main_context_iteration (NULL, TRUE);
do_echo_test (conn);
- g_object_unref (conn);
+ g_clear_object (&conn);
g_clear_pointer (&last_proxies, g_strfreev);
/* If the proxy resolver returns a valid URI before an invalid URI,
* we should succeed.
*/
uri = g_strdup_printf ("simple-then-invalid://127.0.0.1:%u", server.server_port);
- conn = NULL;
g_socket_client_connect_to_uri_async (client, uri, 0, NULL,
async_got_conn, &conn);
g_free (uri);
while (conn == NULL)
g_main_context_iteration (NULL, TRUE);
do_echo_test (conn);
- g_object_unref (conn);
+ g_clear_object (&conn);
g_clear_pointer (&last_proxies, g_strfreev);
+
+ /* Trying to use something that is not a URI at all should fail. */
+ g_socket_client_connect_to_uri_async (client, "asdf", 0, NULL,
+ async_got_error, &error);
+ while (error == NULL)
+ g_main_context_iteration (NULL, TRUE);
+ g_assert_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT);
+ g_clear_error (&error);
+ g_clear_pointer (&last_proxies, g_strfreev);
+
+ /* Should still fail if using GProxyResolver directly. */
+ g_proxy_resolver_lookup_async (g_proxy_resolver_get_default (), "asdf", NULL,
+ async_resolver_got_error, &error);
+ while (error == NULL)
+ g_main_context_iteration (NULL, TRUE);
+ g_assert_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT);
+ g_clear_error (&error);
}
static void
diff --git a/glib/glib-unix.c b/glib/glib-unix.c
index 4710c5116..bc152d766 100644
--- a/glib/glib-unix.c
+++ b/glib/glib-unix.c
@@ -108,17 +108,6 @@ g_unix_open_pipe (int *fds,
ecode = pipe2 (fds, pipe2_flags);
if (ecode == -1 && errno != ENOSYS)
return g_unix_set_error_from_errno (error, errno);
- /* Don't reassign pipes to stdin, stdout, stderr if closed meanwhile */
- else if (fds[0] < 3 || fds[1] < 3)
- {
- int old_fds[2] = { fds[0], fds[1] };
- gboolean result = g_unix_open_pipe (fds, flags, error);
- close (old_fds[0]);
- close (old_fds[1]);
-
- if (!result)
- g_unix_set_error_from_errno (error, errno);
- }
else if (ecode == 0)
return TRUE;
/* Fall through on -ENOSYS, we must be running on an old kernel */
@@ -127,19 +116,6 @@ g_unix_open_pipe (int *fds,
ecode = pipe (fds);
if (ecode == -1)
return g_unix_set_error_from_errno (error, errno);
- /* Don't reassign pipes to stdin, stdout, stderr if closed meanwhile */
- else if (fds[0] < 3 || fds[1] < 3)
- {
- int old_fds[2] = { fds[0], fds[1] };
- gboolean result = g_unix_open_pipe (fds, flags, error);
- close (old_fds[0]);
- close (old_fds[1]);
-
- if (!result)
- g_unix_set_error_from_errno (error, errno);
-
- return result;
- }
if (flags == 0)
return TRUE;
diff --git a/glib/tests/unix.c b/glib/tests/unix.c
index 2112cab6b..6c4a59dee 100644
--- a/glib/tests/unix.c
+++ b/glib/tests/unix.c
@@ -24,8 +24,11 @@
#include "config.h"
#include "glib-unix.h"
+#include "gstdio.h"
+
#include <string.h>
#include <pwd.h>
+#include <unistd.h>
static void
test_pipe (void)
@@ -52,6 +55,43 @@ test_pipe (void)
g_assert (g_str_has_prefix (buf, "hello"));
}
+static void
+test_pipe_stdio_overwrite (void)
+{
+ GError *error = NULL;
+ int pipefd[2], ret;
+ gboolean res;
+ int stdin_fd;
+
+
+ g_test_summary ("Test that g_unix_open_pipe() will use the first available FD, even if it’s stdin/stdout/stderr");
+ g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2795");
+
+ stdin_fd = dup (STDIN_FILENO);
+ g_assert_cmpint (stdin_fd, >, 0);
+
+ g_close (STDIN_FILENO, &error);
+ g_assert_no_error (error);
+
+ res = g_unix_open_pipe (pipefd, FD_CLOEXEC, &error);
+ g_assert_no_error (error);
+ g_assert_true (res);
+
+ g_assert_cmpint (pipefd[0], ==, STDIN_FILENO);
+
+ g_close (pipefd[0], &error);
+ g_assert_no_error (error);
+
+ g_close (pipefd[1], &error);
+ g_assert_no_error (error);
+
+ ret = dup2 (stdin_fd, STDIN_FILENO);
+ g_assert_cmpint (ret, >=, 0);
+
+ g_close (stdin_fd, &error);
+ g_assert_no_error (error);
+}
+
static void
test_error (void)
{
@@ -337,6 +377,7 @@ main (int argc,
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/glib-unix/pipe", test_pipe);
+ g_test_add_func ("/glib-unix/pipe-stdio-overwrite", test_pipe_stdio_overwrite);
g_test_add_func ("/glib-unix/error", test_error);
g_test_add_func ("/glib-unix/nonblocking", test_nonblocking);
g_test_add_func ("/glib-unix/sighup", test_sighup);
diff --git a/po/ab.po b/po/ab.po
index c4d231a35..9c3c17bb5 100644
--- a/po/ab.po
+++ b/po/ab.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glib/issues\n"
-"POT-Creation-Date: 2022-09-24 17:13+0000\n"
+"POT-Creation-Date: 2022-10-16 12:25+0000\n"
"Last-Translator: Нанба Наала <[email protected]>\n"
"Language-Team: Abkhazian <[email protected]>\n"
"Language: ab\n"
@@ -9,6 +9,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-DamnedLies-Scope: partial\n"
#: gio/gappinfo.c:335
msgid "Setting default applications not supported yet"
@@ -2007,7 +2008,7 @@ msgstr ""
#: gio/gio-tool-mount.c:69
msgid "DEVICE"
-msgstr ""
+msgstr "АИҾАРТӘЫРА"
#: gio/gio-tool-mount.c:70
msgid "Unmount all mounts with the given scheme"
@@ -2106,7 +2107,7 @@ msgstr ""
#: gio/gio-tool-rename.c:47
msgid "NAME"
-msgstr ""
+msgstr "АХЬӠ"
#: gio/gio-tool-rename.c:52
msgid "Rename a file."
@@ -2985,115 +2986,115 @@ msgstr ""
msgid "Error setting extended attribute “%s”: %s"
msgstr ""
-#: gio/glocalfileinfo.c:1738 gio/win32/gwinhttpfile.c:191
+#: gio/glocalfileinfo.c:1732 gio/win32/gwinhttpfile.c:191
msgid " (invalid encoding)"
msgstr ""
-#: gio/glocalfileinfo.c:1897 gio/glocalfileoutputstream.c:945
+#: gio/glocalfileinfo.c:1891 gio/glocalfileoutputstream.c:945
#: gio/glocalfileoutputstream.c:997
#, c-format
msgid "Error when getting information for file “%s”: %s"
msgstr ""
-#: gio/glocalfileinfo.c:2163
+#: gio/glocalfileinfo.c:2157
#, c-format
msgid "Error when getting information for file descriptor: %s"
msgstr ""
-#: gio/glocalfileinfo.c:2208
+#: gio/glocalfileinfo.c:2202
msgid "Invalid attribute type (uint32 expected)"
msgstr ""
-#: gio/glocalfileinfo.c:2226
+#: gio/glocalfileinfo.c:2220
msgid "Invalid attribute type (uint64 expected)"
msgstr ""
-#: gio/glocalfileinfo.c:2245 gio/glocalfileinfo.c:2264
+#: gio/glocalfileinfo.c:2239 gio/glocalfileinfo.c:2258
msgid "Invalid attribute type (byte string expected)"
msgstr ""
-#: gio/glocalfileinfo.c:2311
+#: gio/glocalfileinfo.c:2305
msgid "Cannot set permissions on symlinks"
msgstr ""
-#: gio/glocalfileinfo.c:2327
+#: gio/glocalfileinfo.c:2321
#, c-format
msgid "Error setting permissions: %s"
msgstr ""
-#: gio/glocalfileinfo.c:2378
+#: gio/glocalfileinfo.c:2372
#, c-format
msgid "Error setting owner: %s"
msgstr ""
-#: gio/glocalfileinfo.c:2401
+#: gio/glocalfileinfo.c:2395
msgid "symlink must be non-NULL"
msgstr ""
-#: gio/glocalfileinfo.c:2411 gio/glocalfileinfo.c:2430
-#: gio/glocalfileinfo.c:2441
+#: gio/glocalfileinfo.c:2405 gio/glocalfileinfo.c:2424
+#: gio/glocalfileinfo.c:2435
#, c-format
msgid "Error setting symlink: %s"
msgstr ""
-#: gio/glocalfileinfo.c:2420
+#: gio/glocalfileinfo.c:2414
msgid "Error setting symlink: file is not a symlink"
msgstr ""
-#: gio/glocalfileinfo.c:2492
+#: gio/glocalfileinfo.c:2486
#, c-format
msgid "Extra nanoseconds %d for UNIX timestamp %lld are negative"
msgstr ""
-#: gio/glocalfileinfo.c:2501
+#: gio/glocalfileinfo.c:2495
#, c-format
msgid "Extra nanoseconds %d for UNIX timestamp %lld reach 1 second"
msgstr ""
-#: gio/glocalfileinfo.c:2511
+#: gio/glocalfileinfo.c:2505
#, c-format
msgid "UNIX timestamp %lld does not fit into 64 bits"
msgstr "Аамҭалатәи адырга UNIX %lld 64 бит иакӡом"
-#: gio/glocalfileinfo.c:2522
+#: gio/glocalfileinfo.c:2516
#, fuzzy, c-format
msgid "UNIX timestamp %lld is outside of the range supported by Windows"
msgstr "Аамҭалатәи адырга UNIX %ll d иаҵанакцом Windows зыцхыраауа аҵакыра"
-#: gio/glocalfileinfo.c:2625
+#: gio/glocalfileinfo.c:2619
#, c-format
msgid "File name “%s” cannot be converted to UTF-16"
msgstr ""
-#: gio/glocalfileinfo.c:2644
+#: gio/glocalfileinfo.c:2638
#, c-format
msgid "File “%s” cannot be opened: Windows Error %lu"
msgstr ""
-#: gio/glocalfileinfo.c:2657
+#: gio/glocalfileinfo.c:2651
#, c-format
msgid "Error setting modification or access time for file “%s”: %lu"
msgstr ""
-#: gio/glocalfileinfo.c:2798 gio/glocalfileinfo.c:2810
+#: gio/glocalfileinfo.c:2825
#, c-format
msgid "Error setting modification or access time: %s"
msgstr ""
-#: gio/glocalfileinfo.c:2833
+#: gio/glocalfileinfo.c:2848
msgid "SELinux context must be non-NULL"
msgstr ""
-#: gio/glocalfileinfo.c:2840
+#: gio/glocalfileinfo.c:2855
msgid "SELinux is not enabled on this system"
msgstr ""
-#: gio/glocalfileinfo.c:2850
+#: gio/glocalfileinfo.c:2865
#, c-format
msgid "Error setting SELinux context: %s"
msgstr ""
-#: gio/glocalfileinfo.c:2947
+#: gio/glocalfileinfo.c:2962
#, c-format
msgid "Setting attribute %s not supported"
msgstr ""
@@ -5191,300 +5192,300 @@ msgstr ""
msgid "Unknown option %s"
msgstr ""
-#: glib/gregex.c:474
+#: glib/gregex.c:479
msgid "corrupted object"
msgstr ""
-#: glib/gregex.c:476
+#: glib/gregex.c:481
msgid "out of memory"
msgstr ""
-#: glib/gregex.c:482
+#: glib/gregex.c:487
msgid "backtracking limit reached"
msgstr ""
-#: glib/gregex.c:493 glib/gregex.c:746 glib/gregex.c:775
+#: glib/gregex.c:498
msgid "internal error"
msgstr ""
-#: glib/gregex.c:495
+#: glib/gregex.c:500
msgid "the pattern contains items not supported for partial matching"
msgstr ""
-#: glib/gregex.c:497
+#: glib/gregex.c:502
msgid "back references as conditions are not supported for partial matching"
msgstr ""
-#: glib/gregex.c:503
+#: glib/gregex.c:508
msgid "recursion limit reached"
msgstr ""
-#: glib/gregex.c:505
+#: glib/gregex.c:510
msgid "bad offset"
msgstr ""
-#: glib/gregex.c:507
+#: glib/gregex.c:512
msgid "recursion loop"
msgstr ""
#. should not happen in GRegex since we check modes before each match
-#: glib/gregex.c:510
+#: glib/gregex.c:515
msgid "matching mode is requested that was not compiled for JIT"
msgstr ""
-#: glib/gregex.c:514
+#: glib/gregex.c:536 glib/gregex.c:1838
msgid "unknown error"
msgstr ""
-#: glib/gregex.c:535
+#: glib/gregex.c:557
msgid "\\ at end of pattern"
msgstr ""
-#: glib/gregex.c:539
+#: glib/gregex.c:561
msgid "\\c at end of pattern"
msgstr ""
-#: glib/gregex.c:544
+#: glib/gregex.c:566
msgid "unrecognized character following \\"
msgstr ""
-#: glib/gregex.c:548
+#: glib/gregex.c:570
msgid "numbers out of order in {} quantifier"
msgstr ""
-#: glib/gregex.c:552
+#: glib/gregex.c:574
msgid "number too big in {} quantifier"
msgstr ""
-#: glib/gregex.c:556
+#: glib/gregex.c:578
msgid "missing terminating ] for character class"
msgstr ""
-#: glib/gregex.c:560
+#: glib/gregex.c:582
msgid "invalid escape sequence in character class"
msgstr ""
-#: glib/gregex.c:564
+#: glib/gregex.c:586
msgid "range out of order in character class"
msgstr ""
-#: glib/gregex.c:569
+#: glib/gregex.c:591
msgid "nothing to repeat"
msgstr ""
-#: glib/gregex.c:573
+#: glib/gregex.c:595
msgid "unrecognized character after (? or (?-"
msgstr ""
-#: glib/gregex.c:577
+#: glib/gregex.c:599
msgid "POSIX named classes are supported only within a class"
msgstr ""
-#: glib/gregex.c:581
+#: glib/gregex.c:603
msgid "POSIX collating elements are not supported"
msgstr ""
-#: glib/gregex.c:587
+#: glib/gregex.c:609
msgid "missing terminating )"
msgstr ""
-#: glib/gregex.c:591
+#: glib/gregex.c:613
msgid "reference to non-existent subpattern"
msgstr ""
-#: glib/gregex.c:595
+#: glib/gregex.c:617
msgid "missing ) after comment"
msgstr ""
-#: glib/gregex.c:599
+#: glib/gregex.c:621
msgid "regular expression is too large"
msgstr ""
-#: glib/gregex.c:603
+#: glib/gregex.c:625
msgid "malformed number or name after (?("
msgstr ""
-#: glib/gregex.c:607
+#: glib/gregex.c:629
msgid "lookbehind assertion is not fixed length"
msgstr ""
-#: glib/gregex.c:611
+#: glib/gregex.c:633
msgid "conditional group contains more than two branches"
msgstr ""
-#: glib/gregex.c:615
+#: glib/gregex.c:637
msgid "assertion expected after (?("
msgstr ""
-#: glib/gregex.c:619
+#: glib/gregex.c:641
msgid "a numbered reference must not be zero"
msgstr ""
-#: glib/gregex.c:623
+#: glib/gregex.c:645
msgid "unknown POSIX class name"
msgstr ""
-#: glib/gregex.c:628
+#: glib/gregex.c:650
msgid "character value in \\x{...} sequence is too large"
msgstr ""
-#: glib/gregex.c:632
+#: glib/gregex.c:654
msgid "\\C not allowed in lookbehind assertion"
msgstr ""
-#: glib/gregex.c:636
+#: glib/gregex.c:658
msgid "missing terminator in subpattern name"
msgstr ""
-#: glib/gregex.c:640
+#: glib/gregex.c:662
msgid "two named subpatterns have the same name"
msgstr ""
-#: glib/gregex.c:644
+#: glib/gregex.c:666
msgid "malformed \\P or \\p sequence"
msgstr ""
-#: glib/gregex.c:648
+#: glib/gregex.c:670
msgid "unknown property name after \\P or \\p"
msgstr ""
-#: glib/gregex.c:652
+#: glib/gregex.c:674
msgid "subpattern name is too long (maximum 32 characters)"
msgstr ""
-#: glib/gregex.c:656
+#: glib/gregex.c:678
msgid "too many named subpatterns (maximum 10,000)"
msgstr ""
-#: glib/gregex.c:660
+#: glib/gregex.c:682
msgid "octal value is greater than \\377"
-msgstr ""
+msgstr "Аабаны иҟоу аҵакы еиҳауп \\377"
-#: glib/gregex.c:664
+#: glib/gregex.c:686
msgid "DEFINE group contains more than one branch"
msgstr ""
-#: glib/gregex.c:668
+#: glib/gregex.c:690
msgid "inconsistent NEWLINE options"
msgstr ""
-#: glib/gregex.c:672
+#: glib/gregex.c:694
msgid ""
"\\g is not followed by a braced, angle-bracketed, or quoted name or number, "
"or by a plain number"
msgstr ""
-#: glib/gregex.c:677
+#: glib/gregex.c:699
msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)"
msgstr ""
-#: glib/gregex.c:681
+#: glib/gregex.c:703
msgid "(*VERB) not recognized"
msgstr ""
-#: glib/gregex.c:685
+#: glib/gregex.c:707
msgid "number is too big"
msgstr ""
-#: glib/gregex.c:689
+#: glib/gregex.c:711
msgid "missing subpattern name after (?&"
msgstr ""
-#: glib/gregex.c:693
+#: glib/gregex.c:715
msgid "different names for subpatterns of the same number are not allowed"
msgstr ""
-#: glib/gregex.c:697
+#: glib/gregex.c:719
msgid "(*MARK) must have an argument"
msgstr ""
-#: glib/gregex.c:701
+#: glib/gregex.c:723
msgid "\\c must be followed by an ASCII character"
msgstr ""
-#: glib/gregex.c:705
+#: glib/gregex.c:727
msgid "\\k is not followed by a braced, angle-bracketed, or quoted name"
msgstr ""
-#: glib/gregex.c:709
+#: glib/gregex.c:731
msgid "\\N is not supported in a class"
msgstr ""
-#: glib/gregex.c:713
+#: glib/gregex.c:735
msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)"
msgstr ""
-#: glib/gregex.c:717 glib/gregex.c:856
+#: glib/gregex.c:739 glib/gregex.c:875
msgid "code overflow"
msgstr ""
-#: glib/gregex.c:721
+#: glib/gregex.c:743
msgid "unrecognized character after (?P"
msgstr ""
-#: glib/gregex.c:725
+#: glib/gregex.c:747
msgid "overran compiling workspace"
msgstr ""
-#: glib/gregex.c:729
+#: glib/gregex.c:751
msgid "previously-checked referenced subpattern not found"
msgstr ""
-#: glib/gregex.c:855 glib/gregex.c:1100 glib/gregex.c:2406
+#: glib/gregex.c:874 glib/gregex.c:1121 glib/gregex.c:2444
#, c-format
msgid "Error while matching regular expression %s: %s"
msgstr ""
-#: glib/gregex.c:1696
+#: glib/gregex.c:1721
msgid "PCRE library is compiled without UTF8 support"
msgstr "Абиблиотека PCRE еизгоуп UTF-8 амаҵурада"
-#: glib/gregex.c:1704
+#: glib/gregex.c:1729
msgid "PCRE library is compiled with incompatible options"
msgstr "Абиблиотека PCRE еизгоуп еимарам ахышәарақәа рыла"
-#: glib/gregex.c:1813
+#: glib/gregex.c:1847
#, c-format
msgid "Error while compiling regular expression ‘%s’ at char %s: %s"
msgstr ""
-#: glib/gregex.c:2848
+#: glib/gregex.c:2887
msgid "hexadecimal digit or “}” expected"
msgstr "Иазыԥшуп жәаф хыԥхьаӡара змоу аԥхьаӡац, мамзар “}”"
-#: glib/gregex.c:2864
+#: glib/gregex.c:2903
msgid "hexadecimal digit expected"
msgstr "Иазыԥшуп жәаф хыԥхьаӡара змоу аԥхьаӡац"
-#: glib/gregex.c:2904
+#: glib/gregex.c:2943
msgid "missing “<” in symbolic reference"
msgstr "Иазхаӡом “<” асимволтә зхьарԥш аҟны"
-#: glib/gregex.c:2913
+#: glib/gregex.c:2952
msgid "unfinished symbolic reference"
msgstr "Ихырқәшам асимолтә зхьарԥш"
-#: glib/gregex.c:2920
+#: glib/gregex.c:2959
msgid "zero-length symbolic reference"
msgstr "Асимвотә зхьарԥш зоура ноль ыҟоу"
-#: glib/gregex.c:2931
+#: glib/gregex.c:2970
msgid "digit expected"
msgstr "Аԥхьаӡац азҧшра"
-#: glib/gregex.c:2949
+#: glib/gregex.c:2988
msgid "illegal symbolic reference"
msgstr "Иақәнагам асимволтә зхьарԥш"
-#: glib/gregex.c:3012
+#: glib/gregex.c:3051
msgid "stray final “\\”"
msgstr ""
-#: glib/gregex.c:3016
+#: glib/gregex.c:3055
msgid "unknown escape sequence"
msgstr "Еилкаам икодрку аишьҭагылазаара"
-#: glib/gregex.c:3026
+#: glib/gregex.c:3065
#, c-format
msgid "Error while parsing replacement text “%s” at char %lu: %s"
msgstr "Аҧсахратә текст аилыргара агха “%s” асимвол %lu аҟны : %s"
@@ -6173,249 +6174,6 @@ msgstr ""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#, fuzzy
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#, fuzzy
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#, fuzzy
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-