summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2018-10-10 16:06:58 +0200
committerSebastien Bacher <seb128@ubuntu.com>2018-10-10 16:06:58 +0200
commit7664e280a84eca31a8f21a4c15ea14eb179cebf9 (patch)
tree7f8cca0f9e7463115d53b1e97a1b53ab4948b848
parentNew upstream version 3.28.1 (diff)
parentBump to 3.30.0 (diff)
downloadzenity-7664e280a84eca31a8f21a4c15ea14eb179cebf9.tar.gz
zenity-7664e280a84eca31a8f21a4c15ea14eb179cebf9.tar.bz2
zenity-7664e280a84eca31a8f21a4c15ea14eb179cebf9.zip
New upstream version 3.30.0
-rw-r--r--ChangeLog357
-rw-r--r--Makefile.in5
-rw-r--r--NEWS3
-rw-r--r--aclocal.m482
-rwxr-xr-xcompile11
-rwxr-xr-xconfig.guess560
-rwxr-xr-xconfig.sub249
-rwxr-xr-xconfigure42
-rw-r--r--configure.ac2
-rw-r--r--data/Makefile.in1
-rwxr-xr-xdepcomp2
-rw-r--r--help/Makefile.in1
-rw-r--r--help/de/de.po336
-rw-r--r--help/de/figures/zenity-calendar-screenshot.pngbin18440 -> 21379 bytes
-rw-r--r--help/de/figures/zenity-error-screenshot.pngbin9206 -> 10070 bytes
-rw-r--r--help/de/figures/zenity-fileselection-screenshot.pngbin63948 -> 78450 bytes
-rw-r--r--help/de/figures/zenity-information-screenshot.pngbin10830 -> 12244 bytes
-rw-r--r--help/de/figures/zenity-list-screenshot.pngbin20164 -> 25974 bytes
-rw-r--r--help/de/figures/zenity-notification-screenshot.pngbin7727 -> 26497 bytes
-rw-r--r--help/de/figures/zenity-progress-screenshot.pngbin10860 -> 8741 bytes
-rw-r--r--help/de/figures/zenity-question-screenshot.pngbin11346 -> 9380 bytes
-rw-r--r--help/de/figures/zenity-text-screenshot.pngbin23778 -> 30076 bytes
-rw-r--r--help/de/figures/zenity-warning-screenshot.pngbin10028 -> 11526 bytes
-rw-r--r--help/de/file-selection.page2
-rw-r--r--help/de/usage.page2
-rwxr-xr-xinstall-sh25
-rwxr-xr-xmissing8
-rw-r--r--po/Makevars6
-rw-r--r--po/af.gmobin2255 -> 2296 bytes
-rw-r--r--po/am.gmobin2385 -> 2426 bytes
-rw-r--r--po/ar.gmobin15212 -> 15253 bytes
-rw-r--r--po/as.gmobin24419 -> 24460 bytes
-rw-r--r--po/ast.gmobin12250 -> 12291 bytes
-rw-r--r--po/az.gmobin6110 -> 6151 bytes
-rw-r--r--po/be.gmobin22049 -> 22204 bytes
-rw-r--r--po/be.po623
-rw-r--r--po/be@latin.gmobin11287 -> 11328 bytes
-rw-r--r--po/bg.gmobin20118 -> 20159 bytes
-rw-r--r--po/bn.gmobin18976 -> 19017 bytes
-rw-r--r--po/bn_IN.gmobin23017 -> 23058 bytes
-rw-r--r--po/bs.gmobin16252 -> 16293 bytes
-rw-r--r--po/ca.gmobin17493 -> 17534 bytes
-rw-r--r--po/ca@valencia.gmobin17463 -> 17504 bytes
-rw-r--r--po/cs.gmobin17344 -> 17385 bytes
-rw-r--r--po/cy.gmobin8798 -> 8839 bytes
-rw-r--r--po/da.gmobin16319 -> 16360 bytes
-rw-r--r--po/de.gmobin17511 -> 17552 bytes
-rw-r--r--po/dz.gmobin20147 -> 20188 bytes
-rw-r--r--po/el.gmobin23937 -> 23978 bytes
-rw-r--r--po/en@shaw.gmobin18472 -> 18513 bytes
-rw-r--r--po/en_CA.gmobin10338 -> 10379 bytes
-rw-r--r--po/en_GB.gmobin15875 -> 15916 bytes
-rw-r--r--po/eo.gmobin12086 -> 12127 bytes
-rw-r--r--po/es.gmobin17873 -> 17914 bytes
-rw-r--r--po/et.gmobin14952 -> 14993 bytes
-rw-r--r--po/eu.gmobin17257 -> 17298 bytes
-rw-r--r--po/fa.gmobin17874 -> 17915 bytes
-rw-r--r--po/fi.gmobin13255 -> 13447 bytes
-rw-r--r--po/fi.po623
-rw-r--r--po/fr.gmobin18546 -> 18587 bytes
-rw-r--r--po/fur.gmobin17168 -> 17209 bytes
-rw-r--r--po/ga.gmobin7191 -> 7232 bytes
-rw-r--r--po/gl.gmobin17613 -> 17654 bytes
-rw-r--r--po/gu.gmobin18421 -> 18462 bytes
-rw-r--r--po/he.gmobin14800 -> 14841 bytes
-rw-r--r--po/hi.gmobin21061 -> 21102 bytes
-rw-r--r--po/hr.gmobin16584 -> 16625 bytes
-rw-r--r--po/hu.gmobin18350 -> 18391 bytes
-rw-r--r--po/id.gmobin16510 -> 16551 bytes
-rw-r--r--po/is.gmobin3357 -> 3398 bytes
-rw-r--r--po/it.gmobin17540 -> 17581 bytes
-rw-r--r--po/ja.gmobin18010 -> 18051 bytes
-rw-r--r--po/ka.gmobin13676 -> 13717 bytes
-rw-r--r--po/kk.gmobin8094 -> 8135 bytes
-rw-r--r--po/kn.gmobin16891 -> 16932 bytes
-rw-r--r--po/ko.gmobin17867 -> 17908 bytes
-rw-r--r--po/ku.gmobin1188 -> 1229 bytes
-rw-r--r--po/lt.gmobin17433 -> 17474 bytes
-rw-r--r--po/lv.gmobin17294 -> 17335 bytes
-rw-r--r--po/mai.gmobin15659 -> 15700 bytes
-rw-r--r--po/mg.gmobin11245 -> 11286 bytes
-rw-r--r--po/mi.gmobin382 -> 423 bytes
-rw-r--r--po/mk.gmobin14165 -> 14206 bytes
-rw-r--r--po/ml.gmobin27114 -> 27155 bytes
-rw-r--r--po/mn.gmobin7114 -> 7155 bytes
-rw-r--r--po/mr.gmobin16494 -> 16535 bytes
-rw-r--r--po/ms.gmobin5641 -> 5682 bytes
-rw-r--r--po/nb.gmobin15970 -> 16011 bytes
-rw-r--r--po/ne.gmobin17640 -> 17681 bytes
-rw-r--r--po/nl.gmobin17195 -> 17236 bytes
-rw-r--r--po/nn.gmobin12494 -> 12535 bytes
-rw-r--r--po/oc.gmobin18064 -> 18105 bytes
-rw-r--r--po/or.gmobin19592 -> 19633 bytes
-rw-r--r--po/pa.gmobin19537 -> 19578 bytes
-rw-r--r--po/pl.gmobin17695 -> 17736 bytes
-rw-r--r--po/ps.gmobin5654 -> 5695 bytes
-rw-r--r--po/pt.gmobin17086 -> 17127 bytes
-rw-r--r--po/pt_BR.gmobin17390 -> 17431 bytes
-rw-r--r--po/ro.gmobin18152 -> 18193 bytes
-rw-r--r--po/ru.gmobin22613 -> 22654 bytes
-rw-r--r--po/rw.gmobin776 -> 817 bytes
-rw-r--r--po/si.gmobin17259 -> 17300 bytes
-rw-r--r--po/sk.gmobin17429 -> 17470 bytes
-rw-r--r--po/sl.gmobin16841 -> 16882 bytes
-rw-r--r--po/sq.gmobin11840 -> 11881 bytes
-rw-r--r--po/sr.gmobin21956 -> 21997 bytes
-rw-r--r--po/sr@latin.gmobin17076 -> 17117 bytes
-rw-r--r--po/sv.gmobin16330 -> 16371 bytes
-rw-r--r--po/ta.gmobin23690 -> 23731 bytes
-rw-r--r--po/te.gmobin22290 -> 22331 bytes
-rw-r--r--po/tg.gmobin2725 -> 2766 bytes
-rw-r--r--po/th.gmobin25872 -> 25913 bytes
-rw-r--r--po/tr.gmobin17106 -> 17147 bytes
-rw-r--r--po/ug.gmobin19209 -> 19250 bytes
-rw-r--r--po/uk.gmobin18461 -> 18502 bytes
-rw-r--r--po/vi.gmobin16838 -> 16879 bytes
-rw-r--r--po/xh.gmobin8185 -> 8226 bytes
-rw-r--r--po/zenity.pot9
-rw-r--r--po/zh_CN.gmobin15129 -> 15331 bytes
-rw-r--r--po/zh_CN.po627
-rw-r--r--po/zh_HK.gmobin15221 -> 15262 bytes
-rw-r--r--po/zh_TW.gmobin16111 -> 16152 bytes
-rw-r--r--src/Makefile.in1
123 files changed, 1884 insertions, 1693 deletions
diff --git a/ChangeLog b/ChangeLog
index a4bfd676..59d05bc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,151 @@
# Generated by Makefile. Do not edit.
-commit 7fee2da8076affd41113f7e7d6e8e61f9ff036ab (HEAD -> master, tag: 3.28.1)
+commit 974245abbee86edda040e0ce068a11ce04590a82
+Author: Arx Cruz <arxcruz@redhat.com>
+Date: Fri Oct 5 10:56:52 2018 +0200
+
+ Bump to 3.30.0
+
+ NEWS | 3 +++
+ configure.ac | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+commit 16dfff94cc9d6d6780c2ce121eba4418891e1282
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date: Tue Sep 18 11:05:32 2018 +0000
+
+ Update German translation
+
+ help/de/de.po | 336 ++++++++++++++++++++++++----------------------------------
+ 1 file changed, 137 insertions(+), 199 deletions(-)
+
+commit 13d9f716c0e1a961cc8cee59ffc45bd081cddab0
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date: Tue Sep 18 11:03:55 2018 +0000
+
+ Replace German zenity-warning-screenshot.png
+
+ help/de/figures/zenity-warning-screenshot.png | Bin 10028 -> 11526 bytes
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+
+commit 0f4956700e8a48f1e633da6f1e4d970529002049
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date: Tue Sep 18 11:03:23 2018 +0000
+
+ Replace German zenity-text-screenshot.png
+
+ help/de/figures/zenity-text-screenshot.png | Bin 23778 -> 30076 bytes
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+
+commit 3ff11b67cb06c26bd76d643c4325bce9e8b3132c
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date: Tue Sep 18 11:02:46 2018 +0000
+
+ Replace German zenity-question-screenshot.png
+
+ help/de/figures/zenity-question-screenshot.png | Bin 11346 -> 9380 bytes
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+
+commit 1bc35ab51b554eb04a9bb3d4f47ec6c0f2312568
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date: Tue Sep 18 11:02:03 2018 +0000
+
+ Replace German zenity-progress-screenshot.png
+
+ help/de/figures/zenity-progress-screenshot.png | Bin 10860 -> 8741 bytes
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+
+commit 9afc38728d5d9ccd3c08dfc0eadd2926e1258215
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date: Tue Sep 18 11:01:20 2018 +0000
+
+ Replace German zenity-notification-screenshot.png
+
+ help/de/figures/zenity-notification-screenshot.png | Bin 7727 -> 26497 bytes
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+
+commit 8b7bce370eb6b556082d48d3b1a22dd5cbe36c98
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date: Tue Sep 18 11:00:46 2018 +0000
+
+ Replace German zenity-list-screenshot.png
+
+ help/de/figures/zenity-list-screenshot.png | Bin 20164 -> 25974 bytes
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+
+commit 204584958be13a570386d5b36ec6a6c50af2052f
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date: Tue Sep 18 11:00:00 2018 +0000
+
+ Replace German zenity-information-screenshot.png
+
+ help/de/figures/zenity-information-screenshot.png | Bin 10830 -> 12244 bytes
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+
+commit 741808296642b1327378c7cad0033b98ee62bdba
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date: Tue Sep 18 10:59:24 2018 +0000
+
+ Replace German zenity-fileselection-screenshot.png
+
+ help/de/figures/zenity-fileselection-screenshot.png | Bin 63948 -> 78450 bytes
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+
+commit fb222d0fc2bcdc067fc8901632a271c07f319014
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date: Tue Sep 18 10:58:50 2018 +0000
+
+ Replace German zenity-error-screenshot.png
+
+ help/de/figures/zenity-error-screenshot.png | Bin 9206 -> 10070 bytes
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+
+commit 28d7a846d244da5d68661de6dee947d52b77f3c2
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date: Tue Sep 18 10:57:59 2018 +0000
+
+ Replace German zenity-calendar-screenshot.png
+
+ help/de/figures/zenity-calendar-screenshot.png | Bin 18440 -> 21379 bytes
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+
+commit fe51ae9819d5317f0a20b19aed248ec122a9f5e4
+Author: Yuras Shumovich <shumovichy@gmail.com>
+Date: Fri Sep 7 11:05:47 2018 +0000
+
+ Update Belarusian translation
+
+ po/be.po | 623 ++++++++++++++++++++++++++++++++-------------------------------
+ 1 file changed, 318 insertions(+), 305 deletions(-)
+
+commit ebe50b1080fe7f0e714f3b89ec700b933d1a6c9e
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date: Thu Aug 16 20:30:40 2018 +0200
+
+ Update MSGID_BUGS_ADDRESS in po/Makevars
+
+ po/Makevars | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit 8694e3a9ef00dc2df13a9ac820aa9fbb2dbb0d78
+Author: Mingcong Bai <jeffbai@aosc.xyz>
+Date: Mon May 21 14:29:52 2018 +0000
+
+ Update Chinese (China) translation
+
+ po/zh_CN.po | 627 +++++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 321 insertions(+), 306 deletions(-)
+
+commit 4dee210e26418e2a022a0b42105192e58e1d84f5
+Author: Jiri Grönroos <jiri.gronroos@iki.fi>
+Date: Tue Apr 10 13:44:05 2018 +0000
+
+ Update Finnish translation
+
+ po/fi.po | 623 ++++++++++++++++++++++++++++++++-------------------------------
+ 1 file changed, 318 insertions(+), 305 deletions(-)
+
+commit 7fee2da8076affd41113f7e7d6e8e61f9ff036ab
Author: Jeremy Bicha <jbicha@ubuntu.com>
Date: Mon Apr 9 20:03:34 2018 -0400
@@ -10,7 +155,7 @@ Date: Mon Apr 9 20:03:34 2018 -0400
configure.ac | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
-commit 10660b7e2997bb66393ca4003554345a9824cdfd (origin/master, origin/HEAD)
+commit 10660b7e2997bb66393ca4003554345a9824cdfd
Author: Daniel Șerbănescu <daniel@serbanescu.dk>
Date: Sun Apr 8 19:57:03 2018 +0000
@@ -50,7 +195,7 @@ Date: Fri Mar 16 20:26:55 2018 +0000
po/hr.po | 857 ++++++++++++++++++++++++++++++++++++---------------------------
1 file changed, 492 insertions(+), 365 deletions(-)
-commit ad7411614bdf0c6b32b71fd13a4ec1f7d5d0ecb5 (tag: 3.28.0)
+commit ad7411614bdf0c6b32b71fd13a4ec1f7d5d0ecb5
Author: Jeremy Bicha <jbicha@ubuntu.com>
Date: Mon Mar 12 08:11:08 2018 -0400
@@ -159,7 +304,7 @@ Date: Sat Feb 3 23:55:40 2018 -0500
po/es.po | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
-commit 439527f3c4aa64243eb0cc3ff79d6da62182e4ea (tag: 3.27.90)
+commit 439527f3c4aa64243eb0cc3ff79d6da62182e4ea
Author: Jeremy Bicha <jbicha@ubuntu.com>
Date: Sat Feb 3 23:37:10 2018 -0500
@@ -408,7 +553,7 @@ Date: Sun Nov 26 05:06:54 2017 +0100
help/Makefile.am | 29 +++++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
-commit 3dbfe2667888b0403303d5958d2b6a4ba0643c8b (tag: ZENITY_3_26_0, origin/gnome-3-26)
+commit 3dbfe2667888b0403303d5958d2b6a4ba0643c8b
Author: Carlos Soriano <csoriano@gnome.org>
Date: Mon Nov 13 19:57:25 2017 +0100
@@ -544,7 +689,7 @@ Date: Mon May 22 09:30:49 2017 -0400
src/fileselection.c | 69 ++++++++++++++++++++++++++++++++++++-----------------
1 file changed, 47 insertions(+), 22 deletions(-)
-commit 3496685dd5bd49c0cce99bdc0753a468bf8e464c (tag: ZENITY_3_24_2, origin/gnome-3-24)
+commit 3496685dd5bd49c0cce99bdc0753a468bf8e464c
Author: Arx Cruz <arxcruz@redhat.com>
Date: Fri May 26 14:16:31 2017 +0200
@@ -554,7 +699,7 @@ Date: Fri May 26 14:16:31 2017 +0200
configure.ac | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
-commit 2795f0d13861f5c8b320a8b49c575ef4c8388c10 (tag: ZENITY_3_24_1)
+commit 2795f0d13861f5c8b320a8b49c575ef4c8388c10
Author: Arx Cruz <arxcruz@redhat.com>
Date: Fri May 26 14:12:13 2017 +0200
@@ -682,7 +827,7 @@ Date: Fri Mar 17 14:10:10 2017 -0400
src/msg.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-commit 0b990c541c202412cb3a4120199af154094dfeac (tag: 3.24.0)
+commit 0b990c541c202412cb3a4120199af154094dfeac
Author: Carlos Soriano <csoriano@gnome.org>
Date: Tue Mar 21 14:51:09 2017 +0100
@@ -781,7 +926,7 @@ Date: Sat Sep 24 10:48:37 2016 +0000
po/hr.po | 585 ++++++++++++++++++++++++++++++++++++++++-----------------------
1 file changed, 374 insertions(+), 211 deletions(-)
-commit 20aa1193d98f92a319e8f840c28161ce2d791d6f (tag: ZENITY_3_22_0, tag: 3.22.0, origin/gnome-3-22)
+commit 20aa1193d98f92a319e8f840c28161ce2d791d6f
Author: Carlos Soriano <csoriano@gnome.org>
Date: Mon Sep 19 23:39:52 2016 +0200
@@ -951,7 +1096,7 @@ Date: Sun May 15 18:03:38 2016 +0000
help/sv/sv.po | 1491 ++++++++++++++++++---------------------------------------
1 file changed, 470 insertions(+), 1021 deletions(-)
-commit 668bbf0e1fd4ff35da38ea93303596ee725513bb (tag: ZENITY_3_20_0, origin/gnome-3-20)
+commit 668bbf0e1fd4ff35da38ea93303596ee725513bb
Author: Arx Cruz <acruz@redhat.com>
Date: Wed Mar 23 18:56:58 2016 +0100
@@ -1123,7 +1268,7 @@ Date: Wed Oct 21 06:06:40 2015 +0000
po/hu.po | 637 ++++++++++++++++++++++++++++++---------------------------------
1 file changed, 307 insertions(+), 330 deletions(-)
-commit 3f28c7f9074ac5da5b1b9516c1dbde350cd548e5 (tag: ZENITY_3_18_1_1)
+commit 3f28c7f9074ac5da5b1b9516c1dbde350cd548e5
Author: Arx Cruz <arxcruz@gnome.org>
Date: Sat Oct 17 21:15:29 2015 +0200
@@ -1142,7 +1287,7 @@ Date: Sat Oct 17 17:52:44 2015 +0100
src/option.c | 2 ++
1 file changed, 2 insertions(+)
-commit 4ddf52f6382fa89f1052769b3c3f2914e581f9b6 (tag: ZENITY_3_18_1)
+commit 4ddf52f6382fa89f1052769b3c3f2914e581f9b6
Author: Arx Cruz <arxcruz@gnome.org>
Date: Sat Oct 17 18:13:18 2015 +0200
@@ -1382,7 +1527,7 @@ Date: Wed Sep 23 08:33:55 2015 +0000
po/sr.po | 572 +++++++++++++++++++++++++++++++--------------------------------
1 file changed, 285 insertions(+), 287 deletions(-)
-commit c2ac30a213053484d80fe7f7997a69129828d1d7 (tag: ZENITY_3_18_0)
+commit c2ac30a213053484d80fe7f7997a69129828d1d7
Author: Arx Cruz <arxcruz@gnome.org>
Date: Mon Sep 21 14:45:06 2015 +0200
@@ -1681,7 +1826,7 @@ Date: Tue Jun 23 18:19:27 2015 +0200
po/pl.po | 261 +++++++++++++++++++++++++++++++--------------------------------
1 file changed, 130 insertions(+), 131 deletions(-)
-commit 517b89e977ec167042e90541a6f1912063515105 (tag: ZENITY_3_16_3)
+commit 517b89e977ec167042e90541a6f1912063515105
Author: Arx Cruz <arxcruz@gnome.org>
Date: Tue Jun 23 11:42:17 2015 +0200
@@ -1899,7 +2044,7 @@ Date: Thu May 14 16:58:41 2015 +0200
po/nb.po | 494 ++++++++++++++++++++++++++++-----------------------------------
1 file changed, 218 insertions(+), 276 deletions(-)
-commit 91894b5c7d0d384c31ca99c6de55a9084f9c4424 (tag: ZENITY_3_16_2)
+commit 91894b5c7d0d384c31ca99c6de55a9084f9c4424
Author: Arx Cruz <arxcruz@gnome.org>
Date: Thu May 14 16:57:50 2015 +0200
@@ -2075,7 +2220,7 @@ Date: Tue Apr 21 09:55:40 2015 +0200
src/msg.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
-commit cecc7c75edd213a102911db220335d977468df66 (tag: ZENITY_3_16_1)
+commit cecc7c75edd213a102911db220335d977468df66
Author: Arx Cruz <acruz@redhat.com>
Date: Tue Apr 21 09:43:56 2015 +0200
@@ -2085,7 +2230,7 @@ Date: Tue Apr 21 09:43:56 2015 +0200
configure.ac | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
-commit 6edd0bacd8ce25e0bae1a8f7139ebcac0da53c18 (tag: ZENITY_3_16_0)
+commit 6edd0bacd8ce25e0bae1a8f7139ebcac0da53c18
Author: Arx Cruz <acruz@redhat.com>
Date: Tue Apr 21 09:40:11 2015 +0200
@@ -2113,7 +2258,7 @@ Date: Mon Mar 23 09:39:29 2015 +0000
po/sk.po | 412 +++++++++++++++++++++++++++++----------------------------------
1 file changed, 192 insertions(+), 220 deletions(-)
-commit c45daa96bfdc5a958cc0f2cdaf4db71ac61b8fde (origin/jjardon/no_deprecated)
+commit c45daa96bfdc5a958cc0f2cdaf4db71ac61b8fde
Author: Javier Jardón <jjardon@gnome.org>
Date: Sun Mar 22 09:24:26 2015 +0000
@@ -2725,7 +2870,7 @@ Date: Sun Oct 5 11:12:42 2014 +0000
po/it.po | 386 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 197 insertions(+), 189 deletions(-)
-commit 34e5695efa9366e7fd9c782fb022d46838bc8458 (tag: ZENITY_3_14_0)
+commit 34e5695efa9366e7fd9c782fb022d46838bc8458
Author: Arx Cruz <arxcruz@gnome.org>
Date: Mon Sep 22 19:36:48 2014 +0200
@@ -2782,7 +2927,7 @@ Date: Mon Sep 15 10:20:25 2014 +0200
configure.ac | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit 98b9a95a8cf0f998191d9cb55a2115992a60ea7f (tag: ZENITY_3_13_92)
+commit 98b9a95a8cf0f998191d9cb55a2115992a60ea7f
Author: Matej Urbančič <mateju@svn.gnome.org>
Date: Sun Sep 14 21:23:09 2014 +0200
@@ -2876,7 +3021,7 @@ Date: Fri Aug 29 14:31:57 2014 +0200
src/notification.c | 4 ++++
1 file changed, 4 insertions(+)
-commit fb29bfd40541fcf7c41c509ecdaa5a30cee4e425 (tag: ZENITY_3_13_90)
+commit fb29bfd40541fcf7c41c509ecdaa5a30cee4e425
Author: Arx Cruz <arxcruz@gnome.org>
Date: Fri Aug 29 12:09:29 2014 +0200
@@ -3212,7 +3357,7 @@ Date: Sat Apr 26 11:26:01 2014 -0300
NEWS | 13 +++++++++++++
1 file changed, 13 insertions(+)
-commit 81a80226d17f2ab2794cbe86fa289cfed03d48c8 (tag: ZENITY_3_12_1)
+commit 81a80226d17f2ab2794cbe86fa289cfed03d48c8
Author: Arx Cruz <arxcruz@gnome.org>
Date: Sat Apr 26 11:17:46 2014 -0300
@@ -3221,7 +3366,7 @@ Date: Sat Apr 26 11:17:46 2014 -0300
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-commit 82069a6b596e32553f6ad7da7502bc8e6f1d4de6 (tag: ZENITY_3_12_0)
+commit 82069a6b596e32553f6ad7da7502bc8e6f1d4de6
Author: Arx Cruz <arxcruz@gnome.org>
Date: Fri Apr 18 16:51:24 2014 -0300
@@ -3641,7 +3786,7 @@ Date: Sat Nov 23 16:44:26 2013 -0200
src/zenity.h | 1 +
3 files changed, 14 insertions(+), 1 deletion(-)
-commit 63d6a2032d2150d15f2bd148df85d9b569cfc96c (tag: ZENITY_3_10_2)
+commit 63d6a2032d2150d15f2bd148df85d9b569cfc96c
Author: Carles Ferrando <carles.ferrando@gmail.com>
Date: Sun Oct 13 23:58:50 2013 +0200
@@ -3869,7 +4014,7 @@ Date: Wed Sep 25 09:34:25 2013 -0300
src/zenity.h | 4 +++-
3 files changed, 108 insertions(+), 1 deletion(-)
-commit 7f6baa1477b7b0d239577ec07b9976e454186a6f (tag: ZENITY_3_10_0)
+commit 7f6baa1477b7b0d239577ec07b9976e454186a6f
Author: Arx Cruz <arxcruz@gnome.org>
Date: Wed Sep 25 09:09:54 2013 -0300
@@ -4192,7 +4337,7 @@ Date: Fri Aug 23 09:15:07 2013 +0800
src/zenity.h | 1 +
15 files changed, 37 insertions(+), 26 deletions(-)
-commit e6021b4a225768643a048b6b10ea9ff6bce6de3e (tag: ZENITY_3_9_91)
+commit e6021b4a225768643a048b6b10ea9ff6bce6de3e
Author: Arx Cruz <arxcruz@gnome.org>
Date: Sat Aug 31 00:08:26 2013 -0300
@@ -4309,7 +4454,7 @@ Date: Fri Mar 29 22:49:15 2013 +0500
po/tg.po | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
-commit 185dbca4c84ec8cee256d8df52d7aff8f63eceea (tag: 3.8.0)
+commit 185dbca4c84ec8cee256d8df52d7aff8f63eceea
Author: Matthias Clasen <mclasen@redhat.com>
Date: Tue Mar 26 06:36:20 2013 -0400
@@ -4654,7 +4799,7 @@ Date: Thu Feb 14 01:08:56 2013 +0100
src/zenity.h | 1 +
3 files changed, 148 insertions(+)
-commit bcdb382b6af8f9f47db43c3087dc6a45e5b00913 (origin/gnome-3-6)
+commit bcdb382b6af8f9f47db43c3087dc6a45e5b00913
Author: Piotr Drąg <piotrdrag@gmail.com>
Date: Sun Feb 17 21:23:07 2013 +0100
@@ -4923,7 +5068,7 @@ Date: Mon Nov 12 21:57:07 2012 +0100
src/notification.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-commit a06afb77885a69040c22a1933254c9f6065805dd (tag: 3.7.2)
+commit a06afb77885a69040c22a1933254c9f6065805dd
Author: Matthias Clasen <mclasen@redhat.com>
Date: Wed Nov 21 13:59:24 2012 -0500
@@ -5308,7 +5453,7 @@ Date: Wed Sep 26 01:21:38 2012 +0200
po/ca.po | 309 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 159 insertions(+), 150 deletions(-)
-commit d98ae38f7791e61c636e7db550576e4d4957838a (tag: 3.6.0)
+commit d98ae38f7791e61c636e7db550576e4d4957838a
Author: Matthias Clasen <mclasen@redhat.com>
Date: Tue Sep 25 18:55:12 2012 -0400
@@ -6175,7 +6320,7 @@ Date: Sat Mar 24 22:29:29 2012 -0400
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-commit 5a6f91b2eb6c93808de708789637f8d49b9ed54d (tag: 3.4.0)
+commit 5a6f91b2eb6c93808de708789637f8d49b9ed54d
Author: Matthias Clasen <mclasen@redhat.com>
Date: Sat Mar 24 22:28:09 2012 -0400
@@ -6948,7 +7093,7 @@ Date: Wed Sep 28 20:18:15 2011 +0200
po/sr@latin.po | 539 ++++++++++++++++++++++++++++++---------------------------
2 files changed, 564 insertions(+), 514 deletions(-)
-commit ee8584e28627fbcc885286cac46f7bef7424b8ba (tag: ZENITY_3_2_0)
+commit ee8584e28627fbcc885286cac46f7bef7424b8ba
Author: Arx Cruz <arxcruz@gnome.org>
Date: Mon Sep 26 19:45:59 2011 -0300
@@ -7284,7 +7429,7 @@ Date: Thu Aug 18 14:43:02 2011 +0700
po/id.po | 414 ++++++++++++++++++++++++++++++++++-----------------------------
1 file changed, 221 insertions(+), 193 deletions(-)
-commit d646953bddf067d409ed0b93733d1d9714846e9b (tag: ZENITY_3_1_5_final)
+commit d646953bddf067d409ed0b93733d1d9714846e9b
Author: Luis Medinas <lmedinas@gnome.org>
Date: Wed Aug 17 15:19:41 2011 +0100
@@ -7293,7 +7438,7 @@ Date: Wed Aug 17 15:19:41 2011 +0100
NEWS | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 71 insertions(+)
-commit 98083da9295046b97ffebd18ca895fa39add3c7d (tag: ZENITY_3_1_5)
+commit 98083da9295046b97ffebd18ca895fa39add3c7d
Author: Luis Medinas <lmedinas@gnome.org>
Date: Wed Aug 17 15:08:00 2011 +0100
@@ -8125,7 +8270,7 @@ Date: Wed Feb 23 09:50:13 2011 +0100
po/nb.po | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
-commit 8e9e548c2597d5c936486285175653085a1446a1 (tag: ZENITY_2_91_90)
+commit 8e9e548c2597d5c936486285175653085a1446a1
Author: Luis Medinas <lmedinas@gnome.org>
Date: Mon Feb 21 23:13:36 2011 +0000
@@ -8407,7 +8552,7 @@ Date: Wed Jan 12 23:23:21 2011 +0200
po/bg.po | 264 ++++++++++++++++++++++++++++++++-------------------------------
1 file changed, 134 insertions(+), 130 deletions(-)
-commit 6ba81e485c74a2df5300237eddc8ea244b638389 (tag: ZENITY_2_91_5)
+commit 6ba81e485c74a2df5300237eddc8ea244b638389
Author: Luis Medinas <lmedinas@gnome.org>
Date: Mon Jan 10 23:12:52 2011 +0000
@@ -8519,7 +8664,7 @@ Date: Thu Dec 23 14:02:44 2010 +0100
configure.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-commit 9c2aa5a860ad3fec8570758cdb0973528a0b672d (tag: ZENITY_2_91_4)
+commit 9c2aa5a860ad3fec8570758cdb0973528a0b672d
Author: Vincent Untz <vuntz@gnome.org>
Date: Thu Dec 23 14:02:37 2010 +0100
@@ -8653,7 +8798,7 @@ Date: Sat Oct 23 11:22:49 2010 +0200
po/ug.po | 732 +++++++++++++++++++++++++++++++++++++++++----------------------
1 file changed, 474 insertions(+), 258 deletions(-)
-commit 841c15d7d8a9e1584d8c4669d6b3caa467e9ff40 (tag: ZENITY_2_91_1_1)
+commit 841c15d7d8a9e1584d8c4669d6b3caa467e9ff40
Author: Luis Medinas <lmedinas@gnome.org>
Date: Thu Oct 21 00:43:46 2010 +0100
@@ -8834,7 +8979,7 @@ Date: Wed Sep 29 12:26:52 2010 +0100
src/password.c | 2 ++
1 file changed, 2 insertions(+)
-commit a4743fb2d0328c7c2d8f76a4e24fa5bce9347df5 (tag: ZENITY_2_32_0)
+commit a4743fb2d0328c7c2d8f76a4e24fa5bce9347df5
Author: Luis Medinas <lmedinas@gnome.org>
Date: Tue Sep 28 12:37:51 2010 +0100
@@ -8951,7 +9096,7 @@ Date: Tue Sep 14 17:40:17 2010 +0200
po/pl.po | 293 ++++++++++++++++++++++++++++++++++-----------------------------
1 file changed, 158 insertions(+), 135 deletions(-)
-commit ba525ac951880a64016b547a689eebbd360ae365 (tag: ZENITY_2_31_92)
+commit ba525ac951880a64016b547a689eebbd360ae365
Author: Luis Medinas <lmedinas@gnome.org>
Date: Mon Sep 13 23:00:25 2010 +0100
@@ -9088,7 +9233,7 @@ Date: Tue Aug 10 12:14:10 2010 +0530
po/bn_IN.po | 412 ++++++++++++++++++++++++++++++++++++------------------------
1 file changed, 247 insertions(+), 165 deletions(-)
-commit a9f6cb09045f630499d533fe27153fd5958659ea (tag: ZENITY_2_21_6)
+commit a9f6cb09045f630499d533fe27153fd5958659ea
Author: Luis Medinas <lmedinas@gnome.org>
Date: Thu Aug 5 10:46:40 2010 +0100
@@ -9397,7 +9542,7 @@ Date: Wed Jul 14 00:15:11 2010 +0800
po/zh_CN.po | 275 +++++++++++++++++++++++++++++++++---------------------------
1 file changed, 151 insertions(+), 124 deletions(-)
-commit 1b1fa4824033074c9fd93c39db95cc797d8693d2 (tag: ZENITY_2_31_5)
+commit 1b1fa4824033074c9fd93c39db95cc797d8693d2
Author: Luis Medinas <lmedinas@gnome.org>
Date: Tue Jul 13 12:04:07 2010 +0100
@@ -9485,7 +9630,7 @@ Date: Sun Jun 20 01:52:41 2010 +0200
po/gl.po | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
-commit cf31a7640e1eababef6cd28c411ec8e730f5d04b (tag: ZENITY_2_31_3)
+commit cf31a7640e1eababef6cd28c411ec8e730f5d04b
Author: Luis Medinas <lmedinas@gnome.org>
Date: Tue Jun 8 21:22:20 2010 +0100
@@ -11134,7 +11279,7 @@ Date: Mon Mar 16 22:19:18 2009 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit 499385db5d7eeebbb6b72d9b238e6c0afbea86f7 (tag: ZENITY_2_26_0)
+commit 499385db5d7eeebbb6b72d9b238e6c0afbea86f7
Author: Lucas Rocha <lucasr@gnome.org>
Date: Mon Mar 16 22:16:15 2009 +0000
@@ -11550,7 +11695,7 @@ Date: Mon Jan 12 23:47:18 2009 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit 4a3eb1c1730b6f4a097ad24d3b09831af920e901 (tag: ZENITY_2_24_1)
+commit 4a3eb1c1730b6f4a097ad24d3b09831af920e901
Author: Lucas Almeida Rocha <lucasr@src.gnome.org>
Date: Mon Jan 12 23:42:38 2009 +0000
@@ -11797,7 +11942,7 @@ Date: Tue Sep 23 09:28:16 2008 +0000
po/ChangeLog | 2 ++
4 files changed, 11 insertions(+), 1 deletion(-)
-commit 49bb0edef00b2351a31f39ae2c15117a1a4c9bf9 (tag: ZENITY_2_24_0)
+commit 49bb0edef00b2351a31f39ae2c15117a1a4c9bf9
Author: Vincent Untz <vuntz@gnome.org>
Date: Tue Sep 23 09:27:41 2008 +0000
@@ -12619,7 +12764,7 @@ Date: Tue Jun 17 13:53:36 2008 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit f6f85688ca350c5664b08ec08b327e48fa95b7b0 (tag: ZENITY_2_23_3_1)
+commit f6f85688ca350c5664b08ec08b327e48fa95b7b0
Author: Lucas Rocha <lucasr@gnome.org>
Date: Tue Jun 17 13:52:21 2008 +0000
@@ -12639,7 +12784,7 @@ Date: Tue Jun 17 13:52:21 2008 +0000
po/ChangeLog | 4 ++++
5 files changed, 22 insertions(+), 1 deletion(-)
-commit 25f7a2ab9e8bee9039104528877681ee3a0ef4b3 (tag: ZENITY_2_23_3)
+commit 25f7a2ab9e8bee9039104528877681ee3a0ef4b3
Author: Lucas Rocha <lucasr@gnome.org>
Date: Tue Jun 17 13:45:01 2008 +0000
@@ -12714,7 +12859,7 @@ Date: Tue Jun 3 08:00:20 2008 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit b74e793a690699675ed1cc17d0879c11873290ea (tag: ZENITY_2_23_2)
+commit b74e793a690699675ed1cc17d0879c11873290ea
Author: Lucas Rocha <lucasr@gnome.org>
Date: Tue Jun 3 07:58:59 2008 +0000
@@ -12936,7 +13081,7 @@ Date: Mon Apr 21 22:16:02 2008 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit 954fd84362fdbbf602479d049393fffc57c0f9b1 (tag: ZENITY_2_23_1)
+commit 954fd84362fdbbf602479d049393fffc57c0f9b1
Author: Lucas Rocha <lucasr@gnome.org>
Date: Mon Apr 21 22:14:32 2008 +0000
@@ -13272,7 +13417,7 @@ Date: Mon Mar 17 19:16:31 2008 +0000
src/option.c | 1 +
2 files changed, 6 insertions(+)
-commit dc31270bb25b0d4f292aeb98618c5e1ee237e8fc (tag: ZENITY_2_22_0)
+commit dc31270bb25b0d4f292aeb98618c5e1ee237e8fc
Author: Lucas Rocha <lucasr@gnome.org>
Date: Mon Mar 10 11:07:58 2008 +0000
@@ -13432,7 +13577,7 @@ Date: Mon Feb 25 20:23:28 2008 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit 2f374bf42184429bb57d6cd1703d355e5cbfa3aa (tag: ZENITY_2_21_1)
+commit 2f374bf42184429bb57d6cd1703d355e5cbfa3aa
Author: Lucas Rocha <lucasr@gnome.org>
Date: Mon Feb 25 20:21:50 2008 +0000
@@ -13895,7 +14040,7 @@ Date: Mon Sep 17 19:32:55 2007 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit 1634b3e6a56da6b74d27964fe2f9d0e6e86bf870 (tag: ZENITY_2_20_0)
+commit 1634b3e6a56da6b74d27964fe2f9d0e6e86bf870
Author: Lucas Rocha <lucasr@gnome.org>
Date: Mon Sep 17 19:31:44 2007 +0000
@@ -14453,7 +14598,7 @@ Date: Mon Aug 13 20:51:05 2007 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit 74bfe85d292159b0d01a4e27a858e68cc16a26b8 (tag: ZENITY_2_19_2)
+commit 74bfe85d292159b0d01a4e27a858e68cc16a26b8
Author: Lucas Rocha <lucasr@gnome.org>
Date: Mon Aug 13 20:49:19 2007 +0000
@@ -14649,7 +14794,7 @@ Date: Mon May 14 23:10:16 2007 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit 33bb2765a479f38f14b9784152dce867ded78406 (tag: ZENITY_2_19_1)
+commit 33bb2765a479f38f14b9784152dce867ded78406
Author: Lucas Rocha <lucasr@gnome.org>
Date: Mon May 14 23:08:37 2007 +0000
@@ -14890,7 +15035,7 @@ Date: Mon Apr 9 22:21:54 2007 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit f855ef04cd855a5d2071be12b0cb599d0439d150 (tag: ZENITY_2_18_1)
+commit f855ef04cd855a5d2071be12b0cb599d0439d150
Author: Lucas Rocha <lucasr@gnome.org>
Date: Mon Apr 9 22:19:45 2007 +0000
@@ -15005,7 +15150,7 @@ Date: Sun Mar 11 18:58:08 2007 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit 974bcca95a023194ec4d5861ccb136791d53e706 (tag: ZENITY_2_18_0)
+commit 974bcca95a023194ec4d5861ccb136791d53e706
Author: Lucas Rocha <lucasr@gnome.org>
Date: Sun Mar 11 18:56:32 2007 +0000
@@ -15217,7 +15362,7 @@ Date: Mon Feb 26 17:41:03 2007 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit 342f3f62772b6ee23eb4f8332b750a6c8b3ac197 (tag: ZENITY_2_17_92)
+commit 342f3f62772b6ee23eb4f8332b750a6c8b3ac197
Author: Lucas Rocha <lucasr@gnome.org>
Date: Mon Feb 26 17:36:30 2007 +0000
@@ -15327,7 +15472,7 @@ Date: Mon Feb 12 18:13:31 2007 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit e0e0a995fb56d2e5ea1c911b83e38daca5cd7a90 (tag: ZENITY_2_17_91)
+commit e0e0a995fb56d2e5ea1c911b83e38daca5cd7a90
Author: Lucas Rocha <lucasr@gnome.org>
Date: Mon Feb 12 18:11:42 2007 +0000
@@ -15461,7 +15606,7 @@ Date: Mon Jan 22 18:59:39 2007 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit 979a7ad7695d2d114bec28e94855dc43b74a67c3 (tag: ZENITY_2_17_90)
+commit 979a7ad7695d2d114bec28e94855dc43b74a67c3
Author: Lucas Rocha <lucasr@gnome.org>
Date: Mon Jan 22 18:56:40 2007 +0000
@@ -15513,7 +15658,7 @@ Date: Mon Jan 8 20:38:48 2007 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit da6536f1378ce531d9730404c2ebe918d4def365 (tag: ZENITY_2_17_3)
+commit da6536f1378ce531d9730404c2ebe918d4def365
Author: Lucas Rocha <lucasr@gnome.org>
Date: Mon Jan 8 20:36:41 2007 +0000
@@ -15667,7 +15812,7 @@ Date: Mon Dec 18 20:46:51 2006 +0000
po/ChangeLog | 4 ++++
4 files changed, 23 insertions(+)
-commit a95fe1165c3244120d29c55d0edb3addf5ae511b (tag: ZENITY_2_17_2)
+commit a95fe1165c3244120d29c55d0edb3addf5ae511b
Author: Djihed Afifi <djihed@src.gnome.org>
Date: Mon Dec 18 01:44:47 2006 +0000
@@ -15775,7 +15920,7 @@ Date: Mon Dec 4 21:02:19 2006 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit b1625e26f42fce48b0ee8ab8626e56f5a3499de8 (tag: ZENITY_2_17_1)
+commit b1625e26f42fce48b0ee8ab8626e56f5a3499de8
Author: Lucas Rocha <lucasr@gnome.org>
Date: Mon Dec 4 20:56:29 2006 +0000
@@ -15906,7 +16051,7 @@ Date: Mon Oct 30 01:58:51 2006 +0000
po/ar.po | 349 ++++++++++++++++++++++++++++++++++-------------------------
2 files changed, 205 insertions(+), 148 deletions(-)
-commit 759a75ada57163cb55a2287a0db4e48d615173c2 (tag: ZENITY_2_16_1)
+commit 759a75ada57163cb55a2287a0db4e48d615173c2
Author: Daniel Nylander <po@danielnylander.se>
Date: Thu Oct 26 22:07:09 2006 +0000
@@ -16047,7 +16192,7 @@ Date: Mon Sep 4 13:01:56 2006 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit 04563f0be839e5797a7e035fbfffc572a223e4a8 (tag: ZENITY_2_16_0)
+commit 04563f0be839e5797a7e035fbfffc572a223e4a8
Author: Lucas Rocha <lucasr@gnome.org>
Date: Mon Sep 4 12:55:27 2006 +0000
@@ -16077,7 +16222,7 @@ Date: Mon Sep 4 12:41:20 2006 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit 9a2cbe6b0bdb1af1b4a049fe62aa7965dc1a3eca (tag: ZENITY_2_15_92)
+commit 9a2cbe6b0bdb1af1b4a049fe62aa7965dc1a3eca
Author: Lucas Rocha <lucasr@gnome.org>
Date: Mon Sep 4 12:36:51 2006 +0000
@@ -16391,7 +16536,7 @@ Date: Wed Aug 9 01:06:20 2006 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit 94e6ab1132d0510edb6a733593de7f031d259101 (tag: ZENITY_2_15_91)
+commit 94e6ab1132d0510edb6a733593de7f031d259101
Author: Lucas Rocha <lucasr@gnome.org>
Date: Wed Aug 9 00:55:59 2006 +0000
@@ -16495,7 +16640,7 @@ Date: Fri Jul 28 22:29:44 2006 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit 5f7447fa05d7a4d8fb79ddfdac9d8ee7a0f4a795 (tag: ZENITY_2_15_90)
+commit 5f7447fa05d7a4d8fb79ddfdac9d8ee7a0f4a795
Author: Lucas Rocha <lucasr@gnome.org>
Date: Fri Jul 28 22:25:31 2006 +0000
@@ -17029,7 +17174,7 @@ Date: Tue May 16 12:43:44 2006 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit e3587488aa0c0830b3d1b9028050b30078aafc98 (tag: ZENITY_2_15_2)
+commit e3587488aa0c0830b3d1b9028050b30078aafc98
Author: Lucas Rocha <lucasr@gnome.org>
Date: Tue May 16 12:42:15 2006 +0000
@@ -17104,7 +17249,7 @@ Date: Sat Apr 29 03:32:47 2006 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit 986c97f672891a5c16b5667fadf39f4de54bf5d3 (tag: ZENITY_2_15_1)
+commit 986c97f672891a5c16b5667fadf39f4de54bf5d3
Author: Lucas Rocha <lucasr@gnome.org>
Date: Sat Apr 29 03:31:38 2006 +0000
@@ -17378,7 +17523,7 @@ Date: Mon Mar 13 21:12:44 2006 +0000
configure.in | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
-commit 5496ea9ecf371d8e8e398751d6f5aabb7cf62fa2 (tag: ZENITY_2_14_0, tag: GNOME_2_14_BRANCHPOINT)
+commit 5496ea9ecf371d8e8e398751d6f5aabb7cf62fa2
Author: Lucas Rocha <lucasr@gnome.org>
Date: Mon Mar 13 20:44:40 2006 +0000
@@ -17738,7 +17883,7 @@ Date: Sun Jan 29 21:09:18 2006 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit b01a07783db47bcc7de83325dd6da33c44373f1a (tag: ZENITY_2_13_90)
+commit b01a07783db47bcc7de83325dd6da33c44373f1a
Author: Lucas Rocha <lucasr@gnome.org>
Date: Sun Jan 29 21:04:14 2006 +0000
@@ -17841,7 +17986,7 @@ Date: Mon Jan 16 23:33:24 2006 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit 741aba7ac2e9dfe554624f79955f8e1486645ce6 (tag: ZENITY_2_13_5)
+commit 741aba7ac2e9dfe554624f79955f8e1486645ce6
Author: Lucas Rocha <lucasr@gnome.org>
Date: Mon Jan 16 23:03:53 2006 +0000
@@ -17926,7 +18071,7 @@ Date: Fri Jan 6 03:23:06 2006 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit d21e6be78a47e739db2e09a2a7bca51da6e81d45 (tag: ZENITY_2_13_4)
+commit d21e6be78a47e739db2e09a2a7bca51da6e81d45
Author: Lucas Rocha <lucasr@gnome.org>
Date: Fri Jan 6 03:21:17 2006 +0000
@@ -18324,7 +18469,7 @@ Date: Mon Dec 12 21:55:08 2005 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit 3448858072b6baf502b22aec2a1553a195255b2e (tag: ZENITY_2_13_3)
+commit 3448858072b6baf502b22aec2a1553a195255b2e
Author: Lucas Rocha <lucasr@gnome.org>
Date: Mon Dec 12 21:52:32 2005 +0000
@@ -18389,7 +18534,7 @@ Date: Mon Nov 14 05:08:07 2005 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit 6a7b36229c87a9c477c56cbea789ddfb5f6758c8 (tag: ZENITY_2_13_2)
+commit 6a7b36229c87a9c477c56cbea789ddfb5f6758c8
Author: Lucas Rocha <lucasr@cvs.gnome.org>
Date: Mon Nov 14 05:05:33 2005 +0000
@@ -18455,7 +18600,7 @@ Date: Mon Oct 24 12:55:02 2005 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit 5483bdb680420014ebcfc3b916fb30fbe04de581 (tag: ZENITY_2_13_1)
+commit 5483bdb680420014ebcfc3b916fb30fbe04de581
Author: Lucas Rocha <lucasr@cvs.gnome.org>
Date: Mon Oct 24 12:51:36 2005 +0000
@@ -18738,7 +18883,7 @@ Date: Tue Sep 6 03:49:43 2005 +0000
configure.in | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
-commit 7f091245f70b6d6fac4c79288109e31aa62eb8aa (tag: ZENITY_2_12_0)
+commit 7f091245f70b6d6fac4c79288109e31aa62eb8aa
Author: Lucas Rocha <lucasr@cvs.gnome.org>
Date: Tue Sep 6 03:44:07 2005 +0000
@@ -18858,7 +19003,7 @@ Date: Wed Aug 31 03:04:52 2005 +0000
configure.in | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
-commit 3853f7ff3f7c57f2cc73329478573c40b0f5ad38 (tag: GNOME_2_12_BRANCHPOINT)
+commit 3853f7ff3f7c57f2cc73329478573c40b0f5ad38
Author: Vincent Untz <vuntz@gnome.org>
Date: Mon Aug 29 17:18:04 2005 +0000
@@ -19027,7 +19172,7 @@ Date: Tue Aug 23 15:27:13 2005 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit 417bfb638949dfb17995bd948a05ab2bd911b881 (tag: ZENITY_2_11_92)
+commit 417bfb638949dfb17995bd948a05ab2bd911b881
Author: Lucas Rocha <lucasr@cvs.gnome.org>
Date: Tue Aug 23 15:16:57 2005 +0000
@@ -19216,7 +19361,7 @@ Date: Sun Aug 7 19:48:44 2005 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit 0bc57119fbc42ce8cbf7a6fbf40954c897e8b9d3 (tag: ZENITY_2_11_91)
+commit 0bc57119fbc42ce8cbf7a6fbf40954c897e8b9d3
Author: Lucas Rocha <lucasr@cvs.gnome.org>
Date: Sun Aug 7 19:45:50 2005 +0000
@@ -19342,7 +19487,7 @@ Date: Tue Jul 26 03:16:09 2005 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit 47a2e0479af9694840d2c3d352213bdb13d78b9a (tag: ZENITY_2_11_90)
+commit 47a2e0479af9694840d2c3d352213bdb13d78b9a
Author: Lucas Rocha <lucasr@cvs.gnome.org>
Date: Tue Jul 26 03:12:09 2005 +0000
@@ -19535,7 +19680,7 @@ Date: Wed Jul 13 04:10:19 2005 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit 4b5cdda3c868bc7a20f52efd60e2db6575363c1b (tag: ZENITY_2_11_1)
+commit 4b5cdda3c868bc7a20f52efd60e2db6575363c1b
Author: Lucas Rocha <lucasr@cvs.gnome.org>
Date: Wed Jul 13 04:04:09 2005 +0000
@@ -19819,7 +19964,7 @@ Date: Fri Jul 1 22:40:41 2005 +0000
configure.in | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
-commit 28b489fcc49ded8eda5ff58b7cf8742af5d2fdc3 (tag: ZENITY_2_11_0)
+commit 28b489fcc49ded8eda5ff58b7cf8742af5d2fdc3
Author: Lucas Almeida Rocha <lucasr@src.gnome.org>
Date: Fri Jul 1 22:37:11 2005 +0000
@@ -20418,7 +20563,7 @@ Date: Mon Mar 7 15:45:48 2005 +0000
configure.in | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
-commit bf5f42b1a867ca581539e045816b32d1e9200995 (tag: ZENITY_2_10_0)
+commit bf5f42b1a867ca581539e045816b32d1e9200995
Author: Glynn Foster <glynn.foster@sun.com>
Date: Mon Mar 7 15:40:06 2005 +0000
@@ -20574,7 +20719,7 @@ Date: Mon Feb 28 07:53:20 2005 +0000
.cvsignore | 1 -
1 file changed, 1 deletion(-)
-commit fa5dd9497da4943bede13ab6a2627c3fd82dcf62 (tag: ZENITY_2_9_92)
+commit fa5dd9497da4943bede13ab6a2627c3fd82dcf62
Author: Glynn Foster <glynn.foster@sun.com>
Date: Mon Feb 28 07:51:31 2005 +0000
@@ -20977,7 +21122,7 @@ Date: Mon Feb 7 22:14:06 2005 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit bdd51bdb65ee861f94b2a072cb13e66be12dc271 (tag: ZENITY_2_9_91)
+commit bdd51bdb65ee861f94b2a072cb13e66be12dc271
Author: Glynn Foster <glynn.foster@sun.com>
Date: Mon Feb 7 22:08:33 2005 +0000
@@ -21347,7 +21492,7 @@ Date: Mon Jan 10 22:26:09 2005 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit f5ae7fb520413b5ca562c846b6045ca9764e7b6a (tag: ZENITY_2_9_2)
+commit f5ae7fb520413b5ca562c846b6045ca9764e7b6a
Author: Glynn Foster <glynn.foster@sun.com>
Date: Sun Jan 9 21:51:06 2005 +0000
@@ -21601,7 +21746,7 @@ Date: Tue Dec 21 02:35:44 2004 +0000
po/vi.po | 69 +++++++++++++++++++++++++---------------------------------------
1 file changed, 27 insertions(+), 42 deletions(-)
-commit 0f8ace6165e723dfd62320d2e7ba0c0d0ae0a04f (tag: ZENITY_2_9_1)
+commit 0f8ace6165e723dfd62320d2e7ba0c0d0ae0a04f
Author: Glynn Foster <gman@src.gnome.org>
Date: Mon Dec 20 23:26:27 2004 +0000
@@ -22514,7 +22659,7 @@ Date: Mon Sep 13 08:24:52 2004 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit 1647691396d4a63e33def9e38f2d12a14ad8e047 (tag: ZENITY_2_9_0)
+commit 1647691396d4a63e33def9e38f2d12a14ad8e047
Author: Glynn Foster <glynn.foster@sun.com>
Date: Mon Sep 13 08:20:28 2004 +0000
@@ -22693,7 +22838,7 @@ Date: Mon Sep 13 04:39:28 2004 +0000
configure.in | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
-commit 3a614e4440e55e8be20c88af656db2fbb3d12c27 (tag: ZENITY_2_8_0)
+commit 3a614e4440e55e8be20c88af656db2fbb3d12c27
Author: Glynn Foster <glynn.foster@sun.com>
Date: Mon Sep 13 04:17:28 2004 +0000
@@ -23595,7 +23740,7 @@ Date: Tue Aug 3 05:01:48 2004 +0000
configure.in | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
-commit eff265571321698103893bf71f7bfc7e0c9bf77b (tag: ZENITY_2_7_90)
+commit eff265571321698103893bf71f7bfc7e0c9bf77b
Author: Glynn Foster <glynn.foster@sun.com>
Date: Tue Aug 3 05:00:49 2004 +0000
@@ -24200,7 +24345,7 @@ Date: Wed May 26 06:25:42 2004 +0000
po/bg.po | 460 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 472 insertions(+), 1 deletion(-)
-commit a4ddce66bd638f2d9e87a2de5196d63390c00bbd (tag: ZENITY_2_6_2)
+commit a4ddce66bd638f2d9e87a2de5196d63390c00bbd
Author: Glynn Foster <glynn.foster@sun.com>
Date: Wed Apr 28 23:11:31 2004 +0000
@@ -24409,7 +24554,7 @@ Date: Tue Apr 20 12:20:42 2004 +0000
po/ChangeLog | 60 ++++--------------------------------------------------------
3 files changed, 9 insertions(+), 57 deletions(-)
-commit af9484723ffded746b0ccc73ebf3266d970287f2 (tag: ZENITY_2_6_1)
+commit af9484723ffded746b0ccc73ebf3266d970287f2
Author: Glynn Foster <glynn.foster@sun.com>
Date: Tue Apr 20 12:17:39 2004 +0000
@@ -24596,7 +24741,7 @@ Date: Mon Mar 22 11:00:31 2004 +0000
help/sr/.cvsignore | 4 ++++
4 files changed, 11 insertions(+), 1 deletion(-)
-commit 1e5f3993ee520c12bdafd9c5587fab0ba393a85c (tag: ZENITY_2_6_0)
+commit 1e5f3993ee520c12bdafd9c5587fab0ba393a85c
Author: Glynn Foster <glynn.foster@sun.com>
Date: Mon Mar 22 10:53:47 2004 +0000
@@ -24952,7 +25097,7 @@ Date: Sat Mar 6 18:52:08 2004 +0000
src/util.c | 3 ---
2 files changed, 4 insertions(+), 3 deletions(-)
-commit 0e37613d25b36039f57cbe463c5e34a8017985e8 (tag: ZENITY_2_5_90)
+commit 0e37613d25b36039f57cbe463c5e34a8017985e8
Author: Glynn Foster <glynn.foster@sun.com>
Date: Sat Mar 6 18:50:14 2004 +0000
@@ -25232,7 +25377,7 @@ Date: Wed Feb 4 16:19:57 2004 +0000
configure.in | 4 ----
2 files changed, 6 insertions(+), 4 deletions(-)
-commit 75bdcd6e77fcea76d9fe6d6b09e4f64eb59a3447 (tag: ZENITY_2_5_2)
+commit 75bdcd6e77fcea76d9fe6d6b09e4f64eb59a3447
Author: Glynn Foster <glynn.foster@sun.com>
Date: Tue Feb 3 10:27:46 2004 +0000
@@ -25515,7 +25660,7 @@ Date: Fri Jan 2 23:12:36 2004 +0000
po/pt.po | 121 +++++++++++++++++++++++++----------------------------------
2 files changed, 56 insertions(+), 69 deletions(-)
-commit 104a45c0f772ec07866c717861d8cbf1128b1e58 (tag: ZENITY_2_5_1)
+commit 104a45c0f772ec07866c717861d8cbf1128b1e58
Author: Glynn Foster <glynn.foster@sun.com>
Date: Wed Dec 31 01:52:25 2003 +0000
@@ -25585,7 +25730,7 @@ Date: Wed Dec 31 01:52:25 2003 +0000
src/fileselection.c | 48 +++++++++++++++++++++++++-----------------------
51 files changed, 96 insertions(+), 71 deletions(-)
-commit 569271da40c3a0066539264965224931b3ba6f1b (tag: ZENITY_1_8)
+commit 569271da40c3a0066539264965224931b3ba6f1b
Author: Glynn Foster <glynn.foster@sun.com>
Date: Wed Dec 31 01:21:41 2003 +0000
@@ -26324,7 +26469,7 @@ Date: Wed Sep 10 09:17:17 2003 +0000
po/tr.po | 447 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 447 insertions(+)
-commit 0765153100b04451b676bcfabf6d7a5e6e77391e (tag: ZENITY_1_6)
+commit 0765153100b04451b676bcfabf6d7a5e6e77391e
Author: Glynn Foster <glynn.foster@sun.com>
Date: Mon Sep 8 13:24:07 2003 +0000
@@ -26636,7 +26781,7 @@ Date: Sun Aug 24 20:18:06 2003 +0000
po/sl.po | 156 +++++++++++++++++++++++++++++++++++++--------------------------
1 file changed, 92 insertions(+), 64 deletions(-)
-commit b0f91906ab3f8c9edccd3812ea749a44f10b685d (tag: ZENITY_1_5)
+commit b0f91906ab3f8c9edccd3812ea749a44f10b685d
Author: Glynn Foster <glynn.foster@sun.com>
Date: Sun Aug 24 17:32:33 2003 +0000
@@ -26882,7 +27027,7 @@ Date: Fri Aug 8 03:21:05 2003 +0000
po/sr@Latn.po | 96 +++++++++++++++++++++++++++--------------------------------
3 files changed, 89 insertions(+), 101 deletions(-)
-commit 0f56f63fa6afc0f8b504a66a6204bc720a7634fa (tag: ZENITY_1_4)
+commit 0f56f63fa6afc0f8b504a66a6204bc720a7634fa
Author: Glynn Foster <glynn.foster@sun.com>
Date: Thu Aug 7 13:58:00 2003 +0000
@@ -27705,7 +27850,7 @@ Date: Fri May 30 14:35:50 2003 +0000
po/nl.po | 22 +++++-----------------
2 files changed, 9 insertions(+), 17 deletions(-)
-commit 74793cc79b54a4e472ae1691a8269fda043552a7 (tag: ZENITY_1_3)
+commit 74793cc79b54a4e472ae1691a8269fda043552a7
Author: Glynn Foster <glynn.foster@sun.com>
Date: Thu May 29 09:26:44 2003 +0000
@@ -28248,7 +28393,7 @@ Date: Mon May 5 22:38:54 2003 +0000
help/C/zenity.xml | 18 +++++++++++++++++-
2 files changed, 23 insertions(+), 2 deletions(-)
-commit 889ea3ce080a7874a815ff8468da5572c1f23fb2 (tag: ZENITY_1_1)
+commit 889ea3ce080a7874a815ff8468da5572c1f23fb2
Author: Glynn Foster <glynn.foster@sun.com>
Date: Mon May 5 20:32:21 2003 +0000
@@ -29046,7 +29191,7 @@ Date: Sat Feb 1 17:36:18 2003 +0000
po/da.po | 59 +++++++++++++++++++++++++----------------------------------
2 files changed, 29 insertions(+), 34 deletions(-)
-commit 564a6b58544e6925d4b88b33ae7555578de2f74d (tag: ZENITY_1_0)
+commit 564a6b58544e6925d4b88b33ae7555578de2f74d
Author: Glynn Foster <glynn.foster@sun.com>
Date: Sat Feb 1 12:39:48 2003 +0000
@@ -30308,7 +30453,7 @@ Date: Mon Jan 6 15:06:17 2003 +0000
src/zenity.h | 3 +-
5 files changed, 148 insertions(+), 80 deletions(-)
-commit b44078584af9c85532b05c371c8c960725679620 (tag: ZENITY_0_1)
+commit b44078584af9c85532b05c371c8c960725679620
Author: Glynn Foster <gman@src.gnome.org>
Date: Fri Jan 3 13:26:04 2003 +0000
diff --git a/Makefile.in b/Makefile.in
index 63b64e1c..e9f148ef 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -164,8 +164,8 @@ CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
ABOUT-NLS AUTHORS COPYING ChangeLog NEWS README THANKS TODO \
- compile config.guess config.rpath config.sub install-sh \
- missing
+ compile config.guess config.rpath config.sub depcomp \
+ install-sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -337,7 +337,6 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
-runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/NEWS b/NEWS
index b13f8e64..f7b14a1e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+Zenity 3.30.0
+ - Translation updates
+
Zenity 3.28.1
- Translation updates
diff --git a/aclocal.m4 b/aclocal.m4
index 4490fb08..d7b03124 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -363,9 +363,9 @@ AU_DEFUN([GNOME_CXX_WARNINGS],[
eliminate use of --enable-iso-cxx.
See: http://www.gnu.org/software/autoconf-archive/ax_compiler_flags.html#ax_compiler_flags]])
-dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-dnl serial 11 (pkg-config-0.29.1)
-dnl
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+# serial 11 (pkg-config-0.29.1)
+
dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
dnl
@@ -639,6 +639,74 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
AS_VAR_IF([$1], [""], [$5], [$4])dnl
])dnl PKG_CHECK_VAR
+dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
+dnl [DESCRIPTION], [DEFAULT])
+dnl ------------------------------------------
+dnl
+dnl Prepare a "--with-" configure option using the lowercase
+dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and
+dnl PKG_CHECK_MODULES in a single macro.
+AC_DEFUN([PKG_WITH_MODULES],
+[
+m4_pushdef([with_arg], m4_tolower([$1]))
+
+m4_pushdef([description],
+ [m4_default([$5], [build with ]with_arg[ support])])
+
+m4_pushdef([def_arg], [m4_default([$6], [auto])])
+m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes])
+m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no])
+
+m4_case(def_arg,
+ [yes],[m4_pushdef([with_without], [--without-]with_arg)],
+ [m4_pushdef([with_without],[--with-]with_arg)])
+
+AC_ARG_WITH(with_arg,
+ AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),,
+ [AS_TR_SH([with_]with_arg)=def_arg])
+
+AS_CASE([$AS_TR_SH([with_]with_arg)],
+ [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)],
+ [auto],[PKG_CHECK_MODULES([$1],[$2],
+ [m4_n([def_action_if_found]) $3],
+ [m4_n([def_action_if_not_found]) $4])])
+
+m4_popdef([with_arg])
+m4_popdef([description])
+m4_popdef([def_arg])
+
+])dnl PKG_WITH_MODULES
+
+dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl [DESCRIPTION], [DEFAULT])
+dnl -----------------------------------------------
+dnl
+dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES
+dnl check._[VARIABLE-PREFIX] is exported as make variable.
+AC_DEFUN([PKG_HAVE_WITH_MODULES],
+[
+PKG_WITH_MODULES([$1],[$2],,,[$3],[$4])
+
+AM_CONDITIONAL([HAVE_][$1],
+ [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
+])dnl PKG_HAVE_WITH_MODULES
+
+dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl [DESCRIPTION], [DEFAULT])
+dnl ------------------------------------------------------
+dnl
+dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
+dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make
+dnl and preprocessor variable.
+AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES],
+[
+PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4])
+
+AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
+ [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
+])dnl PKG_HAVE_DEFINE_WITH_MODULES
+
AC_DEFUN([YELP_HELP_INIT],
[
AC_REQUIRE([AC_PROG_LN_S])
@@ -821,13 +889,7 @@ install-help: $(_HELP_LC_FILES)
elif test "x$$lc" != "xC"; then \
if test "x$(YELP_LC_MEDIA_LINKS)" != "x"; then \
echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \
- dname="$$f"; \
- pars="../"; \
- while test "$$dname" != "." -a "$$dname" != "/"; do \
- pars="../$$pars"; \
- dname=$$(dirname "$$dname"); \
- done; \
- $(LN_S) -f $$pars"C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \
+ $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \
fi; \
fi; \
done; \
diff --git a/compile b/compile
index a85b723c..de0005d4 100755
--- a/compile
+++ b/compile
@@ -1,9 +1,9 @@
-#! /bin/sh
+#!/bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2016-01-11.22; # UTC
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -255,7 +255,8 @@ EOF
echo "compile $scriptversion"
exit $?
;;
- cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+ icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
@@ -342,6 +343,6 @@ exit $ret
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff --git a/config.guess b/config.guess
index f50dcdb6..717b2287 100755
--- a/config.guess
+++ b/config.guess
@@ -1,8 +1,8 @@
-#! /bin/sh
+#!/bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2018 Free Software Foundation, Inc.
+# Copyright 1992-2017 Free Software Foundation, Inc.
-timestamp='2018-02-24'
+timestamp='2017-08-08'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@ timestamp='2018-02-24'
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <https://www.gnu.org/licenses/>.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -27,7 +27,7 @@ timestamp='2018-02-24'
# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
#
# You can get the latest version of this script from:
-# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
#
# Please send patches to <config-patches@gnu.org>.
@@ -39,7 +39,7 @@ Usage: $0 [OPTION]
Output the configuration name of the system \`$me' is run on.
-Options:
+Operation modes:
-h, --help print this help, then exit
-t, --time-stamp print date of last modification, then exit
-v, --version print version number, then exit
@@ -50,7 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2018 Free Software Foundation, Inc.
+Copyright 1992-2017 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -107,9 +107,9 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
dummy=$tmp/dummy ;
tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,) echo "int x;" > "$dummy.c" ;
+ ,,) echo "int x;" > $dummy.c ;
for c in cc gcc c89 c99 ; do
- if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
+ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
CC_FOR_BUILD="$c"; break ;
fi ;
done ;
@@ -132,14 +132,14 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-case "$UNAME_SYSTEM" in
+case "${UNAME_SYSTEM}" in
Linux|GNU|GNU/*)
# If the system lacks a compiler, then just pick glibc.
# We could probably try harder.
LIBC=gnu
- eval "$set_cc_for_build"
- cat <<-EOF > "$dummy.c"
+ eval $set_cc_for_build
+ cat <<-EOF > $dummy.c
#include <features.h>
#if defined(__UCLIBC__)
LIBC=uclibc
@@ -149,20 +149,13 @@ Linux|GNU|GNU/*)
LIBC=gnu
#endif
EOF
- eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
-
- # If ldd exists, use it to detect musl libc.
- if command -v ldd >/dev/null && \
- ldd --version 2>&1 | grep -q ^musl
- then
- LIBC=musl
- fi
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
;;
esac
# Note: order is significant - the case branches are not exclusive.
-case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:NetBSD:*:*)
# NetBSD (nbsd) targets should (where applicable) match one or
# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
@@ -176,30 +169,30 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
# portion of the name. We always set it to "unknown".
sysctl="sysctl -n hw.machine_arch"
UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
- "/sbin/$sysctl" 2>/dev/null || \
- "/usr/sbin/$sysctl" 2>/dev/null || \
+ /sbin/$sysctl 2>/dev/null || \
+ /usr/sbin/$sysctl 2>/dev/null || \
echo unknown)`
- case "$UNAME_MACHINE_ARCH" in
+ case "${UNAME_MACHINE_ARCH}" in
armeb) machine=armeb-unknown ;;
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
sh5el) machine=sh5le-unknown ;;
earmv*)
- arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
- endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
- machine="${arch}${endian}"-unknown
+ arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+ endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
+ machine=${arch}${endian}-unknown
;;
- *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
+ *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
# to ELF recently (or will in the future) and ABI.
- case "$UNAME_MACHINE_ARCH" in
+ case "${UNAME_MACHINE_ARCH}" in
earm*)
os=netbsdelf
;;
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- eval "$set_cc_for_build"
+ eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ELF__
then
@@ -215,10 +208,10 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
;;
esac
# Determine ABI tags.
- case "$UNAME_MACHINE_ARCH" in
+ case "${UNAME_MACHINE_ARCH}" in
earm*)
expr='s/^earmv[0-9]/-eabi/;s/eb$//'
- abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
+ abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
;;
esac
# The OS release
@@ -226,55 +219,49 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
# thus, need a distinct triplet. However, they do not need
# kernel version information, so it can be replaced with a
# suitable tag, in the style of linux-gnu.
- case "$UNAME_VERSION" in
+ case "${UNAME_VERSION}" in
Debian*)
release='-gnu'
;;
*)
- release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
+ release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
;;
esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "$machine-${os}${release}${abi}"
+ echo "${machine}-${os}${release}${abi}"
exit ;;
*:Bitrig:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
- echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
exit ;;
*:OpenBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
- echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
exit ;;
*:LibertyBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
- echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
- exit ;;
- *:MidnightBSD:*:*)
- echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
+ echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
exit ;;
*:ekkoBSD:*:*)
- echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
exit ;;
*:SolidBSD:*:*)
- echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
exit ;;
macppc:MirBSD:*:*)
- echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
exit ;;
*:MirBSD:*:*)
- echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
exit ;;
*:Sortix:*:*)
- echo "$UNAME_MACHINE"-unknown-sortix
+ echo ${UNAME_MACHINE}-unknown-sortix
exit ;;
*:Redox:*:*)
- echo "$UNAME_MACHINE"-unknown-redox
+ echo ${UNAME_MACHINE}-unknown-redox
exit ;;
- mips:OSF1:*.*)
- echo mips-dec-osf1
- exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
*4.0)
@@ -326,19 +313,28 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
# A Tn.n version is a released field test version.
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
- echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
exitcode=$?
trap '' 0
exit $exitcode ;;
+ Alpha\ *:Windows_NT*:*)
+ # How do we know it's Interix rather than the generic POSIX subsystem?
+ # Should we change UNAME_MACHINE based on the output of uname instead
+ # of the specific Alpha model?
+ echo alpha-pc-interix
+ exit ;;
+ 21064:Windows_NT:50:3)
+ echo alpha-dec-winnt3.5
+ exit ;;
Amiga*:UNIX_System_V:4.0:*)
echo m68k-unknown-sysv4
exit ;;
*:[Aa]miga[Oo][Ss]:*:*)
- echo "$UNAME_MACHINE"-unknown-amigaos
+ echo ${UNAME_MACHINE}-unknown-amigaos
exit ;;
*:[Mm]orph[Oo][Ss]:*:*)
- echo "$UNAME_MACHINE"-unknown-morphos
+ echo ${UNAME_MACHINE}-unknown-morphos
exit ;;
*:OS/390:*:*)
echo i370-ibm-openedition
@@ -350,7 +346,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
echo powerpc-ibm-os400
exit ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- echo arm-acorn-riscix"$UNAME_RELEASE"
+ echo arm-acorn-riscix${UNAME_RELEASE}
exit ;;
arm*:riscos:*:*|arm*:RISCOS:*:*)
echo arm-unknown-riscos
@@ -377,19 +373,19 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
sparc) echo sparc-icl-nx7; exit ;;
esac ;;
s390x:SunOS:*:*)
- echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4H:SunOS:5.*:*)
- echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
- echo i386-pc-auroraux"$UNAME_RELEASE"
+ echo i386-pc-auroraux${UNAME_RELEASE}
exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
- eval "$set_cc_for_build"
+ eval $set_cc_for_build
SUN_ARCH=i386
# If there is a compiler, see if it is configured for 64-bit objects.
# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
@@ -402,13 +398,13 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
SUN_ARCH=x86_64
fi
fi
- echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
# SunOS6. Hard to guess exactly what SunOS6 will be like, but
# it's likely to be more like Solaris than SunOS4.
- echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+ echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:*:*)
case "`/usr/bin/arch -k`" in
@@ -417,25 +413,25 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
;;
esac
# Japanese Language versions have a version number like `4.1.3-JL'.
- echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
+ echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
exit ;;
sun3*:SunOS:*:*)
- echo m68k-sun-sunos"$UNAME_RELEASE"
+ echo m68k-sun-sunos${UNAME_RELEASE}
exit ;;
sun*:*:4.2BSD:*)
UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
- test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
+ test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
case "`/bin/arch`" in
sun3)
- echo m68k-sun-sunos"$UNAME_RELEASE"
+ echo m68k-sun-sunos${UNAME_RELEASE}
;;
sun4)
- echo sparc-sun-sunos"$UNAME_RELEASE"
+ echo sparc-sun-sunos${UNAME_RELEASE}
;;
esac
exit ;;
aushp:SunOS:*:*)
- echo sparc-auspex-sunos"$UNAME_RELEASE"
+ echo sparc-auspex-sunos${UNAME_RELEASE}
exit ;;
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
@@ -446,44 +442,44 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
# MiNT. But MiNT is downward compatible to TOS, so this should
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint"$UNAME_RELEASE"
+ echo m68k-atari-mint${UNAME_RELEASE}
exit ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint"$UNAME_RELEASE"
+ echo m68k-atari-mint${UNAME_RELEASE}
exit ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint"$UNAME_RELEASE"
+ echo m68k-atari-mint${UNAME_RELEASE}
exit ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint"$UNAME_RELEASE"
+ echo m68k-milan-mint${UNAME_RELEASE}
exit ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint"$UNAME_RELEASE"
+ echo m68k-hades-mint${UNAME_RELEASE}
exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint"$UNAME_RELEASE"
+ echo m68k-unknown-mint${UNAME_RELEASE}
exit ;;
m68k:machten:*:*)
- echo m68k-apple-machten"$UNAME_RELEASE"
+ echo m68k-apple-machten${UNAME_RELEASE}
exit ;;
powerpc:machten:*:*)
- echo powerpc-apple-machten"$UNAME_RELEASE"
+ echo powerpc-apple-machten${UNAME_RELEASE}
exit ;;
RISC*:Mach:*:*)
echo mips-dec-mach_bsd4.3
exit ;;
RISC*:ULTRIX:*:*)
- echo mips-dec-ultrix"$UNAME_RELEASE"
+ echo mips-dec-ultrix${UNAME_RELEASE}
exit ;;
VAX*:ULTRIX*:*:*)
- echo vax-dec-ultrix"$UNAME_RELEASE"
+ echo vax-dec-ultrix${UNAME_RELEASE}
exit ;;
2020:CLIX:*:* | 2430:CLIX:*:*)
- echo clipper-intergraph-clix"$UNAME_RELEASE"
+ echo clipper-intergraph-clix${UNAME_RELEASE}
exit ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
- eval "$set_cc_for_build"
- sed 's/^ //' << EOF > "$dummy.c"
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
#ifdef __cplusplus
#include <stdio.h> /* for printf() prototype */
int main (int argc, char *argv[]) {
@@ -492,23 +488,23 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
#endif
#if defined (host_mips) && defined (MIPSEB)
#if defined (SYSTYPE_SYSV)
- printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
+ printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
#endif
#if defined (SYSTYPE_SVR4)
- printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
+ printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
#endif
#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
- printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
+ printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
#endif
#endif
exit (-1);
}
EOF
- $CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
- dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
- SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
+ $CC_FOR_BUILD -o $dummy $dummy.c &&
+ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+ SYSTEM_NAME=`$dummy $dummyarg` &&
{ echo "$SYSTEM_NAME"; exit; }
- echo mips-mips-riscos"$UNAME_RELEASE"
+ echo mips-mips-riscos${UNAME_RELEASE}
exit ;;
Motorola:PowerMAX_OS:*:*)
echo powerpc-motorola-powermax
@@ -534,17 +530,17 @@ EOF
AViiON:dgux:*:*)
# DG/UX returns AViiON for all architectures
UNAME_PROCESSOR=`/usr/bin/uname -p`
- if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
+ if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
then
- if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
- [ "$TARGET_BINARY_INTERFACE"x = x ]
+ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+ [ ${TARGET_BINARY_INTERFACE}x = x ]
then
- echo m88k-dg-dgux"$UNAME_RELEASE"
+ echo m88k-dg-dgux${UNAME_RELEASE}
else
- echo m88k-dg-dguxbcs"$UNAME_RELEASE"
+ echo m88k-dg-dguxbcs${UNAME_RELEASE}
fi
else
- echo i586-dg-dgux"$UNAME_RELEASE"
+ echo i586-dg-dgux${UNAME_RELEASE}
fi
exit ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
@@ -561,7 +557,7 @@ EOF
echo m68k-tektronix-bsd
exit ;;
*:IRIX*:*:*)
- echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
+ echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
exit ;;
????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
@@ -573,14 +569,14 @@ EOF
if [ -x /usr/bin/oslevel ] ; then
IBM_REV=`/usr/bin/oslevel`
else
- IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
- echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
+ echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
exit ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
- eval "$set_cc_for_build"
- sed 's/^ //' << EOF > "$dummy.c"
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
#include <sys/systemcfg.h>
main()
@@ -591,7 +587,7 @@ EOF
exit(0);
}
EOF
- if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
+ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
then
echo "$SYSTEM_NAME"
else
@@ -605,7 +601,7 @@ EOF
exit ;;
*:AIX:*:[4567])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
else
IBM_ARCH=powerpc
@@ -614,18 +610,18 @@ EOF
IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
else
- IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
- echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
+ echo ${IBM_ARCH}-ibm-aix${IBM_REV}
exit ;;
*:AIX:*:*)
echo rs6000-ibm-aix
exit ;;
- ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
+ ibmrt:4.4BSD:*|romp-ibm:BSD:*)
echo romp-ibm-bsd4.4
exit ;;
ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
- echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to
+ echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
exit ;; # report: romp-ibm BSD 4.3
*:BOSX:*:*)
echo rs6000-bull-bosx
@@ -640,28 +636,28 @@ EOF
echo m68k-hp-bsd4.4
exit ;;
9000/[34678]??:HP-UX:*:*)
- HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
- case "$UNAME_MACHINE" in
- 9000/31?) HP_ARCH=m68000 ;;
- 9000/[34]??) HP_ARCH=m68k ;;
+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ case "${UNAME_MACHINE}" in
+ 9000/31? ) HP_ARCH=m68000 ;;
+ 9000/[34]?? ) HP_ARCH=m68k ;;
9000/[678][0-9][0-9])
if [ -x /usr/bin/getconf ]; then
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
- case "$sc_cpu_version" in
+ case "${sc_cpu_version}" in
523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
532) # CPU_PA_RISC2_0
- case "$sc_kernel_bits" in
+ case "${sc_kernel_bits}" in
32) HP_ARCH=hppa2.0n ;;
64) HP_ARCH=hppa2.0w ;;
'') HP_ARCH=hppa2.0 ;; # HP-UX 10.20
esac ;;
esac
fi
- if [ "$HP_ARCH" = "" ]; then
- eval "$set_cc_for_build"
- sed 's/^ //' << EOF > "$dummy.c"
+ if [ "${HP_ARCH}" = "" ]; then
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
#define _HPUX_SOURCE
#include <stdlib.h>
@@ -694,13 +690,13 @@ EOF
exit (0);
}
EOF
- (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
+ (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
test -z "$HP_ARCH" && HP_ARCH=hppa
fi ;;
esac
- if [ "$HP_ARCH" = hppa2.0w ]
+ if [ ${HP_ARCH} = hppa2.0w ]
then
- eval "$set_cc_for_build"
+ eval $set_cc_for_build
# hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
# 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
@@ -719,15 +715,15 @@ EOF
HP_ARCH=hppa64
fi
fi
- echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
+ echo ${HP_ARCH}-hp-hpux${HPUX_REV}
exit ;;
ia64:HP-UX:*:*)
- HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
- echo ia64-hp-hpux"$HPUX_REV"
+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ echo ia64-hp-hpux${HPUX_REV}
exit ;;
3050*:HI-UX:*:*)
- eval "$set_cc_for_build"
- sed 's/^ //' << EOF > "$dummy.c"
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
#include <unistd.h>
int
main ()
@@ -752,11 +748,11 @@ EOF
exit (0);
}
EOF
- $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
{ echo "$SYSTEM_NAME"; exit; }
echo unknown-hitachi-hiuxwe2
exit ;;
- 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
+ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
echo hppa1.1-hp-bsd
exit ;;
9000/8??:4.3bsd:*:*)
@@ -765,7 +761,7 @@ EOF
*9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
echo hppa1.0-hp-mpeix
exit ;;
- hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
+ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
echo hppa1.1-hp-osf
exit ;;
hp8??:OSF1:*:*)
@@ -773,9 +769,9 @@ EOF
exit ;;
i*86:OSF1:*:*)
if [ -x /usr/sbin/sysversion ] ; then
- echo "$UNAME_MACHINE"-unknown-osf1mk
+ echo ${UNAME_MACHINE}-unknown-osf1mk
else
- echo "$UNAME_MACHINE"-unknown-osf1
+ echo ${UNAME_MACHINE}-unknown-osf1
fi
exit ;;
parisc*:Lites*:*:*)
@@ -800,109 +796,128 @@ EOF
echo c4-convex-bsd
exit ;;
CRAY*Y-MP:*:*:*)
- echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit ;;
CRAY*[A-Z]90:*:*:*)
- echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
+ echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-e 's/\.[^.]*$/.X/'
exit ;;
CRAY*TS:*:*:*)
- echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+ echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit ;;
CRAY*T3E:*:*:*)
- echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+ echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit ;;
CRAY*SV1:*:*:*)
- echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit ;;
*:UNICOS/mp:*:*)
- echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
- FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit ;;
5000:UNIX_System_V:4.*:*)
FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
- FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
+ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
exit ;;
sparc*:BSD/OS:*:*)
- echo sparc-unknown-bsdi"$UNAME_RELEASE"
+ echo sparc-unknown-bsdi${UNAME_RELEASE}
exit ;;
*:BSD/OS:*:*)
- echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit ;;
*:FreeBSD:*:*)
UNAME_PROCESSOR=`/usr/bin/uname -p`
- case "$UNAME_PROCESSOR" in
+ case ${UNAME_PROCESSOR} in
amd64)
UNAME_PROCESSOR=x86_64 ;;
i386)
UNAME_PROCESSOR=i586 ;;
esac
- echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit ;;
i*:CYGWIN*:*)
- echo "$UNAME_MACHINE"-pc-cygwin
+ echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
*:MINGW64*:*)
- echo "$UNAME_MACHINE"-pc-mingw64
+ echo ${UNAME_MACHINE}-pc-mingw64
exit ;;
*:MINGW*:*)
- echo "$UNAME_MACHINE"-pc-mingw32
+ echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
*:MSYS*:*)
- echo "$UNAME_MACHINE"-pc-msys
+ echo ${UNAME_MACHINE}-pc-msys
+ exit ;;
+ i*:windows32*:*)
+ # uname -m includes "-pc" on this system.
+ echo ${UNAME_MACHINE}-mingw32
exit ;;
i*:PW*:*)
- echo "$UNAME_MACHINE"-pc-pw32
+ echo ${UNAME_MACHINE}-pc-pw32
exit ;;
*:Interix*:*)
- case "$UNAME_MACHINE" in
+ case ${UNAME_MACHINE} in
x86)
- echo i586-pc-interix"$UNAME_RELEASE"
+ echo i586-pc-interix${UNAME_RELEASE}
exit ;;
authenticamd | genuineintel | EM64T)
- echo x86_64-unknown-interix"$UNAME_RELEASE"
+ echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
IA64)
- echo ia64-unknown-interix"$UNAME_RELEASE"
+ echo ia64-unknown-interix${UNAME_RELEASE}
exit ;;
esac ;;
+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ echo i${UNAME_MACHINE}-pc-mks
+ exit ;;
+ 8664:Windows_NT:*)
+ echo x86_64-pc-mks
+ exit ;;
+ i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+ # How do we know it's Interix rather than the generic POSIX subsystem?
+ # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+ # UNAME_MACHINE based on the output of uname instead of i386?
+ echo i586-pc-interix
+ exit ;;
i*:UWIN*:*)
- echo "$UNAME_MACHINE"-pc-uwin
+ echo ${UNAME_MACHINE}-pc-uwin
exit ;;
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
echo x86_64-unknown-cygwin
exit ;;
+ p*:CYGWIN*:*)
+ echo powerpcle-unknown-cygwin
+ exit ;;
prep*:SunOS:5.*:*)
- echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
+ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
*:GNU:*:*)
# the GNU system
- echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
- echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
exit ;;
i*86:Minix:*:*)
- echo "$UNAME_MACHINE"-pc-minix
+ echo ${UNAME_MACHINE}-pc-minix
exit ;;
aarch64:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
aarch64_be:Linux:*:*)
UNAME_MACHINE=aarch64_be
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -916,63 +931,63 @@ EOF
esac
objdump --private-headers /bin/sh | grep -q ld.so.1
if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
arc:Linux:*:* | arceb:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
arm*:Linux:*:*)
- eval "$set_cc_for_build"
+ eval $set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_EABI__
then
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
else
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_PCS_VFP
then
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
else
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
fi
fi
exit ;;
avr32*:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
cris:Linux:*:*)
- echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
crisv32:Linux:*:*)
- echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
e2k:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
frv:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
hexagon:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
i*86:Linux:*:*)
- echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-pc-linux-${LIBC}
exit ;;
ia64:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
k1om:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
m32r*:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
m68*:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
mips:Linux:*:* | mips64:Linux:*:*)
- eval "$set_cc_for_build"
- sed 's/^ //' << EOF > "$dummy.c"
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
#undef CPU
#undef ${UNAME_MACHINE}
#undef ${UNAME_MACHINE}el
@@ -986,74 +1001,70 @@ EOF
#endif
#endif
EOF
- eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
- test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
;;
mips64el:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
openrisc*:Linux:*:*)
- echo or1k-unknown-linux-"$LIBC"
+ echo or1k-unknown-linux-${LIBC}
exit ;;
or32:Linux:*:* | or1k*:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
padre:Linux:*:*)
- echo sparc-unknown-linux-"$LIBC"
+ echo sparc-unknown-linux-${LIBC}
exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-"$LIBC"
+ echo hppa64-unknown-linux-${LIBC}
exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
- PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
- *) echo hppa-unknown-linux-"$LIBC" ;;
+ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+ *) echo hppa-unknown-linux-${LIBC} ;;
esac
exit ;;
ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-"$LIBC"
+ echo powerpc64-unknown-linux-${LIBC}
exit ;;
ppc:Linux:*:*)
- echo powerpc-unknown-linux-"$LIBC"
+ echo powerpc-unknown-linux-${LIBC}
exit ;;
ppc64le:Linux:*:*)
- echo powerpc64le-unknown-linux-"$LIBC"
+ echo powerpc64le-unknown-linux-${LIBC}
exit ;;
ppcle:Linux:*:*)
- echo powerpcle-unknown-linux-"$LIBC"
+ echo powerpcle-unknown-linux-${LIBC}
exit ;;
riscv32:Linux:*:* | riscv64:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
- echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
exit ;;
sh64*:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
sh*:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
tile*:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
vax:Linux:*:*)
- echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-dec-linux-${LIBC}
exit ;;
x86_64:Linux:*:*)
- if objdump -f /bin/sh | grep -q elf32-x86-64; then
- echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
- else
- echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
- fi
+ echo ${UNAME_MACHINE}-pc-linux-${LIBC}
exit ;;
xtensa*:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1067,34 +1078,34 @@ EOF
# I am not positive that other SVR4 systems won't match this,
# I just have to hope. -- rms.
# Use sysv4.2uw... so that sysv4* matches it.
- echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
+ echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
exit ;;
i*86:OS/2:*:*)
# If we were able to find `uname', then EMX Unix compatibility
# is probably installed.
- echo "$UNAME_MACHINE"-pc-os2-emx
+ echo ${UNAME_MACHINE}-pc-os2-emx
exit ;;
i*86:XTS-300:*:STOP)
- echo "$UNAME_MACHINE"-unknown-stop
+ echo ${UNAME_MACHINE}-unknown-stop
exit ;;
i*86:atheos:*:*)
- echo "$UNAME_MACHINE"-unknown-atheos
+ echo ${UNAME_MACHINE}-unknown-atheos
exit ;;
i*86:syllable:*:*)
- echo "$UNAME_MACHINE"-pc-syllable
+ echo ${UNAME_MACHINE}-pc-syllable
exit ;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- echo i386-unknown-lynxos"$UNAME_RELEASE"
+ echo i386-unknown-lynxos${UNAME_RELEASE}
exit ;;
i*86:*DOS:*:*)
- echo "$UNAME_MACHINE"-pc-msdosdjgpp
+ echo ${UNAME_MACHINE}-pc-msdosdjgpp
exit ;;
- i*86:*:4.*:*)
- UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
+ i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+ UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
- echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
+ echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
else
- echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
+ echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
fi
exit ;;
i*86:*:5:[678]*)
@@ -1104,12 +1115,12 @@ EOF
*Pentium) UNAME_MACHINE=i586 ;;
*Pent*|*Celeron) UNAME_MACHINE=i686 ;;
esac
- echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
+ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
exit ;;
i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
- echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
+ echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
elif /bin/uname -X 2>/dev/null >/dev/null ; then
UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
@@ -1119,9 +1130,9 @@ EOF
&& UNAME_MACHINE=i686
(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
&& UNAME_MACHINE=i686
- echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
+ echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
else
- echo "$UNAME_MACHINE"-pc-sysv32
+ echo ${UNAME_MACHINE}-pc-sysv32
fi
exit ;;
pc:*:*:*)
@@ -1141,9 +1152,9 @@ EOF
exit ;;
i860:*:4.*:*) # i860-SVR4
if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
- echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
+ echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
else # Add other i860-SVR4 vendors below as they are discovered.
- echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4
+ echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
fi
exit ;;
mini*:CTIX:SYS*5:*)
@@ -1163,9 +1174,9 @@ EOF
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
&& { echo i486-ncr-sysv4; exit; } ;;
@@ -1174,28 +1185,28 @@ EOF
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
- && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- echo m68k-unknown-lynxos"$UNAME_RELEASE"
+ echo m68k-unknown-lynxos${UNAME_RELEASE}
exit ;;
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
exit ;;
TSUNAMI:LynxOS:2.*:*)
- echo sparc-unknown-lynxos"$UNAME_RELEASE"
+ echo sparc-unknown-lynxos${UNAME_RELEASE}
exit ;;
rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos"$UNAME_RELEASE"
+ echo rs6000-unknown-lynxos${UNAME_RELEASE}
exit ;;
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- echo powerpc-unknown-lynxos"$UNAME_RELEASE"
+ echo powerpc-unknown-lynxos${UNAME_RELEASE}
exit ;;
SM[BE]S:UNIX_SV:*:*)
- echo mips-dde-sysv"$UNAME_RELEASE"
+ echo mips-dde-sysv${UNAME_RELEASE}
exit ;;
RM*:ReliantUNIX-*:*:*)
echo mips-sni-sysv4
@@ -1206,7 +1217,7 @@ EOF
*:SINIX-*:*:*)
if uname -p 2>/dev/null >/dev/null ; then
UNAME_MACHINE=`(uname -p) 2>/dev/null`
- echo "$UNAME_MACHINE"-sni-sysv4
+ echo ${UNAME_MACHINE}-sni-sysv4
else
echo ns32k-sni-sysv
fi
@@ -1226,23 +1237,23 @@ EOF
exit ;;
i*86:VOS:*:*)
# From Paul.Green@stratus.com.
- echo "$UNAME_MACHINE"-stratus-vos
+ echo ${UNAME_MACHINE}-stratus-vos
exit ;;
*:VOS:*:*)
# From Paul.Green@stratus.com.
echo hppa1.1-stratus-vos
exit ;;
mc68*:A/UX:*:*)
- echo m68k-apple-aux"$UNAME_RELEASE"
+ echo m68k-apple-aux${UNAME_RELEASE}
exit ;;
news*:NEWS-OS:6*:*)
echo mips-sony-newsos6
exit ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
- echo mips-nec-sysv"$UNAME_RELEASE"
+ echo mips-nec-sysv${UNAME_RELEASE}
else
- echo mips-unknown-sysv"$UNAME_RELEASE"
+ echo mips-unknown-sysv${UNAME_RELEASE}
fi
exit ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
@@ -1261,39 +1272,39 @@ EOF
echo x86_64-unknown-haiku
exit ;;
SX-4:SUPER-UX:*:*)
- echo sx4-nec-superux"$UNAME_RELEASE"
+ echo sx4-nec-superux${UNAME_RELEASE}
exit ;;
SX-5:SUPER-UX:*:*)
- echo sx5-nec-superux"$UNAME_RELEASE"
+ echo sx5-nec-superux${UNAME_RELEASE}
exit ;;
SX-6:SUPER-UX:*:*)
- echo sx6-nec-superux"$UNAME_RELEASE"
+ echo sx6-nec-superux${UNAME_RELEASE}
exit ;;
SX-7:SUPER-UX:*:*)
- echo sx7-nec-superux"$UNAME_RELEASE"
+ echo sx7-nec-superux${UNAME_RELEASE}
exit ;;
SX-8:SUPER-UX:*:*)
- echo sx8-nec-superux"$UNAME_RELEASE"
+ echo sx8-nec-superux${UNAME_RELEASE}
exit ;;
SX-8R:SUPER-UX:*:*)
- echo sx8r-nec-superux"$UNAME_RELEASE"
+ echo sx8r-nec-superux${UNAME_RELEASE}
exit ;;
SX-ACE:SUPER-UX:*:*)
- echo sxace-nec-superux"$UNAME_RELEASE"
+ echo sxace-nec-superux${UNAME_RELEASE}
exit ;;
Power*:Rhapsody:*:*)
- echo powerpc-apple-rhapsody"$UNAME_RELEASE"
+ echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
*:Rhapsody:*:*)
- echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
+ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
exit ;;
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- eval "$set_cc_for_build"
+ eval $set_cc_for_build
if test "$UNAME_PROCESSOR" = unknown ; then
UNAME_PROCESSOR=powerpc
fi
- if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
+ if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
@@ -1321,7 +1332,7 @@ EOF
# that Apple uses in portable devices.
UNAME_PROCESSOR=x86_64
fi
- echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
UNAME_PROCESSOR=`uname -p`
@@ -1329,25 +1340,22 @@ EOF
UNAME_PROCESSOR=i386
UNAME_MACHINE=pc
fi
- echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
+ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
exit ;;
*:QNX:*:4*)
echo i386-pc-qnx
exit ;;
NEO-*:NONSTOP_KERNEL:*:*)
- echo neo-tandem-nsk"$UNAME_RELEASE"
+ echo neo-tandem-nsk${UNAME_RELEASE}
exit ;;
NSE-*:NONSTOP_KERNEL:*:*)
- echo nse-tandem-nsk"$UNAME_RELEASE"
+ echo nse-tandem-nsk${UNAME_RELEASE}
exit ;;
NSR-*:NONSTOP_KERNEL:*:*)
- echo nsr-tandem-nsk"$UNAME_RELEASE"
- exit ;;
- NSV-*:NONSTOP_KERNEL:*:*)
- echo nsv-tandem-nsk"$UNAME_RELEASE"
+ echo nsr-tandem-nsk${UNAME_RELEASE}
exit ;;
NSX-*:NONSTOP_KERNEL:*:*)
- echo nsx-tandem-nsk"$UNAME_RELEASE"
+ echo nsx-tandem-nsk${UNAME_RELEASE}
exit ;;
*:NonStop-UX:*:*)
echo mips-compaq-nonstopux
@@ -1356,7 +1364,7 @@ EOF
echo bs2000-siemens-sysv
exit ;;
DS/*:UNIX_System_V:*:*)
- echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
+ echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
exit ;;
*:Plan9:*:*)
# "uname -m" is not consistent, so use $cputype instead. 386
@@ -1367,7 +1375,7 @@ EOF
else
UNAME_MACHINE="$cputype"
fi
- echo "$UNAME_MACHINE"-unknown-plan9
+ echo ${UNAME_MACHINE}-unknown-plan9
exit ;;
*:TOPS-10:*:*)
echo pdp10-unknown-tops10
@@ -1388,14 +1396,14 @@ EOF
echo pdp10-unknown-its
exit ;;
SEI:*:*:SEIUX)
- echo mips-sei-seiux"$UNAME_RELEASE"
+ echo mips-sei-seiux${UNAME_RELEASE}
exit ;;
*:DragonFly:*:*)
- echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit ;;
*:*VMS:*:*)
UNAME_MACHINE=`(uname -p) 2>/dev/null`
- case "$UNAME_MACHINE" in
+ case "${UNAME_MACHINE}" in
A*) echo alpha-dec-vms ; exit ;;
I*) echo ia64-dec-vms ; exit ;;
V*) echo vax-dec-vms ; exit ;;
@@ -1404,44 +1412,32 @@ EOF
echo i386-pc-xenix
exit ;;
i*86:skyos:*:*)
- echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
exit ;;
i*86:rdos:*:*)
- echo "$UNAME_MACHINE"-pc-rdos
+ echo ${UNAME_MACHINE}-pc-rdos
exit ;;
i*86:AROS:*:*)
- echo "$UNAME_MACHINE"-pc-aros
+ echo ${UNAME_MACHINE}-pc-aros
exit ;;
x86_64:VMkernel:*:*)
- echo "$UNAME_MACHINE"-unknown-esx
+ echo ${UNAME_MACHINE}-unknown-esx
exit ;;
amd64:Isilon\ OneFS:*:*)
echo x86_64-unknown-onefs
exit ;;
esac
-echo "$0: unable to guess system type" >&2
-
-case "$UNAME_MACHINE:$UNAME_SYSTEM" in
- mips:Linux | mips64:Linux)
- # If we got here on MIPS GNU/Linux, output extra information.
- cat >&2 <<EOF
-
-NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
-the system type. Please install a C compiler and try again.
-EOF
- ;;
-esac
-
cat >&2 <<EOF
+$0: unable to guess system type
This script (version $timestamp), has failed to recognize the
operating system you are using. If your script is old, overwrite *all*
copies of config.guess and config.sub with the latest versions from:
- https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
and
- https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
If $0 has already been updated, send the following data and any
information you think might be pertinent to config-patches@gnu.org to
@@ -1464,16 +1460,16 @@ hostinfo = `(hostinfo) 2>/dev/null`
/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-UNAME_MACHINE = "$UNAME_MACHINE"
-UNAME_RELEASE = "$UNAME_RELEASE"
-UNAME_SYSTEM = "$UNAME_SYSTEM"
-UNAME_VERSION = "$UNAME_VERSION"
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
EOF
exit 1
# Local variables:
-# eval: (add-hook 'write-file-functions 'time-stamp)
+# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
diff --git a/config.sub b/config.sub
index 1d8e98bc..f4bafc18 100755
--- a/config.sub
+++ b/config.sub
@@ -1,8 +1,8 @@
-#! /bin/sh
+#!/bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2018 Free Software Foundation, Inc.
+# Copyright 1992-2017 Free Software Foundation, Inc.
-timestamp='2018-02-22'
+timestamp='2017-04-02'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@ timestamp='2018-02-22'
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <https://www.gnu.org/licenses/>.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -33,7 +33,7 @@ timestamp='2018-02-22'
# Otherwise, we print the canonical config type on stdout and succeed.
# You can get the latest version of this script from:
-# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
@@ -57,7 +57,7 @@ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
Canonicalize a configuration name.
-Options:
+Operation modes:
-h, --help print this help, then exit
-t, --time-stamp print date of last modification, then exit
-v, --version print version number, then exit
@@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2018 Free Software Foundation, Inc.
+Copyright 1992-2017 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -94,7 +94,7 @@ while test $# -gt 0 ; do
*local*)
# First pass through any local machine types.
- echo "$1"
+ echo $1
exit ;;
* )
@@ -112,7 +112,7 @@ esac
# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
@@ -120,16 +120,16 @@ case $maybe_os in
kopensolaris*-gnu* | cloudabi*-eabi* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
- basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
android-linux)
os=-linux-android
- basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
;;
*)
- basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
- if [ "$basic_machine" != "$1" ]
- then os=`echo "$1" | sed 's/.*-/-/'`
+ basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+ if [ $basic_machine != $1 ]
+ then os=`echo $1 | sed 's/.*-/-/'`
else os=; fi
;;
esac
@@ -178,44 +178,44 @@ case $os in
;;
-sco6)
os=-sco5v6
- basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-sco5)
os=-sco3.2v5
- basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-sco4)
os=-sco3.2v4
- basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-sco3.2.[4-9]*)
os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
- basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-sco3.2v[4-9]*)
# Don't forget version if it is 3.2v4 or newer.
- basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-sco5v6*)
# Don't forget version if it is 3.2v4 or newer.
- basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-sco*)
os=-sco3.2v2
- basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-udk*)
- basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-isc)
os=-isc2.2
- basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-clix*)
basic_machine=clipper-intergraph
;;
-isc*)
- basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-lynx*178)
os=-lynxos178
@@ -227,7 +227,10 @@ case $os in
os=-lynxos
;;
-ptx*)
- basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+ ;;
+ -windowsnt*)
+ os=`echo $os | sed -e 's/windowsnt/winnt/'`
;;
-psos*)
os=-psos
@@ -296,7 +299,7 @@ case $basic_machine in
| nios | nios2 | nios2eb | nios2el \
| ns16k | ns32k \
| open8 | or1k | or1knd | or32 \
- | pdp10 | pj | pjl \
+ | pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pru \
| pyramid \
@@ -313,6 +316,7 @@ case $basic_machine in
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| visium \
| wasm32 \
+ | we32k \
| x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
basic_machine=$basic_machine-unknown
@@ -333,7 +337,7 @@ case $basic_machine in
basic_machine=$basic_machine-unknown
os=-none
;;
- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
;;
ms1)
basic_machine=mt-unknown
@@ -362,7 +366,7 @@ case $basic_machine in
;;
# Object if more than one company name word.
*-*-*)
- echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
exit 1
;;
# Recognize the basic CPU types with company name.
@@ -457,7 +461,7 @@ case $basic_machine in
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
- basic_machine=i386-pc
+ basic_machine=i386-unknown
os=-bsd
;;
3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
@@ -491,7 +495,7 @@ case $basic_machine in
basic_machine=x86_64-pc
;;
amd64-*)
- basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
amdahl)
basic_machine=580-amdahl
@@ -536,7 +540,7 @@ case $basic_machine in
os=-linux
;;
blackfin-*)
- basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
bluegene*)
@@ -544,13 +548,13 @@ case $basic_machine in
os=-cnk
;;
c54x-*)
- basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
c55x-*)
- basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
c6x-*)
- basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
c90)
basic_machine=c90-cray
@@ -639,7 +643,7 @@ case $basic_machine in
basic_machine=rs6000-bull
os=-bosx
;;
- dpx2*)
+ dpx2* | dpx2*-bull)
basic_machine=m68k-bull
os=-sysv3
;;
@@ -648,7 +652,7 @@ case $basic_machine in
os=$os"spe"
;;
e500v[12]-*)
- basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
os=$os"spe"
;;
ebmon29k)
@@ -740,6 +744,9 @@ case $basic_machine in
hp9k8[0-9][0-9] | hp8[0-9][0-9])
basic_machine=hppa1.0-hp
;;
+ hppa-next)
+ os=-nextstep3
+ ;;
hppaosf)
basic_machine=hppa1.1-hp
os=-osf
@@ -752,26 +759,26 @@ case $basic_machine in
basic_machine=i370-ibm
;;
i*86v32)
- basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv32
;;
i*86v4*)
- basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv4
;;
i*86v)
- basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv
;;
i*86sol2)
- basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-solaris2
;;
i386mach)
basic_machine=i386-mach
os=-mach
;;
- vsta)
+ i386-vsta | vsta)
basic_machine=i386-unknown
os=-vsta
;;
@@ -790,16 +797,19 @@ case $basic_machine in
os=-sysv
;;
leon-*|leon[3-9]-*)
- basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
+ basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
;;
m68knommu)
basic_machine=m68k-unknown
os=-linux
;;
m68knommu-*)
- basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
+ m88k-omron*)
+ basic_machine=m88k-omron
+ ;;
magnum | m3230)
basic_machine=mips-mips
os=-sysv
@@ -831,10 +841,10 @@ case $basic_machine in
os=-mint
;;
mips3*-*)
- basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
;;
mips3*)
- basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
;;
monitor)
basic_machine=m68k-rom68k
@@ -853,7 +863,7 @@ case $basic_machine in
os=-msdos
;;
ms1-*)
- basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
;;
msys)
basic_machine=i686-pc
@@ -895,7 +905,7 @@ case $basic_machine in
basic_machine=v70-nec
os=-sysv
;;
- next | m*-next)
+ next | m*-next )
basic_machine=m68k-next
case $os in
-nextstep* )
@@ -940,9 +950,6 @@ case $basic_machine in
nsr-tandem)
basic_machine=nsr-tandem
;;
- nsv-tandem)
- basic_machine=nsv-tandem
- ;;
nsx-tandem)
basic_machine=nsx-tandem
;;
@@ -978,7 +985,7 @@ case $basic_machine in
os=-linux
;;
parisc-*)
- basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
pbd)
@@ -994,7 +1001,7 @@ case $basic_machine in
basic_machine=i386-pc
;;
pc98-*)
- basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pentium | p5 | k5 | k6 | nexgen | viac3)
basic_machine=i586-pc
@@ -1009,16 +1016,16 @@ case $basic_machine in
basic_machine=i786-pc
;;
pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
- basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pentiumpro-* | p6-* | 6x86-* | athlon-*)
- basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
- basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pentium4-*)
- basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pn)
basic_machine=pn-gould
@@ -1028,23 +1035,23 @@ case $basic_machine in
ppc | ppcbe) basic_machine=powerpc-unknown
;;
ppc-* | ppcbe-*)
- basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppcle | powerpclittle)
basic_machine=powerpcle-unknown
;;
ppcle-* | powerpclittle-*)
- basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppc64) basic_machine=powerpc64-unknown
;;
- ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppc64le | powerpc64little)
basic_machine=powerpc64le-unknown
;;
ppc64le-* | powerpc64little-*)
- basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ps2)
basic_machine=i386-ibm
@@ -1098,10 +1105,17 @@ case $basic_machine in
sequent)
basic_machine=i386-sequent
;;
+ sh)
+ basic_machine=sh-hitachi
+ os=-hms
+ ;;
sh5el)
basic_machine=sh5le-unknown
;;
- simso-wrs)
+ sh64)
+ basic_machine=sh64-unknown
+ ;;
+ sparclite-wrs | simso-wrs)
basic_machine=sparclite-wrs
os=-vxworks
;;
@@ -1120,7 +1134,7 @@ case $basic_machine in
os=-sysv4
;;
strongarm-* | thumb-*)
- basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
sun2)
basic_machine=m68000-sun
@@ -1234,6 +1248,9 @@ case $basic_machine in
basic_machine=a29k-wrs
os=-vxworks
;;
+ wasm32)
+ basic_machine=wasm32-unknown
+ ;;
w65*)
basic_machine=w65-wdc
os=-none
@@ -1242,9 +1259,6 @@ case $basic_machine in
basic_machine=hppa1.1-winbond
os=-proelf
;;
- x64)
- basic_machine=x86_64-pc
- ;;
xbox)
basic_machine=i686-pc
os=-mingw32
@@ -1253,12 +1267,20 @@ case $basic_machine in
basic_machine=xps100-honeywell
;;
xscale-* | xscalee[bl]-*)
- basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
;;
ymp)
basic_machine=ymp-cray
os=-unicos
;;
+ z8k-*-coff)
+ basic_machine=z8k-unknown
+ os=-sim
+ ;;
+ z80-*-coff)
+ basic_machine=z80-unknown
+ os=-sim
+ ;;
none)
basic_machine=none-none
os=-none
@@ -1287,6 +1309,10 @@ case $basic_machine in
vax)
basic_machine=vax-dec
;;
+ pdp10)
+ # there are many clones, so DEC is not a safe bet
+ basic_machine=pdp10-unknown
+ ;;
pdp11)
basic_machine=pdp11-dec
;;
@@ -1296,6 +1322,9 @@ case $basic_machine in
sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+ basic_machine=sparc-sun
+ ;;
cydra)
basic_machine=cydra-cydrome
;;
@@ -1315,7 +1344,7 @@ case $basic_machine in
# Make sure to match an already-canonicalized machine name.
;;
*)
- echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
exit 1
;;
esac
@@ -1323,10 +1352,10 @@ esac
# Here we canonicalize certain aliases for manufacturers.
case $basic_machine in
*-digital*)
- basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
+ basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
;;
*-commodore*)
- basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
+ basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
;;
*)
;;
@@ -1337,8 +1366,8 @@ esac
if [ x"$os" != x"" ]
then
case $os in
- # First match some system type aliases that might get confused
- # with valid system types.
+ # First match some system type aliases
+ # that might get confused with valid system types.
# -solaris* is a basic system type, with this one exception.
-auroraux)
os=-auroraux
@@ -1349,19 +1378,18 @@ case $os in
-solaris)
os=-solaris2
;;
+ -svr4*)
+ os=-sysv4
+ ;;
-unixware*)
os=-sysv4.2uw
;;
-gnu/linux*)
os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
;;
- # es1800 is here to avoid being matched by es* (a different OS)
- -es1800*)
- os=-ose
- ;;
- # Now accept the basic system types.
+ # First accept the basic system types.
# The portable systems comes first.
- # Each alternative MUST end in a * to match a version number.
+ # Each alternative MUST END IN A *, to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
@@ -1371,7 +1399,7 @@ case $os in
| -aos* | -aros* | -cloudabi* | -sortix* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
| -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
@@ -1382,15 +1410,14 @@ case $os in
| -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- | -morphos* | -superux* | -rtmk* | -windiss* \
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
- | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
- | -midnightbsd*)
+ | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1407,12 +1434,12 @@ case $os in
-nto*)
os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
- -sim | -xray | -os68k* | -v88r* \
- | -windows* | -osx | -abug | -netware* | -os9* \
+ -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
;;
-mac*)
- os=`echo "$os" | sed -e 's|mac|macos|'`
+ os=`echo $os | sed -e 's|mac|macos|'`
;;
-linux-dietlibc)
os=-linux-dietlibc
@@ -1421,10 +1448,10 @@ case $os in
os=`echo $os | sed -e 's|linux|linux-gnu|'`
;;
-sunos5*)
- os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
+ os=`echo $os | sed -e 's|sunos5|solaris2|'`
;;
-sunos6*)
- os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
+ os=`echo $os | sed -e 's|sunos6|solaris3|'`
;;
-opened*)
os=-openedition
@@ -1435,6 +1462,12 @@ case $os in
-wince*)
os=-wince
;;
+ -osfrose*)
+ os=-osfrose
+ ;;
+ -osf*)
+ os=-osf
+ ;;
-utek*)
os=-bsd
;;
@@ -1459,7 +1492,7 @@ case $os in
-nova*)
os=-rtmk-nova
;;
- -ns2)
+ -ns2 )
os=-nextstep2
;;
-nsk*)
@@ -1481,7 +1514,7 @@ case $os in
-oss*)
os=-sysv3
;;
- -svr4*)
+ -svr4)
os=-sysv4
;;
-svr3)
@@ -1496,28 +1529,24 @@ case $os in
-ose*)
os=-ose
;;
+ -es1800*)
+ os=-ose
+ ;;
+ -xenix)
+ os=-xenix
+ ;;
-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
os=-mint
;;
+ -aros*)
+ os=-aros
+ ;;
-zvmoe)
os=-zvmoe
;;
-dicos*)
os=-dicos
;;
- -pikeos*)
- # Until real need of OS specific support for
- # particular features comes up, bare metal
- # configurations are quite functional.
- case $basic_machine in
- arm*)
- os=-eabi
- ;;
- *)
- os=-elf
- ;;
- esac
- ;;
-nacl*)
;;
-ios)
@@ -1527,7 +1556,7 @@ case $os in
*)
# Get rid of the `-' at the beginning of $os.
os=`echo $os | sed 's/[^-]*-//'`
- echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
+ echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
exit 1
;;
esac
@@ -1623,6 +1652,9 @@ case $basic_machine in
*-be)
os=-beos
;;
+ *-haiku)
+ os=-haiku
+ ;;
*-ibm)
os=-aix
;;
@@ -1662,7 +1694,7 @@ case $basic_machine in
m88k-omron*)
os=-luna
;;
- *-next)
+ *-next )
os=-nextstep
;;
*-sequent)
@@ -1677,6 +1709,9 @@ case $basic_machine in
i370-*)
os=-mvs
;;
+ *-next)
+ os=-nextstep3
+ ;;
*-gould)
os=-sysv
;;
@@ -1786,15 +1821,15 @@ case $basic_machine in
vendor=stratus
;;
esac
- basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
+ basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
;;
esac
-echo "$basic_machine$os"
+echo $basic_machine$os
exit
# Local variables:
-# eval: (add-hook 'write-file-functions 'time-stamp)
+# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
diff --git a/configure b/configure
index b3af1750..74ff8139 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Zenity 3.28.1.
+# Generated by GNU Autoconf 2.69 for Zenity 3.30.0.
#
# Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=zenity>.
#
@@ -581,8 +581,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Zenity'
PACKAGE_TARNAME='zenity'
-PACKAGE_VERSION='3.28.1'
-PACKAGE_STRING='Zenity 3.28.1'
+PACKAGE_VERSION='3.30.0'
+PACKAGE_STRING='Zenity 3.30.0'
PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=zenity'
PACKAGE_URL=''
@@ -711,7 +711,6 @@ infodir
docdir
oldincludedir
includedir
-runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -809,7 +808,6 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1062,15 +1060,6 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
- -runstatedir | --runstatedir | --runstatedi | --runstated \
- | --runstate | --runstat | --runsta | --runst | --runs \
- | --run | --ru | --r)
- ac_prev=runstatedir ;;
- -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
- | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
- | --run=* | --ru=* | --r=*)
- runstatedir=$ac_optarg ;;
-
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1208,7 +1197,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir runstatedir
+ libdir localedir mandir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1321,7 +1310,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Zenity 3.28.1 to adapt to many kinds of systems.
+\`configure' configures Zenity 3.30.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1361,7 +1350,6 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -1392,7 +1380,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Zenity 3.28.1:";;
+ short | recursive ) echo "Configuration of Zenity 3.30.0:";;
esac
cat <<\_ACEOF
@@ -1524,7 +1512,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Zenity configure 3.28.1
+Zenity configure 3.30.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1704,7 +1692,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Zenity $as_me 3.28.1, which was
+It was created by Zenity $as_me 3.30.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2576,7 +2564,7 @@ fi
# Define the identity of the package.
PACKAGE='zenity'
- VERSION='3.28.1'
+ VERSION='3.30.0'
cat >>confdefs.h <<_ACEOF
@@ -7336,13 +7324,7 @@ install-help: $(_HELP_LC_FILES)
elif test "x$$lc" != "xC"; then \
if test "x$(YELP_LC_MEDIA_LINKS)" != "x"; then \
echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \
- dname="$$f"; \
- pars="../"; \
- while test "$$dname" != "." -a "$$dname" != "/"; do \
- pars="../$$pars"; \
- dname=$$(dirname "$$dname"); \
- done; \
- $(LN_S) -f $$pars"C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \
+ $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \
fi; \
fi; \
done; \
@@ -7919,7 +7901,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Zenity $as_me 3.28.1, which was
+This file was extended by Zenity $as_me 3.30.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7985,7 +7967,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Zenity config.status 3.28.1
+Zenity config.status 3.30.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 9dd3a946..63ca67a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Zenity],[3.28.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=zenity],[zenity])
+AC_INIT([Zenity],[3.30.0],[https://bugzilla.gnome.org/enter_bug.cgi?product=zenity],[zenity])
AC_PREREQ([2.63])
diff --git a/data/Makefile.in b/data/Makefile.in
index e7ac2d68..49ab81bb 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -287,7 +287,6 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
-runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/depcomp b/depcomp
index b39f98f9..30379e22 100755
--- a/depcomp
+++ b/depcomp
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
# depcomp - compile a program generating dependencies as side-effects
scriptversion=2016-01-11.22; # UTC
diff --git a/help/Makefile.in b/help/Makefile.in
index edb24988..7600f98e 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -253,7 +253,6 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
-runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/help/de/de.po b/help/de/de.po
index 7273d4cb..bcab67b8 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -1,21 +1,21 @@
# German translation of the zenity manual.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2008, 2009, 2011, 2012.
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2008-2009, 2011-2012, 2018.
# Christian Kirbach <Christian.Kirbach@gmail.com>, 2012.
# Wolfgang Stöggl <c72578@yahoo.de>, 2015.
#
msgid ""
msgstr ""
"Project-Id-Version: zenity master\n"
-"POT-Creation-Date: 2015-11-18 15:14+0000\n"
-"PO-Revision-Date: 2015-11-19 18:29+0100\n"
-"Last-Translator: Wolfgang Stoeggl <c72578@yahoo.de>\n"
+"POT-Creation-Date: 2018-09-07 11:06+0000\n"
+"PO-Revision-Date: 2018-09-18 13:04+0200\n"
+"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
"Language-Team: Deutsch <gnome-de@gnome.org>\n"
"Language: de_DE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.6\n"
+"X-Generator: Poedit 2.1.1\n"
#. (itstool) path: para/ulink
#: C/legal.xml:9
@@ -143,22 +143,6 @@ msgstr ""
"Mario Blättermann <mario.blaettermann@gmail.com>, 2008-2012\n"
"Christian Kirbach <Christian.Kirbach@gmail.com>, 2012"
-#. (itstool) path: media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/calendar.page:66
-#, fuzzy
-#| msgid ""
-#| "@@image: 'figures/zenity-calendar-screenshot.png'; "
-#| "md5=92bf5317d799665acf0d4005cee184c2"
-msgctxt "_"
-msgid ""
-"external ref='figures/zenity-calendar-screenshot.png' "
-"md5='92bf5317d799665acf0d4005cee184c2'"
-msgstr "translated"
-
#. (itstool) path: info/desc
#: C/calendar.page:6
msgid "Use the <cmd>--calendar</cmd> option."
@@ -298,21 +282,17 @@ msgstr "Beispiel für einen Kalenderdialog"
msgid "Zenity calendar dialog example"
msgstr "Beispiel für einen Kalenderdialog in <app>Zenity</app>"
-#. (itstool) path: media
+#. (itstool) path: figure/media
#. This is a reference to an external file such as an image or video. When
#. the file changes, the md5 hash will change to let you know you need to
#. update your localized copy. The msgstr is not used at all. Set it to
#. whatever you like once you have updated your copy of the file.
-#: C/color-selection.page:52
-#, fuzzy
-#| msgid ""
-#| "@@image: 'figures/zenity-fileselection-screenshot.png'; "
-#| "md5=bbba2652577f14ab4719f55a2ff57073"
+#: C/calendar.page:66
msgctxt "_"
msgid ""
-"external ref='figures/zenity-colorselection-screenshot.png' "
-"md5='febe3f417acea789c9db628fbe44f798'"
-msgstr "translated"
+"external ref='figures/zenity-calendar-screenshot.png' "
+"md5='92bf5317d799665acf0d4005cee184c2'"
+msgstr "translated'"
#. (itstool) path: info/desc
#: C/color-selection.page:6
@@ -408,20 +388,20 @@ msgstr "Beispiel für einen Farbauswahldialog"
msgid "<app>Zenity</app> color selection dialog example"
msgstr "Beispiel für einen Farbauswahldialog in <app>Zenity</app>"
-#. (itstool) path: media
+#. (itstool) path: figure/media
#. This is a reference to an external file such as an image or video. When
#. the file changes, the md5 hash will change to let you know you need to
#. update your localized copy. The msgstr is not used at all. Set it to
#. whatever you like once you have updated your copy of the file.
-#: C/entry.page:55
+#: C/color-selection.page:52
#, fuzzy
#| msgid ""
-#| "@@image: 'figures/zenity-calendar-screenshot.png'; "
-#| "md5=92bf5317d799665acf0d4005cee184c2"
+#| "@@image: 'figures/zenity-fileselection-screenshot.png'; "
+#| "md5=bbba2652577f14ab4719f55a2ff57073"
msgctxt "_"
msgid ""
-"external ref='figures/zenity-entry-screenshot.png' "
-"md5='bae6bf4342a66a3900deb15bde82ff42'"
+"external ref='figures/zenity-colorselection-screenshot.png' "
+"md5='febe3f417acea789c9db628fbe44f798'"
msgstr "translated"
#. (itstool) path: info/desc
@@ -519,20 +499,20 @@ msgstr "Beispiel für einen Texteingabe-Dialog"
msgid "<app>Zenity</app> text entry dialog example"
msgstr "Beispiel für einen Texteingabedialog in <app>Zenity</app>"
-#. (itstool) path: media
+#. (itstool) path: figure/media
#. This is a reference to an external file such as an image or video. When
#. the file changes, the md5 hash will change to let you know you need to
#. update your localized copy. The msgstr is not used at all. Set it to
#. whatever you like once you have updated your copy of the file.
-#: C/error.page:28
+#: C/entry.page:55
#, fuzzy
#| msgid ""
-#| "@@image: 'figures/zenity-error-screenshot.png'; "
-#| "md5=a4b287f89625cfd54ca38bc404d8bdf6"
+#| "@@image: 'figures/zenity-calendar-screenshot.png'; "
+#| "md5=92bf5317d799665acf0d4005cee184c2"
msgctxt "_"
msgid ""
-"external ref='figures/zenity-error-screenshot.png' "
-"md5='a4b287f89625cfd54ca38bc404d8bdf6'"
+"external ref='figures/zenity-entry-screenshot.png' "
+"md5='bae6bf4342a66a3900deb15bde82ff42'"
msgstr "translated"
#. (itstool) path: info/desc
@@ -584,21 +564,17 @@ msgstr "Beispiel für einen Fehlerdialog"
msgid "<app>Zenity</app> error dialog example"
msgstr "Beispiel für einen Fehlerdialog in <app>Zenity</app>"
-#. (itstool) path: media
+#. (itstool) path: figure/media
#. This is a reference to an external file such as an image or video. When
#. the file changes, the md5 hash will change to let you know you need to
#. update your localized copy. The msgstr is not used at all. Set it to
#. whatever you like once you have updated your copy of the file.
-#: C/file-selection.page:68
-#, fuzzy
-#| msgid ""
-#| "@@image: 'figures/zenity-fileselection-screenshot.png'; "
-#| "md5=bbba2652577f14ab4719f55a2ff57073"
+#: C/error.page:28
msgctxt "_"
msgid ""
-"external ref='figures/zenity-fileselection-screenshot.png' "
-"md5='bbba2652577f14ab4719f55a2ff57073'"
-msgstr "translated"
+"external ref='figures/zenity-error-screenshot.png' "
+"md5='a4b287f89625cfd54ca38bc404d8bdf6'"
+msgstr "translated'"
#. (itstool) path: info/desc
#: C/file-selection.page:6
@@ -620,7 +596,7 @@ msgstr ""
"Verwenden Sie die Option <cmd>--file-selection</cmd> zur Erzeugung eines "
"Dateiauswahldialogs. <app>Zenity</app> gibt die ausgewählten Dateien oder "
"Ordner an die Standardausgabe zurück. Der Standardmodus für den "
-"Dateiauswahldialog ist »Öffnen«. "
+"Dateiauswahldialog ist »Öffnen«."
#. (itstool) path: page/p
#: C/file-selection.page:13
@@ -735,21 +711,17 @@ msgstr "Beispiel für einen Dateiauswahldialog"
msgid "<app>Zenity</app> file selection dialog example"
msgstr "Beispiel für einen Dateiauswahldialog in <app>Zenity</app>"
-#. (itstool) path: media
+#. (itstool) path: figure/media
#. This is a reference to an external file such as an image or video. When
#. the file changes, the md5 hash will change to let you know you need to
#. update your localized copy. The msgstr is not used at all. Set it to
#. whatever you like once you have updated your copy of the file.
-#: C/forms.page:81
-#, fuzzy
-#| msgid ""
-#| "@@image: 'figures/zenity-error-screenshot.png'; "
-#| "md5=a4b287f89625cfd54ca38bc404d8bdf6"
+#: C/file-selection.page:68
msgctxt "_"
msgid ""
-"external ref='figures/zenity-forms-screenshot.png' "
-"md5='c11fab02e4d51212a538ce6859799d5f'"
-msgstr "translated"
+"external ref='figures/zenity-fileselection-screenshot.png' "
+"md5='bbba2652577f14ab4719f55a2ff57073'"
+msgstr "translated'"
#. (itstool) path: info/desc
#: C/forms.page:6
@@ -905,6 +877,22 @@ msgstr "Beispiel für einen Formulardialog"
msgid "<app>Zenity</app> forms dialog example"
msgstr "Beispiel für einen Formulardialog in <app>Zenity</app>"
+#. (itstool) path: figure/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/forms.page:81
+#, fuzzy
+#| msgid ""
+#| "@@image: 'figures/zenity-error-screenshot.png'; "
+#| "md5=a4b287f89625cfd54ca38bc404d8bdf6"
+msgctxt "_"
+msgid ""
+"external ref='figures/zenity-forms-screenshot.png' "
+"md5='c11fab02e4d51212a538ce6859799d5f'"
+msgstr "translated"
+
#. (itstool) path: credit/name
#: C/index.page:6
msgid "Sun Java Desktop System Documentation Team"
@@ -940,19 +928,6 @@ msgstr "Zenity-Handbuch"
msgid "Dialogs"
msgstr "Dialoge"
-#. (itstool) path: media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/info.page:28
-#, fuzzy
-msgctxt "_"
-msgid ""
-"external ref='figures/zenity-information-screenshot.png' "
-"md5='72386d53a991c46e918ee6dd22795aa6'"
-msgstr "translated"
-
#. (itstool) path: info/desc
#: C/info.page:6
msgid "Use the <cmd>--info</cmd> option."
@@ -1002,6 +977,18 @@ msgstr "Beispiel für einen Informationsdialog"
msgid "<app>Zenity</app> information dialog example"
msgstr "Beispiel für einen Informationsdialog in <app>Zenity</app>"
+#. (itstool) path: figure/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/info.page:28
+msgctxt "_"
+msgid ""
+"external ref='figures/zenity-information-screenshot.png' "
+"md5='72386d53a991c46e918ee6dd22795aa6'"
+msgstr "translated'"
+
#. (itstool) path: info/desc
#: C/intro.page:6
msgid ""
@@ -1103,19 +1090,6 @@ msgstr "Schieberegler"
msgid "Color selection"
msgstr "Farbauswahl"
-#. (itstool) path: media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/list.page:84
-#, fuzzy
-msgctxt "_"
-msgid ""
-"external ref='figures/zenity-list-screenshot.png' "
-"md5='8bd9ad9c760516a966d3590b2019fa1e'"
-msgstr "translated"
-
#. (itstool) path: info/desc
#: C/list.page:6
msgid "Use the <cmd>--list</cmd> option."
@@ -1277,6 +1251,18 @@ msgstr "Beispiel für einen Listendialog"
msgid "<app>Zenity</app> list dialog example"
msgstr "Beispiel für einen Listendialog in <app>Zenity</app>"
+#. (itstool) path: figure/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/list.page:84
+msgctxt "_"
+msgid ""
+"external ref='figures/zenity-list-screenshot.png' "
+"md5='8bd9ad9c760516a966d3590b2019fa1e'"
+msgstr "translated'"
+
#. (itstool) path: info/desc
#: C/message.page:6
msgid ""
@@ -1300,32 +1286,6 @@ msgstr ""
"Für jeden dieser Typen geben Sie mit der Option <cmd>--text</cmd> an, "
"welcher Text im Dialog angezeigt werden soll."
-#. (itstool) path: media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/notification.page:37
-#, fuzzy
-msgctxt "_"
-msgid ""
-"external ref='figures/zenity-notification-screenshot.png' "
-"md5='49ebe82aa255c5536d018f2b4f919c51'"
-msgstr "translated"
-
-#. (itstool) path: media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/notification.page:51
-#, fuzzy
-msgctxt "_"
-msgid ""
-"external ref='figures/zenity-notification-listen-screenshot.png' "
-"md5='e7e6edba1c794426c4ce749bc355b25d'"
-msgstr "translated"
-
#. (itstool) path: info/desc
#: C/notification.page:6
msgid "Use the <cmd>--notification</cmd> option."
@@ -1416,6 +1376,18 @@ msgstr "Beispiel für ein Benachrichtigungssymbol"
msgid "<app>Zenity</app> notification icon example"
msgstr "Beispiel für ein Benachrichtigungssymbol in <app>Zenity</app>"
+#. (itstool) path: figure/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/notification.page:37
+msgctxt "_"
+msgid ""
+"external ref='figures/zenity-notification-screenshot.png' "
+"md5='49ebe82aa255c5536d018f2b4f919c51'"
+msgstr "translated'"
+
#. (itstool) path: page/p
#: C/notification.page:40
msgid ""
@@ -1455,20 +1427,17 @@ msgstr ""
"Beispiel für ein Benachrichtigungssymbol mit <cmd>--listen</cmd> in "
"<app>Zenity</app>"
-#. (itstool) path: media
+#. (itstool) path: figure/media
#. This is a reference to an external file such as an image or video. When
#. the file changes, the md5 hash will change to let you know you need to
#. update your localized copy. The msgstr is not used at all. Set it to
#. whatever you like once you have updated your copy of the file.
-#: C/password.page:47
+#: C/notification.page:51
#, fuzzy
-#| msgid ""
-#| "@@image: 'figures/zenity-error-screenshot.png'; "
-#| "md5=a4b287f89625cfd54ca38bc404d8bdf6"
msgctxt "_"
msgid ""
-"external ref='figures/zenity-password-screenshot.png' "
-"md5='6adbeb624a307f78072593d6d1c6def6'"
+"external ref='figures/zenity-notification-listen-screenshot.png' "
+"md5='e7e6edba1c794426c4ce749bc355b25d'"
msgstr "translated"
#. (itstool) path: info/desc
@@ -1557,21 +1526,17 @@ msgstr "Beispiel für einen Passworteingabe-Dialog"
msgid "<app>Zenity</app> password entry dialog example"
msgstr "Beispiel für einen Texteingabedialog in <app>Zenity</app>"
-#. (itstool) path: media
+#. (itstool) path: figure/media
#. This is a reference to an external file such as an image or video. When
#. the file changes, the md5 hash will change to let you know you need to
#. update your localized copy. The msgstr is not used at all. Set it to
#. whatever you like once you have updated your copy of the file.
-#: C/progress.page:77
-#, fuzzy
-#| msgid ""
-#| "@@image: 'figures/zenity-progress-screenshot.png'; "
-#| "md5=75121bbbcb9cc92de4ebf7fbb92f0780"
+#: C/password.page:47
msgctxt "_"
msgid ""
-"external ref='figures/zenity-progress-screenshot.png' "
-"md5='75121bbbcb9cc92de4ebf7fbb92f0780'"
-msgstr "translated"
+"external ref='figures/zenity-password-screenshot.png' "
+"md5='6adbeb624a307f78072593d6d1c6def6'"
+msgstr "translated'"
#. (itstool) path: info/desc
#: C/progress.page:6
@@ -1715,21 +1680,17 @@ msgstr "Beispiel für einen Fortschrittsanzeige-Dialog"
msgid "<app>Zenity</app> progress dialog example"
msgstr "Beispiel für einen Fortschrittsanzeige-Dialog in <app>Zenity</app>"
-#. (itstool) path: media
+#. (itstool) path: figure/media
#. This is a reference to an external file such as an image or video. When
#. the file changes, the md5 hash will change to let you know you need to
#. update your localized copy. The msgstr is not used at all. Set it to
#. whatever you like once you have updated your copy of the file.
-#: C/question.page:28
-#, fuzzy
-#| msgid ""
-#| "@@image: 'figures/zenity-question-screenshot.png'; "
-#| "md5=5889e2a57b9d1885f22977587a269610"
+#: C/progress.page:77
msgctxt "_"
msgid ""
-"external ref='figures/zenity-question-screenshot.png' "
-"md5='5889e2a57b9d1885f22977587a269610'"
-msgstr "translated"
+"external ref='figures/zenity-progress-screenshot.png' "
+"md5='75121bbbcb9cc92de4ebf7fbb92f0780'"
+msgstr "translated'"
#. (itstool) path: info/desc
#: C/question.page:6
@@ -1779,21 +1740,17 @@ msgstr "Beispiel für einen Fragedialog"
msgid "<app>Zenity</app> question dialog example"
msgstr "Beispiel für einen Fragedialog in <app>Zenity</app>"
-#. (itstool) path: media
+#. (itstool) path: figure/media
#. This is a reference to an external file such as an image or video. When
#. the file changes, the md5 hash will change to let you know you need to
#. update your localized copy. The msgstr is not used at all. Set it to
#. whatever you like once you have updated your copy of the file.
-#: C/scale.page:77
-#, fuzzy
-#| msgid ""
-#| "@@image: 'figures/zenity-calendar-screenshot.png'; "
-#| "md5=92bf5317d799665acf0d4005cee184c2"
+#: C/question.page:28
msgctxt "_"
msgid ""
-"external ref='figures/zenity-scale-screenshot.png' "
-"md5='d44259a5b5b6e6ba0aceffd8501d0873'"
-msgstr "translated"
+"external ref='figures/zenity-question-screenshot.png' "
+"md5='5889e2a57b9d1885f22977587a269610'"
+msgstr "translated'"
#. (itstool) path: info/desc
#: C/scale.page:6
@@ -1937,17 +1894,20 @@ msgstr "Beispiel für einen Schiebereglerdialog"
msgid "<app>Zenity</app> scale dialog example"
msgstr "Beispiel für einen Schiebereglerdialog in <app>Zenity</app>"
-#. (itstool) path: media
+#. (itstool) path: figure/media
#. This is a reference to an external file such as an image or video. When
#. the file changes, the md5 hash will change to let you know you need to
#. update your localized copy. The msgstr is not used at all. Set it to
#. whatever you like once you have updated your copy of the file.
-#: C/text.page:83
+#: C/scale.page:77
#, fuzzy
+#| msgid ""
+#| "@@image: 'figures/zenity-calendar-screenshot.png'; "
+#| "md5=92bf5317d799665acf0d4005cee184c2"
msgctxt "_"
msgid ""
-"external ref='figures/zenity-text-screenshot.png' "
-"md5='79446b388fa6c3c3a619c8d6565b9f61'"
+"external ref='figures/zenity-scale-screenshot.png' "
+"md5='d44259a5b5b6e6ba0aceffd8501d0873'"
msgstr "translated"
#. (itstool) path: info/desc
@@ -2101,6 +2061,18 @@ msgstr "Beispiel für einen Text-Informationsdialog"
msgid "<app>Zenity</app> text information dialog example"
msgstr "Beispiel für einen Textinformationsdialog in <app>Zenity</app>"
+#. (itstool) path: figure/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/text.page:83
+msgctxt "_"
+msgid ""
+"external ref='figures/zenity-text-screenshot.png' "
+"md5='79446b388fa6c3c3a619c8d6565b9f61'"
+msgstr "translated'"
+
#. (itstool) path: info/desc
#: C/usage.page:6
msgid ""
@@ -2223,7 +2195,7 @@ msgstr ""
"Einige <app>Zenity</app>-Dialoge unterstützen die Verwendung von "
"Zugriffstasten. Um das Zeichen für den Tastaturzugriff festzulegen, setzen "
"Sie einen Unterstrich vor das Zeichen im Dialogtext. Das folgende Beispiel "
-"zeigt, wie Sie den Buchstaben »W« als Zugriffstaste festlegen."
+"zeigt, wie Sie den Buchstaben »W« als Zugriffstaste festlegen:"
#. (itstool) path: section/screen
#: C/usage.page:49
@@ -2609,22 +2581,6 @@ msgstr ""
"Verhalten kann deaktiviert werden, wenn Sie das Setzen der Umgebungsvariable "
"<var>WINDOWID</var> deaktivieren."
-#. (itstool) path: media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/warning.page:28
-#, fuzzy
-#| msgid ""
-#| "@@image: 'figures/zenity-warning-screenshot.png'; "
-#| "md5=146ea22fcd7104b2f9ed7ca0cc25f51d"
-msgctxt "_"
-msgid ""
-"external ref='figures/zenity-warning-screenshot.png' "
-"md5='146ea22fcd7104b2f9ed7ca0cc25f51d'"
-msgstr "translated"
-
#. (itstool) path: info/desc
#: C/warning.page:6
msgid "Use the <cmd>--warning</cmd> option."
@@ -2664,41 +2620,23 @@ msgstr ""
"--text=\"Ziehen Sie den Netzstecker, um einen elektrischen Schlag zu vermeiden.\"\n"
#. (itstool) path: figure/title
-#: C/warning.page:26
+#: C/warning.page:25
msgid "Warning Dialog Example"
msgstr "Beispiel für einen Warndialog"
#. (itstool) path: figure/desc
-#: C/warning.page:27
+#: C/warning.page:26
msgid "<app>Zenity</app> warning dialog example"
msgstr "Beispiel für einen Warndialog in <app>Zenity</app>"
-#~ msgid "0"
-#~ msgstr "0"
-
-#~ msgid "1"
-#~ msgstr "1"
-
-#~ msgid "-1"
-#~ msgstr "-1"
-
-#~ msgid "5"
-#~ msgstr "5"
-
-#~ msgid "--help"
-#~ msgstr "--help"
-
-#~ msgid "--about"
-#~ msgstr "--about"
-
-#~ msgid "--version"
-#~ msgstr "--version"
-
-#~ msgid "--html"
-#~ msgstr "--html"
-
-#~ msgid "yasumichi@vinelinux.org"
-#~ msgstr "yasumichi@vinelinux.org"
-
-#~ msgid "--save"
-#~ msgstr "--save"
+#. (itstool) path: figure/media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/warning.page:27
+msgctxt "_"
+msgid ""
+"external ref='figures/zenity-warning-screenshot.png' "
+"md5='146ea22fcd7104b2f9ed7ca0cc25f51d'"
+msgstr "translated'"
diff --git a/help/de/figures/zenity-calendar-screenshot.png b/help/de/figures/zenity-calendar-screenshot.png
index 544fa698..af090635 100644
--- a/help/de/figures/zenity-calendar-screenshot.png
+++ b/help/de/figures/zenity-calendar-screenshot.png
Binary files differ
diff --git a/help/de/figures/zenity-error-screenshot.png b/help/de/figures/zenity-error-screenshot.png
index 0a57fb7b..004ba4c5 100644
--- a/help/de/figures/zenity-error-screenshot.png
+++ b/help/de/figures/zenity-error-screenshot.png
Binary files differ
diff --git a/help/de/figures/zenity-fileselection-screenshot.png b/help/de/figures/zenity-fileselection-screenshot.png
index 2fab046d..df98e379 100644
--- a/help/de/figures/zenity-fileselection-screenshot.png
+++ b/help/de/figures/zenity-fileselection-screenshot.png
Binary files differ
diff --git a/help/de/figures/zenity-information-screenshot.png b/help/de/figures/zenity-information-screenshot.png
index 4c1a3dec..39904e11 100644
--- a/help/de/figures/zenity-information-screenshot.png
+++ b/help/de/figures/zenity-information-screenshot.png
Binary files differ
diff --git a/help/de/figures/zenity-list-screenshot.png b/help/de/figures/zenity-list-screenshot.png
index 10d03867..b7474c7d 100644
--- a/help/de/figures/zenity-list-screenshot.png
+++ b/help/de/figures/zenity-list-screenshot.png
Binary files differ
diff --git a/help/de/figures/zenity-notification-screenshot.png b/help/de/figures/zenity-notification-screenshot.png
index dfb4e437..87fab30f 100644
--- a/help/de/figures/zenity-notification-screenshot.png
+++ b/help/de/figures/zenity-notification-screenshot.png
Binary files differ
diff --git a/help/de/figures/zenity-progress-screenshot.png b/help/de/figures/zenity-progress-screenshot.png
index a6f58a36..6fc12879 100644
--- a/help/de/figures/zenity-progress-screenshot.png
+++ b/help/de/figures/zenity-progress-screenshot.png
Binary files differ
diff --git a/help/de/figures/zenity-question-screenshot.png b/help/de/figures/zenity-question-screenshot.png
index 2485c91f..5ebc4e34 100644
--- a/help/de/figures/zenity-question-screenshot.png
+++ b/help/de/figures/zenity-question-screenshot.png
Binary files differ
diff --git a/help/de/figures/zenity-text-screenshot.png b/help/de/figures/zenity-text-screenshot.png
index a724c18f..0e3cda77 100644
--- a/help/de/figures/zenity-text-screenshot.png
+++ b/help/de/figures/zenity-text-screenshot.png
Binary files differ
diff --git a/help/de/figures/zenity-warning-screenshot.png b/help/de/figures/zenity-warning-screenshot.png
index b6399c70..cd1b0620 100644
--- a/help/de/figures/zenity-warning-screenshot.png
+++ b/help/de/figures/zenity-warning-screenshot.png
Binary files differ
diff --git a/help/de/file-selection.page b/help/de/file-selection.page
index 1d6d179f..0811d921 100644
--- a/help/de/file-selection.page
+++ b/help/de/file-selection.page
@@ -17,7 +17,7 @@
</mal:credit>
</info>
<title>Dateiauswahldialog</title>
- <p>Verwenden Sie die Option <cmd>--file-selection</cmd> zur Erzeugung eines Dateiauswahldialogs. <app>Zenity</app> gibt die ausgewählten Dateien oder Ordner an die Standardausgabe zurück. Der Standardmodus für den Dateiauswahldialog ist »Öffnen«. </p>
+ <p>Verwenden Sie die Option <cmd>--file-selection</cmd> zur Erzeugung eines Dateiauswahldialogs. <app>Zenity</app> gibt die ausgewählten Dateien oder Ordner an die Standardausgabe zurück. Der Standardmodus für den Dateiauswahldialog ist »Öffnen«.</p>
<p>Der Dateiauswahldialog unterstützt die folgenden Optionen:</p>
<terms>
diff --git a/help/de/usage.page b/help/de/usage.page
index 20cac6dd..bdbf0441 100644
--- a/help/de/usage.page
+++ b/help/de/usage.page
@@ -40,7 +40,7 @@
<section id="zenity-usage-mnemonics">
<title>Zugriffstasten</title>
<p>Eine Zugriffstaste ist eine Taste, die Ihnen die Ausführung einer Aktion mit der Tastatur zur Auswahl eines Befehls aus einem Menü oder einem Dialog erlaubt, anstatt dafür die Maus zu benutzen.</p>
- <p>Einige <app>Zenity</app>-Dialoge unterstützen die Verwendung von Zugriffstasten. Um das Zeichen für den Tastaturzugriff festzulegen, setzen Sie einen Unterstrich vor das Zeichen im Dialogtext. Das folgende Beispiel zeigt, wie Sie den Buchstaben »W« als Zugriffstaste festlegen.</p>
+ <p>Einige <app>Zenity</app>-Dialoge unterstützen die Verwendung von Zugriffstasten. Um das Zeichen für den Tastaturzugriff festzulegen, setzen Sie einen Unterstrich vor das Zeichen im Dialogtext. Das folgende Beispiel zeigt, wie Sie den Buchstaben »W« als Zugriffstaste festlegen:</p>
<screen><input>"_Wählen Sie einen Namen".</input></screen>
</section>
diff --git a/install-sh b/install-sh
index 59990a10..0360b79e 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2014-09-12.12; # UTC
+scriptversion=2016-01-11.22; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -324,41 +324,34 @@ do
# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
;;
*)
- # $RANDOM is not portable (e.g. dash); use it when possible to
- # lower collision chance
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
- trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
- # As "mkdir -p" follows symlinks and we work in /tmp possibly; so
- # create the $tmpdir first (and fail if unsuccessful) to make sure
- # that nobody tries to guess the $tmpdir name.
if (umask $mkdir_umask &&
- $mkdirprog $mkdir_mode "$tmpdir" &&
- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
then
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
# other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
- test_tmpdir="$tmpdir/a"
- ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
+ ls_ld_tmpdir=`ls -ld "$tmpdir"`
case $ls_ld_tmpdir in
d????-?r-*) different_mode=700;;
d????-?--*) different_mode=755;;
*) false;;
esac &&
- $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
- ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
}
}
then posix_mkdir=:
fi
- rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
+ rmdir "$tmpdir/d" "$tmpdir"
else
# Remove any dirs left behind by ancient mkdir implementations.
- rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
fi
trap '' 0;;
esac;;
@@ -503,6 +496,6 @@ done
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff --git a/missing b/missing
index f62bbae3..b7e571ef 100755
--- a/missing
+++ b/missing
@@ -1,9 +1,9 @@
-#! /bin/sh
+#!/bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2013-10-28.13; # UTC
+scriptversion=2016-01-11.22; # UTC
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -210,6 +210,6 @@ exit $st
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff --git a/po/Makevars b/po/Makevars
index d85e044d..ac406bb9 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -18,7 +18,7 @@ XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2
# or entity, or to disclaim their copyright. The empty string stands for
# the public domain; in this case the translators are expected to disclaim
# their copyright.
-COPYRIGHT_HOLDER = Zenity contributors
+COPYRIGHT_HOLDER = Zenity authors
# This tells whether or not to prepend "GNU " prefix to the package
# name that gets inserted into the header of the $(DOMAIN).pot file.
@@ -41,7 +41,7 @@ PACKAGE_GNU = no
# It can be your email address, or a mailing list address where translators
# can write to without being subscribed, or the URL of a web page through
# which the translators can contact you.
-MSGID_BUGS_ADDRESS = https://bugzilla.gnome.org/enter_bug.cgi?product=zenity&keywords=I18N+L10N&component=general
+MSGID_BUGS_ADDRESS = https://gitlab.gnome.org/GNOME/zenity/issues
# This is the list of locale categories, beyond LC_MESSAGES, for which the
# message catalogs shall be used. It is usually empty.
@@ -51,7 +51,7 @@ EXTRA_LOCALE_CATEGORIES =
# context. Possible values are "yes" and "no". Set this to yes if the
# package uses functions taking also a message context, like pgettext(), or
# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
-USE_MSGCTXT = no
+USE_MSGCTXT = yes
# These options get passed to msgmerge.
# Useful options are in particular:
diff --git a/po/af.gmo b/po/af.gmo
index 75c75f86..afdcb692 100644
--- a/po/af.gmo
+++ b/po/af.gmo
Binary files differ
diff --git a/po/am.gmo b/po/am.gmo
index ceb160c1..e9a8db89 100644
--- a/po/am.gmo
+++ b/po/am.gmo
Binary files differ
diff --git a/po/ar.gmo b/po/ar.gmo
index 7922af6d..54e31e03 100644
--- a/po/ar.gmo
+++ b/po/ar.gmo
Binary files differ
diff --git a/po/as.gmo b/po/as.gmo
index 18ba6d1a..3c4eedd2 100644
--- a/po/as.gmo
+++ b/po/as.gmo
Binary files differ
diff --git a/po/ast.gmo b/po/ast.gmo
index 914de1ee..a2efdd37 100644
--- a/po/ast.gmo
+++ b/po/ast.gmo
Binary files differ
diff --git a/po/az.gmo b/po/az.gmo
index aebc7f83..cbde5444 100644
--- a/po/az.gmo
+++ b/po/az.gmo
Binary files differ
diff --git a/po/be.gmo b/po/be.gmo
index 8674010f..decc2243 100644
--- a/po/be.gmo
+++ b/po/be.gmo
Binary files differ
diff --git a/po/be.po b/po/be.po
index b20bcce3..fd90fe91 100644
--- a/po/be.po
+++ b/po/be.po
@@ -5,19 +5,18 @@
msgid ""
msgstr ""
"Project-Id-Version: zenity.master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
-"product=zenity&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-03-07 19:41+0000\n"
-"PO-Revision-Date: 2017-04-15 19:43+0300\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/zenity/issues\n"
+"POT-Creation-Date: 2018-06-10 18:57+0000\n"
+"PO-Revision-Date: 2018-09-07 14:04+0300\n"
"Last-Translator: Yuras Shumovich <shumovichy@gmail.com>\n"
"Language-Team: Belarusian <i18n-bel-gnome@googlegroups.com>\n"
"Language: be\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 2.1.1\n"
-#: src/about.c:63
+#: src/about.c:60
msgid ""
"This program is free software; you can redistribute it and/or modify it "
"under the terms of the GNU Lesser General Public License as published by the "
@@ -29,7 +28,7 @@ msgstr ""
"апублікаванай Фондам свабоднага апраграмавання, версіі 2 ці любой "
"пазнейшай.\n"
-#: src/about.c:67
+#: src/about.c:65
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -41,7 +40,7 @@ msgstr ""
"карысці. Падрабязней глядзіце ў тэксце Абмежаванай Агульнай Грамадскай "
"Ліцэнзіі GNU (LGPL).\n"
-#: src/about.c:71
+#: src/about.c:69
msgid ""
"You should have received a copy of the GNU Lesser General Public License "
"along with this program; if not, write to the Free Software Foundation, "
@@ -52,28 +51,44 @@ msgstr ""
"Фонду свабоднага апраграмавання на адрас: the Free Software Foundation, "
"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-#: src/about.c:263
+#: src/about.c:260
msgid "translator-credits"
msgstr ""
"Аляксандр Няхайчык <nab@mail.by>\n"
"Ihar Hrachyshka <ihar.hrachyshka@gmail.com>\n"
"Юрась Шумовіч <shumovichy@gmail.com>"
-#: src/about.c:275
+#: src/about.c:277
msgid "Display dialog boxes from shell scripts"
msgstr "Паказ дыялогавых акенцаў для сцэнарыяў праграмнай абалонкі"
+#: src/fileselection.c:62 src/fileselection.c:76 src/password.c:60
+msgid "_OK"
+msgstr "_Добра"
+
+#: src/fileselection.c:63 src/fileselection.c:74 src/password.c:57
+msgid "_Cancel"
+msgstr "_Скасаваць"
+
#: src/main.c:105
msgid "You must specify a dialog type. See 'zenity --help' for details\n"
msgstr ""
"Трэба вызначыць тып дыялогавага акенца. Падрабязней глядзіце, выканаўшы "
"\"zenity --help\"\n"
-#: src/notification.c:51
+#: src/msg.c:38
+msgid "_No"
+msgstr "_Не"
+
+#: src/msg.c:40
+msgid "_Yes"
+msgstr "_Так"
+
+#: src/notification.c:50
msgid "Could not parse message\n"
msgstr "Не ўдалося разабраць паведамленне\n"
-#: src/notification.c:140
+#: src/notification.c:132
msgid ""
"Invalid value for a boolean typed hint.\n"
"Supported values are 'true' or 'false'.\n"
@@ -82,299 +97,171 @@ msgstr ""
"Магчымыя значэнні: \"true\" і \"false\".\n"
#. (iibiiay)
-#: src/notification.c:156
+#: src/notification.c:149
msgid "Unsupported hint. Skipping.\n"
msgstr "Падказва без падтрымкі. Прапускаем.\n"
#. unknown hints
-#: src/notification.c:173
+#: src/notification.c:166
msgid "Unknown hint name. Skipping.\n"
msgstr "Невядомая назва падказкі. Прапускаем.\n"
-#: src/notification.c:228
+#: src/notification.c:218
msgid "Could not parse command from stdin\n"
msgstr "Не ўдалося разабраць загад на стандартным уваходзе\n"
-#: src/notification.c:326
+#: src/notification.c:318
msgid "Zenity notification"
msgstr "Апавяшчэнне Zenity"
-#: src/password.c:55
-msgid "_Cancel"
-msgstr "_Скасаваць"
-
-#: src/password.c:58
-msgid "_OK"
-msgstr "_Добра"
-
-#. Checks if username has been passed as a parameter
-#: src/password.c:73
-msgid "Type your password"
-msgstr "Упішыце ваш пароль"
-
-#: src/password.c:76
-msgid "Type your username and password"
-msgstr "Упішыце ваш імя карыстальніка і пароль"
-
-#: src/password.c:113
-msgid "Username:"
-msgstr "Імя карыстальніка:"
-
-#: src/password.c:127
-msgid "Password:"
-msgstr "Пароль:"
-
-#: src/scale.c:57
-msgid "Maximum value must be greater than minimum value.\n"
-msgstr "Максімальнае значэнне мусіць быць большым за мінімальнае.\n"
-
-#: src/scale.c:64
-msgid "Value out of range.\n"
-msgstr "Значэнне па-за дыяпазонам.\n"
-
-#: src/tree.c:376
-msgid "No column titles specified for List dialog.\n"
-msgstr "Для дыялогавага акенца са спісам не вызначаны назвы слупкоў.\n"
-
-#: src/tree.c:382
-msgid "You should use only one List dialog type.\n"
-msgstr "Можна ўжыць толькі адзін тып дыялогавага акенца са спісам.\n"
-
-#: src/zenity.ui:14 src/zenity.ui:76
-msgid "Adjust the scale value"
-msgstr "Падстройка маштабавання"
-
-#: src/zenity.ui:30 src/zenity.ui:135 src/zenity.ui:247 src/zenity.ui:378
-#: src/zenity.ui:578 src/zenity.ui:784 src/zenity.ui:970
-msgid "Cancel"
-msgstr "Скасаваць"
-
-#: src/zenity.ui:44 src/zenity.ui:148 src/zenity.ui:261 src/zenity.ui:392
-#: src/zenity.ui:481 src/zenity.ui:591 src/zenity.ui:697 src/zenity.ui:798
-#: src/zenity.ui:984 src/zenity.ui:1080
-msgid "OK"
-msgstr "Добра"
-
-#: src/zenity.ui:117
-msgid "Text View"
-msgstr "Прагляд тэксту"
-
-#: src/zenity.ui:231
-msgid "Calendar selection"
-msgstr "Выбар даты"
-
-#: src/zenity.ui:298
-msgid "Select a date from below."
-msgstr "Выберыце дату."
-
-#: src/zenity.ui:319
-msgid "C_alendar:"
-msgstr "_Каляндар:"
-
-#: src/zenity.ui:361
-msgid "Add a new entry"
-msgstr "Даданне новага запісу"
-
-#: src/zenity.ui:428
-msgid "_Enter new text:"
-msgstr "_Упішыце новы тэкст:"
-
-#: src/zenity.ui:465
-msgid "Error"
-msgstr "Памылка"
-
-#: src/zenity.ui:530
-msgid "An error has occurred."
-msgstr "Узнікла памылка."
-
-#: src/zenity.ui:658
-msgid "Forms dialog"
-msgstr "Дыялог форм"
-
-#: src/zenity.ui:681
-msgid "Information"
-msgstr "Інфармацыя"
-
-#: src/zenity.ui:741
-msgid "All updates are complete."
-msgstr "Усе абнаўленні скончаны."
-
-#: src/zenity.ui:768
-msgid "Progress"
-msgstr "Цячэнне працэсу"
-
-#: src/zenity.ui:831
-msgid "Running..."
-msgstr "Выкананне..."
-
-#: src/zenity.ui:882
-msgid "Question"
-msgstr "Пытанне"
-
-#: src/zenity.ui:929 src/zenity.ui:1126
-msgid "Are you sure you want to proceed?"
-msgstr "Ці вы насамрэч хочаце працягнуць?"
-
-#: src/zenity.ui:953
-msgid "Select items from the list"
-msgstr "Выбар элементаў са спіса"
-
-#: src/zenity.ui:1015
-msgid "Select items from the list below."
-msgstr "Выберыце элементы са спіса."
-
-#: src/zenity.ui:1064
-msgid "Warning"
-msgstr "Перасцярога"
-
-#: src/option.c:169
+#: src/option.c:164
msgid "Set the dialog title"
msgstr "Настроіць загаловак дыялогавага акенца"
-#: src/option.c:170
+#: src/option.c:165
msgid "TITLE"
msgstr "ЗАГАЛОВАК"
-#: src/option.c:178
+#: src/option.c:171
msgid "Set the window icon"
msgstr "Настроіць значок акна"
-#: src/option.c:179
+#: src/option.c:172
msgid "ICONPATH"
msgstr "СЦЕЖКА_ЗНАЧКА"
-#: src/option.c:187
+#: src/option.c:178
msgid "Set the width"
msgstr "Настроіць шырыню"
-#: src/option.c:188
+#: src/option.c:179
msgid "WIDTH"
msgstr "ШЫРЫНЯ"
-#: src/option.c:196
+#: src/option.c:185
msgid "Set the height"
msgstr "Настроіць вышыню"
-#: src/option.c:197
+#: src/option.c:186
msgid "HEIGHT"
msgstr "ВЫШЫНЯ"
-#: src/option.c:205
+#: src/option.c:192
msgid "Set dialog timeout in seconds"
msgstr "Настроіць тэрмін чакання ў секундах"
#. Timeout for closing the dialog
-#: src/option.c:207
+#: src/option.c:194
msgid "TIMEOUT"
msgstr "ТЭРМІН"
-#: src/option.c:215
+#: src/option.c:200
msgid "Set the label of the OK button"
msgstr "Наставіць тэкст для кнопкі \"Добра\""
-#: src/option.c:216 src/option.c:225 src/option.c:234 src/option.c:276
-#: src/option.c:336 src/option.c:345 src/option.c:379 src/option.c:437
-#: src/option.c:574 src/option.c:699 src/option.c:717 src/option.c:743
-#: src/option.c:823 src/option.c:917 src/option.c:926 src/option.c:988
-#: src/option.c:1046 src/option.c:1215
+#: src/option.c:201 src/option.c:208 src/option.c:215 src/option.c:245
+#: src/option.c:289 src/option.c:296 src/option.c:319 src/option.c:362
+#: src/option.c:468 src/option.c:565 src/option.c:579 src/option.c:598
+#: src/option.c:658 src/option.c:730 src/option.c:737 src/option.c:786
+#: src/option.c:829 src/option.c:960
msgid "TEXT"
msgstr "ТЭКСТ"
-#: src/option.c:224
+#: src/option.c:207
msgid "Set the label of the Cancel button"
msgstr "Наставіць тэкст для кнопкі \"Скасаваць\""
-#: src/option.c:233
+#: src/option.c:214
msgid "Add an extra button"
msgstr "Дадаць яшчэ кнопку"
-#: src/option.c:242
+#: src/option.c:221
msgid "Set the modal hint"
msgstr "Прызначыць назву для мадальнага акенца"
-#: src/option.c:251
+#: src/option.c:228
msgid "Set the parent window to attach to"
msgstr "Прызначыць бацькоўскае акно, да якога трэба прычапіцца"
-#: src/option.c:252
+#: src/option.c:229
msgid "WINDOW"
msgstr "АКНО"
-#: src/option.c:266
+#: src/option.c:237
msgid "Display calendar dialog"
msgstr "Паказаць каляндар"
-#: src/option.c:275 src/option.c:335 src/option.c:378 src/option.c:436
-#: src/option.c:573 src/option.c:742 src/option.c:822 src/option.c:987
-#: src/option.c:1045 src/option.c:1214
+#: src/option.c:244 src/option.c:288 src/option.c:318 src/option.c:361
+#: src/option.c:467 src/option.c:597 src/option.c:657 src/option.c:785
+#: src/option.c:828 src/option.c:959
msgid "Set the dialog text"
msgstr "Настроіць тэкст дыялогавага акенца"
-#: src/option.c:284
+#: src/option.c:251
msgid "Set the calendar day"
msgstr "Настроіць дзень календара"
-#: src/option.c:285
+#: src/option.c:252
msgid "DAY"
msgstr "ДЗЕНЬ"
-#: src/option.c:293
+#: src/option.c:258
msgid "Set the calendar month"
msgstr "Настроіць месяц календара"
-#: src/option.c:294
+#: src/option.c:259
msgid "MONTH"
msgstr "МЕСЯЦ"
-#: src/option.c:302
+#: src/option.c:265
msgid "Set the calendar year"
msgstr "Настроіць год календара"
-#: src/option.c:303
+#: src/option.c:266
msgid "YEAR"
msgstr "ГОД"
-#: src/option.c:311 src/option.c:1232
+#: src/option.c:272 src/option.c:973
msgid "Set the format for the returned date"
msgstr "Настроіць фармат вяртання даты"
-#: src/option.c:312 src/option.c:1233
+#: src/option.c:273 src/option.c:974
msgid "PATTERN"
msgstr "ШАБЛОН"
-#: src/option.c:326
+#: src/option.c:281
msgid "Display text entry dialog"
msgstr "Паказаць дыялогавае акенца для ўводу тэксту"
-#: src/option.c:344
+#: src/option.c:295
msgid "Set the entry text"
msgstr "Настроіць тэкст у графе ўводу"
-#: src/option.c:353
+#: src/option.c:302
msgid "Hide the entry text"
msgstr "Схаваць тэкст графы ўводу"
-#: src/option.c:369
+#: src/option.c:311
msgid "Display error dialog"
msgstr "Паказаць дыялогавае акенца памылкі"
-#: src/option.c:387 src/option.c:445 src/option.c:831 src/option.c:996
+#: src/option.c:325 src/option.c:368 src/option.c:664 src/option.c:792
msgid "Set the dialog icon"
msgstr "Настроіць значок дыялогавага акенца"
-#: src/option.c:388 src/option.c:446 src/option.c:832 src/option.c:997
+#: src/option.c:326 src/option.c:369 src/option.c:665 src/option.c:793
msgid "ICON-NAME"
msgstr "НАЗВА-ЗНАЧКА"
-#: src/option.c:396 src/option.c:454 src/option.c:840 src/option.c:1005
+#: src/option.c:332 src/option.c:375 src/option.c:671 src/option.c:799
msgid "Do not enable text wrapping"
msgstr "Не ўжываць пераносы ў тэксце"
-#: src/option.c:405 src/option.c:463 src/option.c:849 src/option.c:1014
+#: src/option.c:339 src/option.c:382 src/option.c:678 src/option.c:806
msgid "Do not enable Pango markup"
msgstr "Не ўжываць разметку Pango"
-#: src/option.c:413 src/option.c:471 src/option.c:866 src/option.c:1022
+#: src/option.c:345 src/option.c:388 src/option.c:691 src/option.c:812
msgid ""
"Enable ellipsizing in the dialog text. This fixes the high window size with "
"long texts"
@@ -382,88 +269,89 @@ msgstr ""
"Скарачаць тэкст у дыялогах. Гэта выправіць вышыню акна пры наяўнасці доўгіх "
"тэкстаў"
-#: src/option.c:427
+#: src/option.c:354
msgid "Display info dialog"
msgstr "Паказаць інфармацыйнае дыялогавае акенца"
-#: src/option.c:485
+#: src/option.c:398
msgid "Display file selection dialog"
msgstr "Паказаць дыялогавае акенца выбару файлаў"
-#: src/option.c:494
+#: src/option.c:405
msgid "Set the filename"
msgstr "Настроіць назву файла"
-#: src/option.c:495 src/option.c:899
+#: src/option.c:406 src/option.c:716
msgid "FILENAME"
msgstr "НАЗВА_ФАЙЛА"
-#: src/option.c:503
+#: src/option.c:412
msgid "Allow multiple files to be selected"
msgstr "Дазволіць выбар некалькіх файлаў"
-#: src/option.c:512
+#: src/option.c:419
msgid "Activate directory-only selection"
msgstr "Дазволіць выбар толькі каталогаў"
-#: src/option.c:521
+#: src/option.c:426
msgid "Activate save mode"
msgstr "Уключыць бяспечны рэжым"
-#: src/option.c:530 src/option.c:618 src/option.c:1223
+#: src/option.c:433 src/option.c:502 src/option.c:966
msgid "Set output separator character"
msgstr "Настроіць знак-падзяляльнік вываду"
-#: src/option.c:531 src/option.c:619 src/option.c:1224
+#: src/option.c:434 src/option.c:503 src/option.c:967
msgid "SEPARATOR"
msgstr "ПАДЗЯЛЯЛЬНІК"
-#: src/option.c:539
+#: src/option.c:440
msgid "Confirm file selection if filename already exists"
msgstr "Пацвярджаць выбар файла, калі ён ужо існуе"
-#: src/option.c:548
+#: src/option.c:448
msgid "Set a filename filter"
msgstr "Наставіць фільтр для назваў файлаў"
-#. Help for file-filter argument (name and patterns for file selection)
-#: src/option.c:550
+#. Help for file-filter argument (name and patterns for file
+#. selection)
+#: src/option.c:451
msgid "NAME | PATTERN1 PATTERN2 ..."
msgstr "НАЗВА | ШАБЛОН1 ШАБЛОН2 ..."
-#: src/option.c:564
+#: src/option.c:460
msgid "Display list dialog"
msgstr "Паказаць дыялогавае акенца са спісам"
-#: src/option.c:582
+#: src/option.c:474
msgid "Set the column header"
msgstr "Прызначыць загаловак слупка"
-#: src/option.c:583
+#: src/option.c:475
msgid "COLUMN"
msgstr "СЛУПОК"
-#: src/option.c:591
+#: src/option.c:481
msgid "Use check boxes for the first column"
msgstr "Змясціць пераключальнікі ў першым слупку"
-#: src/option.c:600
+#: src/option.c:488
msgid "Use radio buttons for the first column"
msgstr "Змясціць кнопкі выбару ў першым слупку"
-#: src/option.c:609
+#: src/option.c:495
msgid "Use an image for the first column"
msgstr "Змясціць выяву ў першым слупку"
-#: src/option.c:627
+#: src/option.c:509
msgid "Allow multiple rows to be selected"
msgstr "Дазволіць вылучэнне некалькіх радкоў"
-#: src/option.c:636 src/option.c:907
+#: src/option.c:516 src/option.c:722
msgid "Allow changes to text"
msgstr "Дазволіць змяненне тэксту"
-#: src/option.c:645
+#: src/option.c:523
msgid ""
"Print a specific column (Default is 1. 'ALL' can be used to print all "
"columns)"
@@ -472,19 +360,19 @@ msgstr ""
"слупкоў)"
#. Column index number to print out on a list dialog
-#: src/option.c:647 src/option.c:656
+#: src/option.c:526 src/option.c:533
msgid "NUMBER"
msgstr "НУМАР"
-#: src/option.c:655
+#: src/option.c:532
msgid "Hide a specific column"
msgstr "Схаваць пэўны слупок"
-#: src/option.c:664
+#: src/option.c:539
msgid "Hide the column headers"
msgstr "Схаваць загалоўкі слупкоў"
-#: src/option.c:673
+#: src/option.c:546
msgid ""
"Change list default search function searching for text in the middle, not on "
"the beginning"
@@ -492,384 +380,509 @@ msgstr ""
"Змяніць прадвызначаную функцыю пошуку, каб шукаць тэкст у сярэдзіне, я не ў "
"пачатку"
-#: src/option.c:689
+#: src/option.c:557
msgid "Display notification"
msgstr "Паказаць апявяшчэнне"
-#: src/option.c:698
+#: src/option.c:564
msgid "Set the notification text"
msgstr "Настроіць тэкст апавяшчэння"
-#: src/option.c:707
+#: src/option.c:571
msgid "Listen for commands on stdin"
msgstr "Прымаць загады на стандартным уваходзе"
-#: src/option.c:716
+#: src/option.c:578
msgid "Set the notification hints"
msgstr "Прызначыць падказкі для апавяшчэнняў"
-#: src/option.c:733
+#: src/option.c:590
msgid "Display progress indication dialog"
msgstr "Паказаць дыялогавае акенца выяўлення цячэння працэсу"
-#: src/option.c:751
+#: src/option.c:604
msgid "Set initial percentage"
msgstr "Настроіць пачатковае значэнне працэнтаў"
-#: src/option.c:752
+#: src/option.c:605
msgid "PERCENTAGE"
msgstr "ПРАЦЭНТЫ"
-#: src/option.c:760
+#: src/option.c:611
msgid "Pulsate progress bar"
msgstr "Пульсаваць паласой цячэння працэсу"
-#: src/option.c:770
+#: src/option.c:619
#, no-c-format
msgid "Dismiss the dialog when 100% has been reached"
msgstr "Закрыць дыялогавае акенца па дасягненні 100%"
-#: src/option.c:779
+#: src/option.c:626
msgid "Kill parent process if Cancel button is pressed"
msgstr "Забіць бацькоўскі працэс пры націску кнопкі \"Скасаваць\""
-#: src/option.c:788
+#: src/option.c:633
msgid "Hide Cancel button"
msgstr "Схаваць кнопку \"Скасаваць\""
-#: src/option.c:798
+#: src/option.c:641
#, no-c-format
msgid "Estimate when progress will reach 100%"
msgstr "Прыблізна ацаніць калі прагрэс дасягне 100%"
-#: src/option.c:813
+#: src/option.c:650
msgid "Display question dialog"
msgstr "Паказаць дыялогавае акенца з пытаннем"
-#: src/option.c:857
+#: src/option.c:684
msgid "Give Cancel button focus by default"
msgstr "Прадвызначана надаць фокус кнопцы \"Скасаваць\""
-#: src/option.c:874
+#: src/option.c:698
msgid "Suppress OK and Cancel buttons"
msgstr "Хаваць кнопкі \"Добра\" і \"Скасаваць\""
-#: src/option.c:889
+#: src/option.c:708
msgid "Display text information dialog"
msgstr "Паказаць інфармацыйнае дыялогавае акенца з тэкстам"
-#: src/option.c:898
+#: src/option.c:715
msgid "Open file"
msgstr "Адкрыць файл"
-#: src/option.c:916
+#: src/option.c:729
msgid "Set the text font"
msgstr "Настроіць шрыфт тэксту"
-#: src/option.c:925
+#: src/option.c:736
msgid "Enable an I read and agree checkbox"
msgstr "Уключыць пераключальнік \"Я прачытаў гэты тэкст і згодны з ім\""
-#: src/option.c:935
+#: src/option.c:744
msgid "Enable HTML support"
msgstr "Уключыць падтрымку HTML"
-#: src/option.c:944
+#: src/option.c:751
msgid ""
"Do not enable user interaction with the WebView. Only works if you use --"
"html option"
msgstr ""
"Не ўжываць WebView у інтэрфейсе. Гэта працуе толькі разам з опцыяй --html"
-#: src/option.c:953
+#: src/option.c:759
msgid "Set an URL instead of a file. Only works if you use --html option"
msgstr ""
"Прызначыць URL-спасылку замест файла. Гэта працуе толькі разам з опцыяй --"
"html"
-#: src/option.c:954
+#: src/option.c:761
msgid "URL"
msgstr "URL"
-#: src/option.c:963
+#: src/option.c:768
msgid "Auto scroll the text to the end. Only when text is captured from stdin"
msgstr ""
"Аўтаматычна пракручваць тэкст да канца. Толькі калі тэкст узяты з "
"стандартнага ўваходу"
-#: src/option.c:978
+#: src/option.c:778
msgid "Display warning dialog"
msgstr "Паказаць перасцерагальнае дыялогавае акенца"
-#: src/option.c:1036
+#: src/option.c:821
msgid "Display scale dialog"
msgstr "Паказаць дыялогавае акенца падстройкі маштабавання"
-#: src/option.c:1054
+#: src/option.c:835
msgid "Set initial value"
msgstr "Прызначыць пачатковае значэнне"
-#: src/option.c:1055 src/option.c:1064 src/option.c:1073 src/option.c:1082
-#: src/option.c:1281
+#: src/option.c:836 src/option.c:843 src/option.c:850 src/option.c:857
+#: src/option.c:1008
msgid "VALUE"
msgstr "ЗНАЧЭННЕ"
-#: src/option.c:1063
+#: src/option.c:842
msgid "Set minimum value"
msgstr "Прызначыць мінімальнае значэнне"
-#: src/option.c:1072
+#: src/option.c:849
msgid "Set maximum value"
msgstr "Прызначыць максімальнае значэнне"
-#: src/option.c:1081
+#: src/option.c:856
msgid "Set step size"
msgstr "Прызначыць памер кроку"
-#: src/option.c:1090
+#: src/option.c:863
msgid "Print partial values"
msgstr "Выводзіць няпоўныя значэнні"
-#: src/option.c:1099
+#: src/option.c:870
msgid "Hide value"
msgstr "Схаваць значэнне"
-#: src/option.c:1114
+#: src/option.c:879
msgid "Display forms dialog"
msgstr "Паказаць дыялогавае акенца форм"
-#: src/option.c:1123
+#: src/option.c:886
msgid "Add a new Entry in forms dialog"
msgstr "Дадаць новую графу ўводу ў дыялог форм"
-#: src/option.c:1124 src/option.c:1133
+#: src/option.c:887 src/option.c:894
msgid "Field name"
msgstr "Назва графы"
-#: src/option.c:1132
+#: src/option.c:893
msgid "Add a new Password Entry in forms dialog"
msgstr "Дадаць новую графу пароля ў дыялог форм"
-#: src/option.c:1141
+#: src/option.c:900
msgid "Add a new Calendar in forms dialog"
msgstr "Дадаць новы каляндар у дыялог форм"
-#: src/option.c:1142
+#: src/option.c:901
msgid "Calendar field name"
msgstr "Назва каляндарнай графы"
-#: src/option.c:1150
+#: src/option.c:907
msgid "Add a new List in forms dialog"
msgstr "Дадаць новы спіс у дыялог форм"
-#: src/option.c:1151
+#: src/option.c:908
msgid "List field and header name"
msgstr "Назва графы і загалоўка спіса"
-#: src/option.c:1159
+#: src/option.c:914
msgid "List of values for List"
msgstr "Спіс значэнняў для спіса"
-#: src/option.c:1160 src/option.c:1169 src/option.c:1187
+#: src/option.c:915 src/option.c:922 src/option.c:936
msgid "List of values separated by |"
msgstr "Спіс значэнняў, падзеленых знакам \"|\""
-#: src/option.c:1168
+#: src/option.c:921
msgid "List of values for columns"
msgstr "Спіс значэнняў для слупкоў"
-#: src/option.c:1177
+#: src/option.c:928
msgid "Add a new combo box in forms dialog"
msgstr "Дадаць новую графу з выплыўным спісам у дыялог форм"
-#: src/option.c:1178
+#: src/option.c:929
msgid "Combo box field name"
msgstr "Назва графы з выплыўным спісам"
-#: src/option.c:1186
+#: src/option.c:935
msgid "List of values for combo box"
msgstr "Спіс значэнняў для графы з выплыўным спісам"
-#: src/option.c:1205
+#: src/option.c:952
msgid "Show the columns header"
msgstr "Паказваць загаловак слупкоў"
-#: src/option.c:1247
+#: src/option.c:983
msgid "Display password dialog"
msgstr "Паказаць дыялогавае акенца для ўводу пароля"
-#: src/option.c:1256
+#: src/option.c:990
msgid "Display the username option"
msgstr "Паказаць выбар імені карыстальніка"
-#: src/option.c:1271
+#: src/option.c:1000
msgid "Display color selection dialog"
msgstr "Паказаць дыялогавае акенца выбару колеру"
-#: src/option.c:1280
+#: src/option.c:1007
msgid "Set the color"
msgstr "Настроіць колер"
-#: src/option.c:1289
+#: src/option.c:1014
msgid "Show the palette"
msgstr "Паказаць палітру"
-#: src/option.c:1304
+#: src/option.c:1023
msgid "About zenity"
msgstr "Аб Zenity"
-#: src/option.c:1313
+#: src/option.c:1030
msgid "Print version"
msgstr "Вывесці нумар версіі"
-#: src/option.c:2261
+#: src/option.c:1913
msgid "General options"
msgstr "Агульныя опцыі"
-#: src/option.c:2262
+#: src/option.c:1914
msgid "Show general options"
msgstr "Паказаць агульныя опцыі"
-#: src/option.c:2272
+#: src/option.c:1926
msgid "Calendar options"
msgstr "Опцыі календара"
-#: src/option.c:2273
+#: src/option.c:1927
msgid "Show calendar options"
msgstr "Паказаць опцыі календара"
-#: src/option.c:2283
+#: src/option.c:1939
msgid "Text entry options"
msgstr "Опцыі ўводу тэксту"
-#: src/option.c:2284
+#: src/option.c:1940
msgid "Show text entry options"
msgstr "Паказаць опцыі ўводу тэксту"
-#: src/option.c:2294
+#: src/option.c:1952
msgid "Error options"
msgstr "Опцыі дыялогу памылак"
-#: src/option.c:2295
+#: src/option.c:1952
msgid "Show error options"
msgstr "Паказаць опцыі дыялогу памылак"
-#: src/option.c:2305
+#: src/option.c:1962
msgid "Info options"
msgstr "Опцыі інфармацыйнага дыялогу"
-#: src/option.c:2306
+#: src/option.c:1962
msgid "Show info options"
msgstr "Паказаць опцыі інфармацыйнага дыялогу"
-#: src/option.c:2316
+#: src/option.c:1972
msgid "File selection options"
msgstr "Опцыі выбару файла"
-#: src/option.c:2317
+#: src/option.c:1973
msgid "Show file selection options"
msgstr "Паказаць опцыі выбару файла"
-#: src/option.c:2327
+#: src/option.c:1985
msgid "List options"
msgstr "Опцыі спіса"
-#: src/option.c:2328
+#: src/option.c:1985
msgid "Show list options"
msgstr "Паказаць опцыі спіса"
-#: src/option.c:2339
+#: src/option.c:1996
msgid "Notification icon options"
msgstr "Опцыі значка апавяшчэння"
-#: src/option.c:2340
+#: src/option.c:1997
msgid "Show notification icon options"
msgstr "Паказаць опцыі значка апавяшчэння"
-#: src/option.c:2351
+#: src/option.c:2011
msgid "Progress options"
msgstr "Опцыі цячэння працэсу"
-#: src/option.c:2352
+#: src/option.c:2012
msgid "Show progress options"
msgstr "Паказаць опцыі дыялогу цячэння працэсу"
-#: src/option.c:2362
+#: src/option.c:2024
msgid "Question options"
msgstr "Опцыі дыялогу-пытання"
-#: src/option.c:2363
+#: src/option.c:2025
msgid "Show question options"
msgstr "Паказаць опцыі дыялогу-пытання"
-#: src/option.c:2373
+#: src/option.c:2037
msgid "Warning options"
msgstr "Опцыі дыялогу-перасцярогі"
-#: src/option.c:2374
+#: src/option.c:2038
msgid "Show warning options"
msgstr "Паказаць опцыі дыялогу-перасцярогі"
-#: src/option.c:2384
+#: src/option.c:2050
msgid "Scale options"
msgstr "Опцыі маштабавання"
-#: src/option.c:2385
+#: src/option.c:2050
msgid "Show scale options"
msgstr "Паказаць опцыі маштабавання"
-#: src/option.c:2395
+#: src/option.c:2060
msgid "Text information options"
msgstr "Опцыі інфармацыйнага дыялогу з тэкстам"
-#: src/option.c:2396
+#: src/option.c:2061
msgid "Show text information options"
msgstr "Паказаць опцыі інфармацыйнага дыялогу з тэкстам"
-#: src/option.c:2406
+#: src/option.c:2073
msgid "Color selection options"
msgstr "Опцыі выбару колеру"
-#: src/option.c:2407
+#: src/option.c:2074
msgid "Show color selection options"
msgstr "Паказаць опцыі выбару колеру"
-#: src/option.c:2417
+#: src/option.c:2086
msgid "Password dialog options"
msgstr "Опцыі ўводу пароля"
-#: src/option.c:2418
+#: src/option.c:2087
msgid "Show password dialog options"
msgstr "Паказаць опцыі ўводу пароля"
-#: src/option.c:2428
+#: src/option.c:2099
msgid "Forms dialog options"
msgstr "Опцыі дыялогу форм"
-#: src/option.c:2429
+#: src/option.c:2100
msgid "Show forms dialog options"
msgstr "Паказаць опцыі дыялогу форм"
-#: src/option.c:2439
+#: src/option.c:2112
msgid "Miscellaneous options"
msgstr "Разнастайныя опцыі"
-#: src/option.c:2440
+#: src/option.c:2113
msgid "Show miscellaneous options"
msgstr "Паказаць разнастайныя опцыі"
-#: src/option.c:2465
+#: src/option.c:2139
msgid ""
"This option is not available. Please see --help for all possible usages.\n"
msgstr ""
"Гэта опцыя адсутнічае. Каб убачыць спіс усіх магчымых опцый, ужыйце опцыю --"
"help.\n"
-#: src/option.c:2469
+#: src/option.c:2144
#, c-format
msgid "--%s is not supported for this dialog\n"
msgstr "гэты дыялог не падтрымлівае опцыі --%s\n"
-#: src/option.c:2473
+#: src/option.c:2148
msgid "Two or more dialog options specified\n"
msgstr "Вызначана некалькі опцый дыялогу\n"
+
+#. Checks if username has been passed as a parameter
+#: src/password.c:70
+msgid "Type your password"
+msgstr "Упішыце ваш пароль"
+
+#: src/password.c:73
+msgid "Type your username and password"
+msgstr "Упішыце ваш імя карыстальніка і пароль"
+
+#: src/password.c:100
+msgid "Username:"
+msgstr "Імя карыстальніка:"
+
+#: src/password.c:110
+msgid "Password:"
+msgstr "Пароль:"
+
+#: src/progress.c:102
+#, c-format
+msgid "Time remaining: %lu:%02lu:%02lu"
+msgstr "Засталася: %lu:%02lu:%02lu"
+
+#: src/scale.c:62
+msgid "Maximum value must be greater than minimum value.\n"
+msgstr "Максімальнае значэнне мусіць быць большым за мінімальнае.\n"
+
+#: src/scale.c:69
+msgid "Value out of range.\n"
+msgstr "Значэнне па-за дыяпазонам.\n"
+
+#: src/tree.c:393
+msgid "No column titles specified for List dialog.\n"
+msgstr "Для дыялогавага акенца са спісам не вызначаны назвы слупкоў.\n"
+
+#: src/tree.c:399
+msgid "You should use only one List dialog type.\n"
+msgstr "Можна ўжыць толькі адзін тып дыялогавага акенца са спісам.\n"
+
+#: src/zenity.ui:14 src/zenity.ui:76
+msgid "Adjust the scale value"
+msgstr "Падстройка маштабавання"
+
+#: src/zenity.ui:30 src/zenity.ui:135 src/zenity.ui:247 src/zenity.ui:378
+#: src/zenity.ui:578 src/zenity.ui:784 src/zenity.ui:970
+msgid "Cancel"
+msgstr "Скасаваць"
+
+#: src/zenity.ui:44 src/zenity.ui:148 src/zenity.ui:261 src/zenity.ui:392
+#: src/zenity.ui:481 src/zenity.ui:591 src/zenity.ui:697 src/zenity.ui:798
+#: src/zenity.ui:984 src/zenity.ui:1080
+msgid "OK"
+msgstr "Добра"
+
+#: src/zenity.ui:117
+msgid "Text View"
+msgstr "Прагляд тэксту"
+
+#: src/zenity.ui:231
+msgid "Calendar selection"
+msgstr "Выбар даты"
+
+#: src/zenity.ui:298
+msgid "Select a date from below."
+msgstr "Выберыце дату."
+
+#: src/zenity.ui:319
+msgid "C_alendar:"
+msgstr "_Каляндар:"
+
+#: src/zenity.ui:361
+msgid "Add a new entry"
+msgstr "Даданне новага запісу"
+
+#: src/zenity.ui:428
+msgid "_Enter new text:"
+msgstr "_Упішыце новы тэкст:"
+
+#: src/zenity.ui:465
+msgid "Error"
+msgstr "Памылка"
+
+#: src/zenity.ui:530
+msgid "An error has occurred."
+msgstr "Узнікла памылка."
+
+#: src/zenity.ui:658
+msgid "Forms dialog"
+msgstr "Дыялог форм"
+
+#: src/zenity.ui:681
+msgid "Information"
+msgstr "Інфармацыя"
+
+#: src/zenity.ui:741
+msgid "All updates are complete."
+msgstr "Усе абнаўленні скончаны."
+
+#: src/zenity.ui:768
+msgid "Progress"
+msgstr "Цячэнне працэсу"
+
+#: src/zenity.ui:831
+msgid "Running..."
+msgstr "Выкананне..."
+
+#: src/zenity.ui:882
+msgid "Question"
+msgstr "Пытанне"
+
+#: src/zenity.ui:929 src/zenity.ui:1126
+msgid "Are you sure you want to proceed?"
+msgstr "Ці вы насамрэч хочаце працягнуць?"
+
+#: src/zenity.ui:953
+msgid "Select items from the list"
+msgstr "Выбар элементаў са спіса"
+
+#: src/zenity.ui:1015
+msgid "Select items from the list below."
+msgstr "Выберыце элементы са спіса."
+
+#: src/zenity.ui:1064
+msgid "Warning"
+msgstr "Перасцярога"
diff --git a/po/be@latin.gmo b/po/be@latin.gmo
index c3d55aeb..f6f6f763 100644
--- a/po/be@latin.gmo
+++ b/po/be@latin.gmo
Binary files differ
diff --git a/po/bg.gmo b/po/bg.gmo
index 20873377..40e59f2e 100644
--- a/po/bg.gmo
+++ b/po/bg.gmo
Binary files differ
diff --git a/po/bn.gmo b/po/bn.gmo
index a4b66cef..5d3b0bb8 100644
--- a/po/bn.gmo
+++ b/po/bn.gmo
Binary files differ
diff --git a/po/bn_IN.gmo b/po/bn_IN.gmo
index 011f57dd..33403a0a 100644
--- a/po/bn_IN.gmo
+++ b/po/bn_IN.gmo
Binary files differ
diff --git a/po/bs.gmo b/po/bs.gmo
index 6fd61c48..ec50659f 100644
--- a/po/bs.gmo
+++ b/po/bs.gmo
Binary files differ
diff --git a/po/ca.gmo b/po/ca.gmo
index ada59975..87aa316c 100644
--- a/po/ca.gmo
+++ b/po/ca.gmo
Binary files differ
diff --git a/po/ca@valencia.gmo b/po/ca@valencia.gmo
index 96dfd261..06d20ac1 100644
--- a/po/ca@valencia.gmo
+++ b/po/ca@valencia.gmo
Binary files differ
diff --git a/po/cs.gmo b/po/cs.gmo
index a384a0f1..598cc44e 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
Binary files differ
diff --git a/po/cy.gmo b/po/cy.gmo
index 01c4a203..99eed682 100644
--- a/po/cy.gmo
+++ b/po/cy.gmo
Binary files differ
diff --git a/po/da.gmo b/po/da.gmo
index b13d82a0..51299bfb 100644
--- a/po/da.gmo
+++ b/po/da.gmo
Binary files differ
diff --git a/po/de.gmo b/po/de.gmo
index 5f2bf242..d385a4ee 100644
--- a/po/de.gmo
+++ b/po/de.gmo
Binary files differ
diff --git a/po/dz.gmo b/po/dz.gmo
index dcdbea54..26647a6b 100644
--- a/po/dz.gmo
+++ b/po/dz.gmo
Binary files differ
diff --git a/po/el.gmo b/po/el.gmo
index a9ee1c58..bfff2a9e 100644
--- a/po/el.gmo
+++ b/po/el.gmo
Binary files differ
diff --git a/po/en@shaw.gmo b/po/en@shaw.gmo
index 06d83e8d..7e3f841f 100644
--- a/po/en@shaw.gmo
+++ b/po/en@shaw.gmo
Binary files differ
diff --git a/po/en_CA.gmo b/po/en_CA.gmo
index 8635e954..e5d2f661 100644
--- a/po/en_CA.gmo
+++ b/po/en_CA.gmo
Binary files differ
diff --git a/po/en_GB.gmo b/po/en_GB.gmo
index dcca5036..8feec540 100644
--- a/po/en_GB.gmo
+++ b/po/en_GB.gmo
Binary files differ
diff --git a/po/eo.gmo b/po/eo.gmo
index 9edc3e38..40646d6b 100644
--- a/po/eo.gmo
+++ b/po/eo.gmo
Binary files differ
diff --git a/po/es.gmo b/po/es.gmo
index e5167d30..431d1ea7 100644
--- a/po/es.gmo
+++ b/po/es.gmo
Binary files differ
diff --git a/po/et.gmo b/po/et.gmo
index 53decdae..c91e487b 100644
--- a/po/et.gmo
+++ b/po/et.gmo
Binary files differ
diff --git a/po/eu.gmo b/po/eu.gmo
index 9584ccb2..e7829536 100644
--- a/po/eu.gmo
+++ b/po/eu.gmo
Binary files differ
diff --git a/po/fa.gmo b/po/fa.gmo
index 1d6b840a..bfd1ccbd 100644
--- a/po/fa.gmo
+++ b/po/fa.gmo
Binary files differ
diff --git a/po/fi.gmo b/po/fi.gmo
index 279c1fc5..d9d3b3b0 100644
--- a/po/fi.gmo
+++ b/po/fi.gmo
Binary files differ
diff --git a/po/fi.po b/po/fi.po
index 322c1ad2..1b04192a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -17,8 +17,8 @@ msgstr ""
"Project-Id-Version: zenity HEAD\n"
"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
"product=zenity&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-03-07 19:41+0000\n"
-"PO-Revision-Date: 2017-03-11 19:35+0200\n"
+"POT-Creation-Date: 2018-03-11 08:56+0000\n"
+"PO-Revision-Date: 2018-04-10 16:43+0300\n"
"Last-Translator: Jiri Grönroos <jiri.gronroos+l10n@iki.fi>\n"
"Language-Team: suomi <lokalisointi-lista@googlegroups.com>\n"
"Language: fi\n"
@@ -26,10 +26,10 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POT-Import-Date: 2012-02-19 15:25:30+0000\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Poedit 2.0.6\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/about.c:63
+#: src/about.c:60
msgid ""
"This program is free software; you can redistribute it and/or modify it "
"under the terms of the GNU Lesser General Public License as published by the "
@@ -42,7 +42,7 @@ msgstr ""
"lisenssin versiota 2 taikka mitä tahansa tämän jälkeen ilmestynyttä "
"versiota.\n"
-#: src/about.c:67
+#: src/about.c:65
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -54,7 +54,7 @@ msgstr ""
"SOVELTUMISESTA TIETTYYN ERITYISEEN TARKOITUKSEEN. Yksityiskohtien osalta "
"katso GNU:n LGPL-lisenssiä.\n"
-#: src/about.c:71
+#: src/about.c:69
msgid ""
"You should have received a copy of the GNU Lesser General Public License "
"along with this program; if not, write to the Free Software Foundation, "
@@ -64,10 +64,10 @@ msgstr ""
"mukana; jos et sitä saanut, niin lähetä kirje Free Software Foundation, "
"Inc. :lle, 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA"
-#: src/about.c:263
+#: src/about.c:260
msgid "translator-credits"
msgstr ""
-"Jiri Grönroos, 2015, 2017\n"
+"Jiri Grönroos, 2015, 2017, 2018\n"
"Tommi Vainikainen, 2005\n"
"Ilkka Tuohela, 2005\n"
"Sami Pesonen, 2004\n"
@@ -76,433 +76,321 @@ msgstr ""
"\n"
"https://l10n.gnome.org/teams/fi/"
-#: src/about.c:275
+#: src/about.c:277
msgid "Display dialog boxes from shell scripts"
msgstr "Näytä ikkunoita kuoren komentotiedostojen pohjalta"
+#: src/fileselection.c:62 src/fileselection.c:76 src/password.c:60
+msgid "_OK"
+msgstr "_OK"
+
+#: src/fileselection.c:63 src/fileselection.c:74 src/password.c:57
+msgid "_Cancel"
+msgstr "_Peru"
+
#: src/main.c:105
msgid "You must specify a dialog type. See 'zenity --help' for details\n"
msgstr ""
"Ikkunatyyppi täytyy määrittää. Aja ”zenity --help” saadaksesi lisätietoja\n"
-#: src/notification.c:51
+#: src/msg.c:38
+msgid "_No"
+msgstr "_Ei"
+
+#: src/msg.c:40
+msgid "_Yes"
+msgstr "_Kyllä"
+
+#: src/notification.c:50
#, fuzzy
#| msgid "Could not parse message from stdin\n"
msgid "Could not parse message\n"
msgstr "vakiosyötteestä tullutta viestiä ei voi jäsentää\n"
-#: src/notification.c:140
+#: src/notification.c:132
msgid ""
"Invalid value for a boolean typed hint.\n"
"Supported values are 'true' or 'false'.\n"
msgstr ""
#. (iibiiay)
-#: src/notification.c:156
+#: src/notification.c:149
msgid "Unsupported hint. Skipping.\n"
msgstr ""
#. unknown hints
-#: src/notification.c:173
+#: src/notification.c:166
msgid "Unknown hint name. Skipping.\n"
msgstr ""
-#: src/notification.c:228
+#: src/notification.c:218
#, fuzzy
#| msgid "could not parse command from stdin\n"
msgid "Could not parse command from stdin\n"
msgstr "vakiosyötteestä tullutta komentoa ei voi jäsentää\n"
-#: src/notification.c:326
+#: src/notification.c:318
msgid "Zenity notification"
msgstr "Zenity-ilmoitus"
-#: src/password.c:55
-msgid "_Cancel"
-msgstr "_Peru"
-
-#: src/password.c:58
-msgid "_OK"
-msgstr "_OK"
-
-#. Checks if username has been passed as a parameter
-#: src/password.c:73
-msgid "Type your password"
-msgstr "Syötä salasanasi"
-
-#: src/password.c:76
-#| msgid "Type your password"
-msgid "Type your username and password"
-msgstr "Syötä käyttäjätunnuksesi ja salasanasi"
-
-#: src/password.c:113
-msgid "Username:"
-msgstr "Käyttäjätunnus:"
-
-#: src/password.c:127
-msgid "Password:"
-msgstr "Salasana:"
-
-#: src/scale.c:57
-msgid "Maximum value must be greater than minimum value.\n"
-msgstr "Maksimiarvon tulee olla suurempi kuin minimiarvon.\n"
-
-#: src/scale.c:64
-msgid "Value out of range.\n"
-msgstr "Arvo sallitun alueen ulkopuolella.\n"
-
-#: src/tree.c:376
-msgid "No column titles specified for List dialog.\n"
-msgstr "Luetteloikkunalle ei annettu sarakenimiä.\n"
-
-#: src/tree.c:382
-msgid "You should use only one List dialog type.\n"
-msgstr "Sinun tulisi käyttää vain yhtä listaikkunan tyyppiä.\n"
-
-#: src/zenity.ui:14 src/zenity.ui:76
-msgid "Adjust the scale value"
-msgstr "Säädä asteikon arvoa"
-
-#: src/zenity.ui:30 src/zenity.ui:135 src/zenity.ui:247 src/zenity.ui:378
-#: src/zenity.ui:578 src/zenity.ui:784 src/zenity.ui:970
-msgid "Cancel"
-msgstr "Peru"
-
-#: src/zenity.ui:44 src/zenity.ui:148 src/zenity.ui:261 src/zenity.ui:392
-#: src/zenity.ui:481 src/zenity.ui:591 src/zenity.ui:697 src/zenity.ui:798
-#: src/zenity.ui:984 src/zenity.ui:1080
-msgid "OK"
-msgstr "OK"
-
-#: src/zenity.ui:117
-msgid "Text View"
-msgstr "Tekstinäkymä"
-
-#: src/zenity.ui:231
-msgid "Calendar selection"
-msgstr "Kalenterivalinnat"
-
-#: src/zenity.ui:298
-msgid "Select a date from below."
-msgstr "Valitse päiväys alta."
-
-#: src/zenity.ui:319
-msgid "C_alendar:"
-msgstr "K_alenteri:"
-
-#: src/zenity.ui:361
-msgid "Add a new entry"
-msgstr "Lisää kohta"
-
-#: src/zenity.ui:428
-msgid "_Enter new text:"
-msgstr "_Anna uusi teksti:"
-
-#: src/zenity.ui:465
-msgid "Error"
-msgstr "Virhe"
-
-#: src/zenity.ui:530
-msgid "An error has occurred."
-msgstr "Virhe."
-
-#: src/zenity.ui:658
-msgid "Forms dialog"
-msgstr "Lomakeikkuna"
-
-#: src/zenity.ui:681
-msgid "Information"
-msgstr "Tiedoksi"
-
-#: src/zenity.ui:741
-msgid "All updates are complete."
-msgstr "Kaikki päivitykset on nyt tehty."
-
-#: src/zenity.ui:768
-msgid "Progress"
-msgstr "Edistyminen"
-
-#: src/zenity.ui:831
-msgid "Running..."
-msgstr "Ajetaan…"
-
-#: src/zenity.ui:882
-msgid "Question"
-msgstr "Kysymys"
-
-#: src/zenity.ui:929 src/zenity.ui:1126
-msgid "Are you sure you want to proceed?"
-msgstr "Haluatko varmasti jatkaa?"
-
-#: src/zenity.ui:953
-msgid "Select items from the list"
-msgstr "Valitse luettelon kohtia"
-
-#: src/zenity.ui:1015
-msgid "Select items from the list below."
-msgstr "Valitse kohtia alla olevasta luettelosta."
-
-#: src/zenity.ui:1064
-msgid "Warning"
-msgstr "Varoitus"
-
-#: src/option.c:169
+#: src/option.c:164
msgid "Set the dialog title"
msgstr "Aseta ikkunan otsikko"
-#: src/option.c:170
+#: src/option.c:165
msgid "TITLE"
msgstr "OTSIKKO"
-#: src/option.c:178
+#: src/option.c:171
msgid "Set the window icon"
msgstr "Aseta ikkunan kuvake"
-#: src/option.c:179
+#: src/option.c:172
msgid "ICONPATH"
msgstr "KUVAKE"
-#: src/option.c:187
+#: src/option.c:178
msgid "Set the width"
msgstr "Aseta leveys"
-#: src/option.c:188
+#: src/option.c:179
msgid "WIDTH"
msgstr "LEVEYS"
-#: src/option.c:196
+#: src/option.c:185
msgid "Set the height"
msgstr "Aseta korkeus"
-#: src/option.c:197
+#: src/option.c:186
msgid "HEIGHT"
msgstr "KORKEUS"
-#: src/option.c:205
+#: src/option.c:192
msgid "Set dialog timeout in seconds"
msgstr "Aseta ikkunan aikakatkaisu sekunteina"
#. Timeout for closing the dialog
-#: src/option.c:207
+#: src/option.c:194
msgid "TIMEOUT"
msgstr "AIKAKATKAISU"
-#: src/option.c:215
+#: src/option.c:200
#, fuzzy
#| msgid "Sets the label of the Ok button"
msgid "Set the label of the OK button"
msgstr "Aseta OK-painikkeen tekstin"
-#: src/option.c:216 src/option.c:225 src/option.c:234 src/option.c:276
-#: src/option.c:336 src/option.c:345 src/option.c:379 src/option.c:437
-#: src/option.c:574 src/option.c:699 src/option.c:717 src/option.c:743
-#: src/option.c:823 src/option.c:917 src/option.c:926 src/option.c:988
-#: src/option.c:1046 src/option.c:1215
+#: src/option.c:201 src/option.c:208 src/option.c:215 src/option.c:245
+#: src/option.c:289 src/option.c:296 src/option.c:319 src/option.c:362
+#: src/option.c:468 src/option.c:565 src/option.c:579 src/option.c:598
+#: src/option.c:658 src/option.c:730 src/option.c:737 src/option.c:786
+#: src/option.c:829 src/option.c:960
msgid "TEXT"
msgstr "TEKSTI"
-#: src/option.c:224
+#: src/option.c:207
#, fuzzy
#| msgid "Sets the label of the Cancel button"
msgid "Set the label of the Cancel button"
msgstr "Asettaa perumispainikkeen tekstin"
-#: src/option.c:233
+#: src/option.c:214
#, fuzzy
#| msgid "Hide Cancel button"
msgid "Add an extra button"
msgstr "Piilota perumispainike"
-#: src/option.c:242
+#: src/option.c:221
#, fuzzy
#| msgid "Set the dialog title"
msgid "Set the modal hint"
msgstr "Aseta ikkunan otsikko"
-#: src/option.c:251
+#: src/option.c:228
#, fuzzy
#| msgid "Set the window icon"
msgid "Set the parent window to attach to"
msgstr "Aseta ikkunan kuvake"
-#: src/option.c:252
+#: src/option.c:229
msgid "WINDOW"
msgstr ""
-#: src/option.c:266
+#: src/option.c:237
msgid "Display calendar dialog"
msgstr "Näytä kalenteri-ikkuna"
-#: src/option.c:275 src/option.c:335 src/option.c:378 src/option.c:436
-#: src/option.c:573 src/option.c:742 src/option.c:822 src/option.c:987
-#: src/option.c:1045 src/option.c:1214
+#: src/option.c:244 src/option.c:288 src/option.c:318 src/option.c:361
+#: src/option.c:467 src/option.c:597 src/option.c:657 src/option.c:785
+#: src/option.c:828 src/option.c:959
msgid "Set the dialog text"
msgstr "Aseta ikkunan teksti"
-#: src/option.c:284
+#: src/option.c:251
msgid "Set the calendar day"
msgstr "Aseta kalenterin päivä"
-#: src/option.c:285
+#: src/option.c:252
msgid "DAY"
msgstr "PÄIVÄ"
-#: src/option.c:293
+#: src/option.c:258
msgid "Set the calendar month"
msgstr "Aseta kalenterin kuukausi"
-#: src/option.c:294
+#: src/option.c:259
msgid "MONTH"
msgstr "KUUKAUSI"
-#: src/option.c:302
+#: src/option.c:265
msgid "Set the calendar year"
msgstr "Aseta kalenterin vuosi"
-#: src/option.c:303
+#: src/option.c:266
msgid "YEAR"
msgstr "VUOSI"
-#: src/option.c:311 src/option.c:1232
+#: src/option.c:272 src/option.c:973
msgid "Set the format for the returned date"
msgstr "Aseta palautettavan päiväyksen muoto"
-#: src/option.c:312 src/option.c:1233
+#: src/option.c:273 src/option.c:974
msgid "PATTERN"
msgstr "MALLI"
-#: src/option.c:326
+#: src/option.c:281
msgid "Display text entry dialog"
msgstr "Näytä teksti-ikkuna"
-#: src/option.c:344
+#: src/option.c:295
msgid "Set the entry text"
msgstr "Aseta tekstikentän teksti"
-#: src/option.c:353
+#: src/option.c:302
msgid "Hide the entry text"
msgstr "Piilota tekstikentän teksti"
-#: src/option.c:369
+#: src/option.c:311
msgid "Display error dialog"
msgstr "Näytä virheikkuna"
-#: src/option.c:387 src/option.c:445 src/option.c:831 src/option.c:996
+#: src/option.c:325 src/option.c:368 src/option.c:664 src/option.c:792
#, fuzzy
#| msgid "Set the dialog title"
msgid "Set the dialog icon"
msgstr "Aseta ikkunan otsikko"
-#: src/option.c:388 src/option.c:446 src/option.c:832 src/option.c:997
+#: src/option.c:326 src/option.c:369 src/option.c:665 src/option.c:793
msgid "ICON-NAME"
msgstr ""
-#: src/option.c:396 src/option.c:454 src/option.c:840 src/option.c:1005
+#: src/option.c:332 src/option.c:375 src/option.c:671 src/option.c:799
msgid "Do not enable text wrapping"
msgstr "Älä rivitä tekstiä"
-#: src/option.c:405 src/option.c:463 src/option.c:849 src/option.c:1014
+#: src/option.c:339 src/option.c:382 src/option.c:678 src/option.c:806
#, fuzzy
#| msgid "Do not enable pango markup"
msgid "Do not enable Pango markup"
msgstr "Älä ota käyttöön Pango-merkintöjä"
-#: src/option.c:413 src/option.c:471 src/option.c:866 src/option.c:1022
+#: src/option.c:345 src/option.c:388 src/option.c:691 src/option.c:812
msgid ""
"Enable ellipsizing in the dialog text. This fixes the high window size with "
"long texts"
msgstr ""
-#: src/option.c:427
+#: src/option.c:354
msgid "Display info dialog"
msgstr "Näytä tietoikkuna"
-#: src/option.c:485
+#: src/option.c:398
msgid "Display file selection dialog"
msgstr "Näytä tiedoston valintaikkuna"
-#: src/option.c:494
+#: src/option.c:405
msgid "Set the filename"
msgstr "Aseta tiedostonimi"
-#: src/option.c:495 src/option.c:899
+#: src/option.c:406 src/option.c:716
msgid "FILENAME"
msgstr "TIEDOSTONIMI"
-#: src/option.c:503
+#: src/option.c:412
msgid "Allow multiple files to be selected"
msgstr "Salli valittavan useita tiedostoja"
-#: src/option.c:512
+#: src/option.c:419
msgid "Activate directory-only selection"
msgstr "Aktivoi pelkän hakemiston valinta"
-#: src/option.c:521
+#: src/option.c:426
msgid "Activate save mode"
msgstr "Aktivoi tallennustila"
-#: src/option.c:530 src/option.c:618 src/option.c:1223
+#: src/option.c:433 src/option.c:502 src/option.c:966
msgid "Set output separator character"
msgstr "Aseta tulosteen erotinmerkki"
-#: src/option.c:531 src/option.c:619 src/option.c:1224
+#: src/option.c:434 src/option.c:503 src/option.c:967
msgid "SEPARATOR"
msgstr "EROTIN"
-#: src/option.c:539
+#: src/option.c:440
msgid "Confirm file selection if filename already exists"
msgstr "Varmista tiedoston valinta, jos tiedostonimi on jo olemassa"
-#: src/option.c:548
+#: src/option.c:448
#, fuzzy
#| msgid "Sets a filename filter"
msgid "Set a filename filter"
msgstr "Asettaa tiedostonimisuotimen"
-#. Help for file-filter argument (name and patterns for file selection)
-#: src/option.c:550
+#. Help for file-filter argument (name and patterns for file
+#. selection)
+#: src/option.c:451
msgid "NAME | PATTERN1 PATTERN2 ..."
msgstr "NIMI | MALLI1 MALLI2 …"
-#: src/option.c:564
+#: src/option.c:460
msgid "Display list dialog"
msgstr "Näytä luetteloikkuna"
-#: src/option.c:582
+#: src/option.c:474
msgid "Set the column header"
msgstr "Aseta sarakkeen otsikko"
-#: src/option.c:583
+#: src/option.c:475
msgid "COLUMN"
msgstr "SARAKE"
-#: src/option.c:591
+#: src/option.c:481
#, fuzzy
#| msgid "Use check boxes for first column"
msgid "Use check boxes for the first column"
msgstr "Käytä ensimmäisessä sarakkeessa valintaruutuja"
-#: src/option.c:600
+#: src/option.c:488
#, fuzzy
#| msgid "Use radio buttons for first column"
msgid "Use radio buttons for the first column"
msgstr "Käytä ensimmäisessä sarakkeessa radiopainikkeita"
-#: src/option.c:609
+#: src/option.c:495
#, fuzzy
#| msgid "Use check boxes for first column"
msgid "Use an image for the first column"
msgstr "Käytä ensimmäisessä sarakkeessa valintaruutuja"
-#: src/option.c:627
+#: src/option.c:509
msgid "Allow multiple rows to be selected"
msgstr "Salli valittavan useita rivejä"
-#: src/option.c:636 src/option.c:907
+#: src/option.c:516 src/option.c:722
msgid "Allow changes to text"
msgstr "Salli muutokset tekstiin"
-#: src/option.c:645
+#: src/option.c:523
msgid ""
"Print a specific column (Default is 1. 'ALL' can be used to print all "
"columns)"
@@ -511,113 +399,113 @@ msgstr ""
"sarakkeidentulostamiseen)"
#. Column index number to print out on a list dialog
-#: src/option.c:647 src/option.c:656
+#: src/option.c:526 src/option.c:533
msgid "NUMBER"
msgstr "NUMERO"
-#: src/option.c:655
+#: src/option.c:532
msgid "Hide a specific column"
msgstr "Piilota tietty sarake"
-#: src/option.c:664
+#: src/option.c:539
#, fuzzy
#| msgid "Hides the column headers"
msgid "Hide the column headers"
msgstr "Piilottaa sarakkeiden otsikot"
-#: src/option.c:673
+#: src/option.c:546
msgid ""
"Change list default search function searching for text in the middle, not on "
"the beginning"
msgstr ""
-#: src/option.c:689
+#: src/option.c:557
msgid "Display notification"
msgstr "Näytä ilmoitus"
-#: src/option.c:698
+#: src/option.c:564
msgid "Set the notification text"
msgstr "Aseta ilmoitusteksti"
-#: src/option.c:707
+#: src/option.c:571
msgid "Listen for commands on stdin"
msgstr "Kuuntele komentoja vakiosyötteestä"
-#: src/option.c:716
+#: src/option.c:578
#, fuzzy
#| msgid "Set the notification text"
msgid "Set the notification hints"
msgstr "Aseta ilmoitusteksti"
-#: src/option.c:733
+#: src/option.c:590
msgid "Display progress indication dialog"
msgstr "Näytä edistymisikkuna"
-#: src/option.c:751
+#: src/option.c:604
msgid "Set initial percentage"
msgstr "Aseta aloitusprosentti"
-#: src/option.c:752
+#: src/option.c:605
msgid "PERCENTAGE"
msgstr "PROSENTTI"
-#: src/option.c:760
+#: src/option.c:611
msgid "Pulsate progress bar"
msgstr "Edistymispalkki sykkii"
-#: src/option.c:770
+#: src/option.c:619
#, no-c-format
msgid "Dismiss the dialog when 100% has been reached"
msgstr "Sulje ikkuna kun 100 % on saavutettu"
-#: src/option.c:779
+#: src/option.c:626
msgid "Kill parent process if Cancel button is pressed"
msgstr "Lopeta äitiprosessi, jos perumispainiketta painetaan"
-#: src/option.c:788
+#: src/option.c:633
msgid "Hide Cancel button"
msgstr "Piilota perumispainike"
-#: src/option.c:798
+#: src/option.c:641
#, no-c-format
msgid "Estimate when progress will reach 100%"
msgstr ""
-#: src/option.c:813
+#: src/option.c:650
msgid "Display question dialog"
msgstr "Näytä kysymysikkuna"
-#: src/option.c:857
+#: src/option.c:684
msgid "Give Cancel button focus by default"
msgstr "Kohdista perumispainikkeeseen oletuksena"
-#: src/option.c:874
+#: src/option.c:698
#, fuzzy
#| msgid "Hide Cancel button"
msgid "Suppress OK and Cancel buttons"
msgstr "Piilota perumispainike"
-#: src/option.c:889
+#: src/option.c:708
msgid "Display text information dialog"
msgstr "Näytä tekstin tietoikkuna"
-#: src/option.c:898
+#: src/option.c:715
msgid "Open file"
msgstr "Avaa tiedosto"
-#: src/option.c:916
+#: src/option.c:729
msgid "Set the text font"
msgstr "Aseta tekstikentän fontti"
-#: src/option.c:925
+#: src/option.c:736
msgid "Enable an I read and agree checkbox"
msgstr "Ota käyttöön Olen lukenut ja hyväksyn -valintaruutu"
-#: src/option.c:935
+#: src/option.c:744
msgid "Enable HTML support"
msgstr "Ota käyttöön HTML-tuki"
-#: src/option.c:944
+#: src/option.c:751
#, fuzzy
#| msgid "Sets an url instead of a file. Only works if you use --html option"
msgid ""
@@ -626,301 +514,426 @@ msgid ""
msgstr ""
"Asettaa URLin tiedoston sijaan. Toimii vain jos käytät --html-valitsinta"
-#: src/option.c:953
+#: src/option.c:759
#, fuzzy
#| msgid "Sets an url instead of a file. Only works if you use --html option"
msgid "Set an URL instead of a file. Only works if you use --html option"
msgstr ""
"Asettaa URLin tiedoston sijaan. Toimii vain jos käytät --html-valitsinta"
-#: src/option.c:954
+#: src/option.c:761
msgid "URL"
msgstr "URL"
-#: src/option.c:963
+#: src/option.c:768
msgid "Auto scroll the text to the end. Only when text is captured from stdin"
msgstr ""
-#: src/option.c:978
+#: src/option.c:778
msgid "Display warning dialog"
msgstr "Näytä varoitusikkuna"
-#: src/option.c:1036
+#: src/option.c:821
msgid "Display scale dialog"
msgstr "Näytä asteikkoikkuna"
-#: src/option.c:1054
+#: src/option.c:835
msgid "Set initial value"
msgstr "Aseta aloitusarvo"
-#: src/option.c:1055 src/option.c:1064 src/option.c:1073 src/option.c:1082
-#: src/option.c:1281
+#: src/option.c:836 src/option.c:843 src/option.c:850 src/option.c:857
+#: src/option.c:1008
msgid "VALUE"
msgstr "ARVO"
-#: src/option.c:1063
+#: src/option.c:842
msgid "Set minimum value"
msgstr "Aseta minimiarvo"
-#: src/option.c:1072
+#: src/option.c:849
msgid "Set maximum value"
msgstr "Aseta maksimiarvo"
-#: src/option.c:1081
+#: src/option.c:856
msgid "Set step size"
msgstr "Aseta askelkoko"
-#: src/option.c:1090
+#: src/option.c:863
msgid "Print partial values"
msgstr "Näytä osittaisia arvoja"
-#: src/option.c:1099
+#: src/option.c:870
msgid "Hide value"
msgstr "Piilota arvo"
-#: src/option.c:1114
+#: src/option.c:879
msgid "Display forms dialog"
msgstr "Näytä lomakeikkuna"
-#: src/option.c:1123
+#: src/option.c:886
msgid "Add a new Entry in forms dialog"
msgstr "Lisää uusi kenttä lomakeikkunaan"
-#: src/option.c:1124 src/option.c:1133
+#: src/option.c:887 src/option.c:894
msgid "Field name"
msgstr "Kentän nimi"
-#: src/option.c:1132
+#: src/option.c:893
msgid "Add a new Password Entry in forms dialog"
msgstr "Lisää uusi salasanakenttä lomakeikkunaan"
-#: src/option.c:1141
+#: src/option.c:900
msgid "Add a new Calendar in forms dialog"
msgstr "Lisää uusi kalenterikenttä lomakeikkunaan"
-#: src/option.c:1142
+#: src/option.c:901
msgid "Calendar field name"
msgstr "Kalenterin kenttänimi"
-#: src/option.c:1150
+#: src/option.c:907
#, fuzzy
msgid "Add a new List in forms dialog"
msgstr "Lisää uusi kenttä lomakeikkunaan"
-#: src/option.c:1151
+#: src/option.c:908
msgid "List field and header name"
msgstr "Luettelon kenttä ja otsake"
-#: src/option.c:1159
+#: src/option.c:914
msgid "List of values for List"
msgstr "Luettelo arvoista luettelolle"
-#: src/option.c:1160 src/option.c:1169 src/option.c:1187
+#: src/option.c:915 src/option.c:922 src/option.c:936
msgid "List of values separated by |"
msgstr "Luettelo arvoista, jotka on eroteltu merkillä |"
-#: src/option.c:1168
+#: src/option.c:921
msgid "List of values for columns"
msgstr "Luettelo arvoista sarakkeille"
-#: src/option.c:1177
+#: src/option.c:928
#, fuzzy
msgid "Add a new combo box in forms dialog"
msgstr "Lisää uusi kenttä lomakeikkunaan"
-#: src/option.c:1178
+#: src/option.c:929
#, fuzzy
#| msgid "Calendar field name"
msgid "Combo box field name"
msgstr "Kalenterin kenttänimi"
-#: src/option.c:1186
+#: src/option.c:935
#, fuzzy
#| msgid "List of values for columns"
msgid "List of values for combo box"
msgstr "Luettelo arvoista sarakkeille"
-#: src/option.c:1205
+#: src/option.c:952
#, fuzzy
msgid "Show the columns header"
msgstr "Aseta sarakkeen otsikko"
-#: src/option.c:1247
+#: src/option.c:983
msgid "Display password dialog"
msgstr "Näytä salasanaikkuna"
-#: src/option.c:1256
+#: src/option.c:990
msgid "Display the username option"
msgstr "Näytä käyttäjätunnusvalinta"
-#: src/option.c:1271
+#: src/option.c:1000
msgid "Display color selection dialog"
msgstr "Näytä värinvalintaikkuna"
-#: src/option.c:1280
+#: src/option.c:1007
msgid "Set the color"
msgstr "Aseta väri"
-#: src/option.c:1289
+#: src/option.c:1014
msgid "Show the palette"
msgstr "Näytä väripaletti"
-#: src/option.c:1304
+#: src/option.c:1023
msgid "About zenity"
msgstr "Tietoja Zenitystä"
-#: src/option.c:1313
+#: src/option.c:1030
msgid "Print version"
msgstr "Näytä versiotiedot"
-#: src/option.c:2261
+#: src/option.c:1913
msgid "General options"
msgstr "Yleiset asetukset"
-#: src/option.c:2262
+#: src/option.c:1914
msgid "Show general options"
msgstr "Näytä yleiset asetukset"
-#: src/option.c:2272
+#: src/option.c:1926
msgid "Calendar options"
msgstr "Kalenteriasetukset"
-#: src/option.c:2273
+#: src/option.c:1927
msgid "Show calendar options"
msgstr "Näytä kalenteriasetukset"
-#: src/option.c:2283
+#: src/option.c:1939
msgid "Text entry options"
msgstr "Tekstikenttäasetukset"
-#: src/option.c:2284
+#: src/option.c:1940
msgid "Show text entry options"
msgstr "Näytä tekstikenttäasetukset"
-#: src/option.c:2294
+#: src/option.c:1952
msgid "Error options"
msgstr "Virheasetukset"
-#: src/option.c:2295
+#: src/option.c:1952
msgid "Show error options"
msgstr "Näytä Virheasetukset"
-#: src/option.c:2305
+#: src/option.c:1962
msgid "Info options"
msgstr "Tietoasetukset"
-#: src/option.c:2306
+#: src/option.c:1962
msgid "Show info options"
msgstr "Näytä tietoasetukset"
-#: src/option.c:2316
+#: src/option.c:1972
msgid "File selection options"
msgstr "Tiedostonvalitsimen asetukset"
-#: src/option.c:2317
+#: src/option.c:1973
msgid "Show file selection options"
msgstr "Näytä tiedostonvalitsimen asetukset"
-#: src/option.c:2327
+#: src/option.c:1985
msgid "List options"
msgstr "Luetteloasetukset"
-#: src/option.c:2328
+#: src/option.c:1985
msgid "Show list options"
msgstr "Näytä luetteloasetukset"
-#: src/option.c:2339
+#: src/option.c:1996
msgid "Notification icon options"
msgstr "Ilmoituskuvakeasetukset"
-#: src/option.c:2340
+#: src/option.c:1997
msgid "Show notification icon options"
msgstr "Näytä ilmoituskuvakeasetukset"
-#: src/option.c:2351
+#: src/option.c:2011
msgid "Progress options"
msgstr "Edistymisasetukset"
-#: src/option.c:2352
+#: src/option.c:2012
msgid "Show progress options"
msgstr "Näytä edistymisasetukset"
-#: src/option.c:2362
+#: src/option.c:2024
msgid "Question options"
msgstr "Kysymysasetukset"
-#: src/option.c:2363
+#: src/option.c:2025
msgid "Show question options"
msgstr "Näytä kysymysasetukset"
-#: src/option.c:2373
+#: src/option.c:2037
msgid "Warning options"
msgstr "Varoitusasetukset"
-#: src/option.c:2374
+#: src/option.c:2038
msgid "Show warning options"
msgstr "Näytä varoitusasetukset"
-#: src/option.c:2384
+#: src/option.c:2050
msgid "Scale options"
msgstr "Asteikkoasetukset"
-#: src/option.c:2385
+#: src/option.c:2050
msgid "Show scale options"
msgstr "Näytä asteikkoasetukset"
-#: src/option.c:2395
+#: src/option.c:2060
msgid "Text information options"
msgstr "Teksti-ilmoitusasetukset"
-#: src/option.c:2396
+#: src/option.c:2061
msgid "Show text information options"
msgstr "Näytä teksti-ilmoitusasetukset"
-#: src/option.c:2406
+#: src/option.c:2073
msgid "Color selection options"
msgstr "Värivalitsimen asetukset"
-#: src/option.c:2407
+#: src/option.c:2074
msgid "Show color selection options"
msgstr "Näytä värivalitsimen asetukset"
-#: src/option.c:2417
+#: src/option.c:2086
msgid "Password dialog options"
msgstr "Salasanaikkunan asetukset"
-#: src/option.c:2418
+#: src/option.c:2087
msgid "Show password dialog options"
msgstr "Näytä salasanaikkunan asetukset"
-#: src/option.c:2428
+#: src/option.c:2099
msgid "Forms dialog options"
msgstr "Lomakeikkunan asetukset"
-#: src/option.c:2429
+#: src/option.c:2100
msgid "Show forms dialog options"
msgstr "Näytä lomakeikkunan asetukset"
-#: src/option.c:2439
+#: src/option.c:2112
msgid "Miscellaneous options"
msgstr "Sekalaiset asetukset"
-#: src/option.c:2440
+#: src/option.c:2113
msgid "Show miscellaneous options"
msgstr "Näytä sekalaiset asetukset"
-#: src/option.c:2465
+#: src/option.c:2139
msgid ""
"This option is not available. Please see --help for all possible usages.\n"
msgstr ""
"Tämä valitsin ei ole käytettävissä. Katso lista sallituista valitsimista "
"valitsimella --help.\n"
-#: src/option.c:2469
+#: src/option.c:2144
#, c-format
msgid "--%s is not supported for this dialog\n"
msgstr "--%s ei tueta tässä ikkunassa\n"
-#: src/option.c:2473
+#: src/option.c:2148
msgid "Two or more dialog options specified\n"
msgstr "Kaksi tai useampia ikkunavalitsimia annettu\n"
+
+#. Checks if username has been passed as a parameter
+#: src/password.c:70
+msgid "Type your password"
+msgstr "Syötä salasanasi"
+
+#: src/password.c:73
+msgid "Type your username and password"
+msgstr "Syötä käyttäjätunnuksesi ja salasanasi"
+
+#: src/password.c:100
+msgid "Username:"
+msgstr "Käyttäjätunnus:"
+
+#: src/password.c:110
+msgid "Password:"
+msgstr "Salasana:"
+
+#: src/progress.c:102
+#, c-format
+msgid "Time remaining: %lu:%02lu:%02lu"
+msgstr "Aikaa jäljellä: %lu:%02lu:%02lu"
+
+#: src/scale.c:62
+msgid "Maximum value must be greater than minimum value.\n"
+msgstr "Maksimiarvon tulee olla suurempi kuin minimiarvon.\n"
+
+#: src/scale.c:69
+msgid "Value out of range.\n"
+msgstr "Arvo sallitun alueen ulkopuolella.\n"
+
+#: src/tree.c:393
+msgid "No column titles specified for List dialog.\n"
+msgstr "Luetteloikkunalle ei annettu sarakenimiä.\n"
+
+#: src/tree.c:399
+msgid "You should use only one List dialog type.\n"
+msgstr "Sinun tulisi käyttää vain yhtä listaikkunan tyyppiä.\n"
+
+#: src/zenity.ui:14 src/zenity.ui:76
+msgid "Adjust the scale value"
+msgstr "Säädä asteikon arvoa"
+
+#: src/zenity.ui:30 src/zenity.ui:135 src/zenity.ui:247 src/zenity.ui:378
+#: src/zenity.ui:578 src/zenity.ui:784 src/zenity.ui:970
+msgid "Cancel"
+msgstr "Peru"
+
+#: src/zenity.ui:44 src/zenity.ui:148 src/zenity.ui:261 src/zenity.ui:392
+#: src/zenity.ui:481 src/zenity.ui:591 src/zenity.ui:697 src/zenity.ui:798
+#: src/zenity.ui:984 src/zenity.ui:1080
+msgid "OK"
+msgstr "OK"
+
+#: src/zenity.ui:117
+msgid "Text View"
+msgstr "Tekstinäkymä"
+
+#: src/zenity.ui:231
+msgid "Calendar selection"
+msgstr "Kalenterivalinnat"
+
+#: src/zenity.ui:298
+msgid "Select a date from below."
+msgstr "Valitse päiväys alta."
+
+#: src/zenity.ui:319
+msgid "C_alendar:"
+msgstr "K_alenteri:"
+
+#: src/zenity.ui:361
+msgid "Add a new entry"
+msgstr "Lisää kohta"
+
+#: src/zenity.ui:428
+msgid "_Enter new text:"
+msgstr "_Anna uusi teksti:"
+
+#: src/zenity.ui:465
+msgid "Error"
+msgstr "Virhe"
+
+#: src/zenity.ui:530
+msgid "An error has occurred."
+msgstr "Virhe."
+
+#: src/zenity.ui:658
+msgid "Forms dialog"
+msgstr "Lomakeikkuna"
+
+#: src/zenity.ui:681
+msgid "Information"
+msgstr "Tiedoksi"
+
+#: src/zenity.ui:741
+msgid "All updates are complete."
+msgstr "Kaikki päivitykset on nyt tehty."
+
+#: src/zenity.ui:768
+msgid "Progress"
+msgstr "Edistyminen"
+
+#: src/zenity.ui:831
+msgid "Running..."
+msgstr "Ajetaan…"
+
+#: src/zenity.ui:882
+msgid "Question"
+msgstr "Kysymys"
+
+#: src/zenity.ui:929 src/zenity.ui:1126
+msgid "Are you sure you want to proceed?"
+msgstr "Haluatko varmasti jatkaa?"
+
+#: src/zenity.ui:953
+msgid "Select items from the list"
+msgstr "Valitse luettelon kohtia"
+
+#: src/zenity.ui:1015
+msgid "Select items from the list below."
+msgstr "Valitse kohtia alla olevasta luettelosta."
+
+#: src/zenity.ui:1064
+msgid "Warning"
+msgstr "Varoitus"
diff --git a/po/fr.gmo b/po/fr.gmo
index d5fd6d21..1b748d16 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
Binary files differ
diff --git a/po/fur.gmo b/po/fur.gmo
index c7e38ce0..92ad73a1 100644
--- a/po/fur.gmo
+++ b/po/fur.gmo
Binary files differ
diff --git a/po/ga.gmo b/po/ga.gmo
index aa079cc9..cbe81122 100644
--- a/po/ga.gmo
+++ b/po/ga.gmo
Binary files differ
diff --git a/po/gl.gmo b/po/gl.gmo
index 01218adb..e4d50d77 100644
--- a/po/gl.gmo
+++ b/po/gl.gmo
Binary files differ
diff --git a/po/gu.gmo b/po/gu.gmo
index 32317584..703db0b4 100644
--- a/po/gu.gmo
+++ b/po/gu.gmo
Binary files differ
diff --git a/po/he.gmo b/po/he.gmo
index c7a9ea82..fff172b8 100644
--- a/po/he.gmo
+++ b/po/he.gmo
Binary files differ
diff --git a/po/hi.gmo b/po/hi.gmo
index 86824dbf..fefe6a18 100644
--- a/po/hi.gmo
+++ b/po/hi.gmo
Binary files differ
diff --git a/po/hr.gmo b/po/hr.gmo
index 2a43ba50..73100b2e 100644
--- a/po/hr.gmo
+++ b/po/hr.gmo
Binary files differ
diff --git a/po/hu.gmo b/po/hu.gmo
index 810ba4b9..e8a974e5 100644
--- a/po/hu.gmo
+++ b/po/hu.gmo
Binary files differ
diff --git a/po/id.gmo b/po/id.gmo
index 4b0e3528..63d2e729 100644
--- a/po/id.gmo
+++ b/po/id.gmo
Binary files differ
diff --git a/po/is.gmo b/po/is.gmo
index cabb2946..fb5c6167 100644
--- a/po/is.gmo
+++ b/po/is.gmo
Binary files differ
diff --git a/po/it.gmo b/po/it.gmo
index a8f7b4b4..989231d8 100644
--- a/po/it.gmo
+++ b/po/it.gmo
Binary files differ
diff --git a/po/ja.gmo b/po/ja.gmo
index 5614526c..f01e5023 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
Binary files differ
diff --git a/po/ka.gmo b/po/ka.gmo
index b0fce19b..96bfeb8f 100644
--- a/po/ka.gmo
+++ b/po/ka.gmo
Binary files differ
diff --git a/po/kk.gmo b/po/kk.gmo
index dbe1d71e..30a91091 100644
--- a/po/kk.gmo
+++ b/po/kk.gmo
Binary files differ
diff --git a/po/kn.gmo b/po/kn.gmo
index c9a41409..83b7e445 100644
--- a/po/kn.gmo
+++ b/po/kn.gmo
Binary files differ
diff --git a/po/ko.gmo b/po/ko.gmo
index 563928f1..245f9eeb 100644
--- a/po/ko.gmo
+++ b/po/ko.gmo
Binary files differ
diff --git a/po/ku.gmo b/po/ku.gmo
index 42998f61..03ad01e7 100644
--- a/po/ku.gmo
+++ b/po/ku.gmo
Binary files differ
diff --git a/po/lt.gmo b/po/lt.gmo
index 74ce4d0a..47fe09c3 100644
--- a/po/lt.gmo
+++ b/po/lt.gmo
Binary files differ
diff --git a/po/lv.gmo b/po/lv.gmo
index bc8b5fdf..21ef4e56 100644
--- a/po/lv.gmo
+++ b/po/lv.gmo
Binary files differ
diff --git a/po/mai.gmo b/po/mai.gmo
index 42d66edb..0a3a08a3 100644
--- a/po/mai.gmo
+++ b/po/mai.gmo
Binary files differ
diff --git a/po/mg.gmo b/po/mg.gmo
index 3ad9e8ce..8da2ccc6 100644
--- a/po/mg.gmo
+++ b/po/mg.gmo
Binary files differ
diff --git a/po/mi.gmo b/po/mi.gmo
index c9dd17cf..cbd7a490 100644
--- a/po/mi.gmo
+++ b/po/mi.gmo
Binary files differ
diff --git a/po/mk.gmo b/po/mk.gmo
index e2188c62..453c8b95 100644
--- a/po/mk.gmo
+++ b/po/mk.gmo
Binary files differ
diff --git a/po/ml.gmo b/po/ml.gmo
index 42a5d66a..5697cf7d 100644
--- a/po/ml.gmo
+++ b/po/ml.gmo
Binary files differ
diff --git a/po/mn.gmo b/po/mn.gmo
index 9b55dcdb..a2907cfe 100644
--- a/po/mn.gmo
+++ b/po/mn.gmo
Binary files differ
diff --git a/po/mr.gmo b/po/mr.gmo
index bee18214..abc6dbed 100644
--- a/po/mr.gmo
+++ b/po/mr.gmo
Binary files differ
diff --git a/po/ms.gmo b/po/ms.gmo
index eafc34ea..7207c054 100644
--- a/po/ms.gmo
+++ b/po/ms.gmo
Binary files differ
diff --git a/po/nb.gmo b/po/nb.gmo
index de79aae4..d5972605 100644
--- a/po/nb.gmo
+++ b/po/nb.gmo
Binary files differ
diff --git a/po/ne.gmo b/po/ne.gmo
index f70c377a..2c2163bb 100644
--- a/po/ne.gmo
+++ b/po/ne.gmo
Binary files differ
diff --git a/po/nl.gmo b/po/nl.gmo
index daeeb704..a4d1a591 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
Binary files differ
diff --git a/po/nn.gmo b/po/nn.gmo
index 2946b2b2..151c4d16 100644
--- a/po/nn.gmo
+++ b/po/nn.gmo
Binary files differ
diff --git a/po/oc.gmo b/po/oc.gmo
index f9398ed7..bffe8b33 100644
--- a/po/oc.gmo
+++ b/po/oc.gmo
Binary files differ
diff --git a/po/or.gmo b/po/or.gmo
index 44470f02..25b285e4 100644
--- a/po/or.gmo
+++ b/po/or.gmo
Binary files differ
diff --git a/po/pa.gmo b/po/pa.gmo
index 7a5a35f3..d38c0599 100644
--- a/po/pa.gmo
+++ b/po/pa.gmo
Binary files differ
diff --git a/po/pl.gmo b/po/pl.gmo
index 37f00250..77210ac0 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
Binary files differ
diff --git a/po/ps.gmo b/po/ps.gmo
index a0290475..f5b07237 100644
--- a/po/ps.gmo
+++ b/po/ps.gmo
Binary files differ
diff --git a/po/pt.gmo b/po/pt.gmo
index 7df729c0..832c7dcc 100644
--- a/po/pt.gmo
+++ b/po/pt.gmo
Binary files differ
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index 5218d727..dade18e3 100644
--- a/po/pt_BR.gmo
+++ b/po/pt_BR.gmo
Binary files differ
diff --git a/po/ro.gmo b/po/ro.gmo
index da4072fa..f5371a4f 100644
--- a/po/ro.gmo
+++ b/po/ro.gmo
Binary files differ
diff --git a/po/ru.gmo b/po/ru.gmo
index 2d020526..efbb499c 100644
--- a/po/ru.gmo
+++ b/po/ru.gmo
Binary files differ
diff --git a/po/rw.gmo b/po/rw.gmo
index 107ac43e..58df26e7 100644
--- a/po/rw.gmo
+++ b/po/rw.gmo
Binary files differ
diff --git a/po/si.gmo b/po/si.gmo
index 10062465..368634f0 100644
--- a/po/si.gmo
+++ b/po/si.gmo
Binary files differ
diff --git a/po/sk.gmo b/po/sk.gmo
index 02d047f5..3e8e789e 100644
--- a/po/sk.gmo
+++ b/po/sk.gmo
Binary files differ
diff --git a/po/sl.gmo b/po/sl.gmo
index b487dbb2..c2f70f83 100644
--- a/po/sl.gmo
+++ b/po/sl.gmo
Binary files differ
diff --git a/po/sq.gmo b/po/sq.gmo
index a50c7273..b843dbb4 100644
--- a/po/sq.gmo
+++ b/po/sq.gmo
Binary files differ
diff --git a/po/sr.gmo b/po/sr.gmo
index e8c2ef78..8c8ccd94 100644
--- a/po/sr.gmo
+++ b/po/sr.gmo
Binary files differ
diff --git a/po/sr@latin.gmo b/po/sr@latin.gmo
index c71295c8..e079297e 100644
--- a/po/sr@latin.gmo
+++ b/po/sr@latin.gmo
Binary files differ
diff --git a/po/sv.gmo b/po/sv.gmo
index e2094b96..ce7993a4 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
Binary files differ
diff --git a/po/ta.gmo b/po/ta.gmo
index 7bd99f0e..cbc94fdf 100644
--- a/po/ta.gmo
+++ b/po/ta.gmo
Binary files differ
diff --git a/po/te.gmo b/po/te.gmo
index 6fef28c9..c6680e75 100644
--- a/po/te.gmo
+++ b/po/te.gmo
Binary files differ
diff --git a/po/tg.gmo b/po/tg.gmo
index eb8c7941..9fe0a1b6 100644
--- a/po/tg.gmo
+++ b/po/tg.gmo
Binary files differ
diff --git a/po/th.gmo b/po/th.gmo
index c35985a6..2ab36485 100644
--- a/po/th.gmo
+++ b/po/th.gmo
Binary files differ
diff --git a/po/tr.gmo b/po/tr.gmo
index 412448d9..130e6100 100644
--- a/po/tr.gmo
+++ b/po/tr.gmo
Binary files differ
diff --git a/po/ug.gmo b/po/ug.gmo
index bccac3d1..90d63602 100644
--- a/po/ug.gmo
+++ b/po/ug.gmo
Binary files differ
diff --git a/po/uk.gmo b/po/uk.gmo
index ff15ba8d..b2f00417 100644
--- a/po/uk.gmo
+++ b/po/uk.gmo
Binary files differ
diff --git a/po/vi.gmo b/po/vi.gmo
index f5e42802..e9b166ea 100644
--- a/po/vi.gmo
+++ b/po/vi.gmo
Binary files differ
diff --git a/po/xh.gmo b/po/xh.gmo
index 0fd37b21..055d97dd 100644
--- a/po/xh.gmo
+++ b/po/xh.gmo
Binary files differ
diff --git a/po/zenity.pot b/po/zenity.pot
index 2e805f1e..e47b4488 100644
--- a/po/zenity.pot
+++ b/po/zenity.pot
@@ -1,15 +1,14 @@
# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Zenity contributors
+# Copyright (C) YEAR Zenity authors
# This file is distributed under the same license as the zenity package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: zenity 3.28.1\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
-"product=zenity&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2018-04-09 20:04-0400\n"
+"Project-Id-Version: zenity 3.30.0\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/zenity/issues\n"
+"POT-Creation-Date: 2018-10-05 11:34+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 95b44e3e..55d7a7bf 100644
--- a/po/zh_CN.gmo
+++ b/po/zh_CN.gmo
Binary files differ
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f5a509d1..597feca7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,24 +6,25 @@
# Yinghua Wang <wantinghard@gmail.com>, 2011.
# ben <benbenhappy2008@gmail.com>, 2011.
# YunQiang Su <wzssyqa@gmail.com>, 2012.
+# Mingcong Bai <jeffbai@aosc.xyz>, 2018.
#
msgid ""
msgstr ""
"Project-Id-Version: zenity master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
"product=zenity&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-11-10 03:08+0000\n"
-"PO-Revision-Date: 2015-11-12 11:26+0800\n"
-"Last-Translator: liushuyu <liushuyu_011@126.com>\n"
+"POT-Creation-Date: 2018-03-11 08:56+0000\n"
+"PO-Revision-Date: 2018-05-10 12:07-0500\n"
+"Last-Translator: Mingcong Bai <jeffbai@aosc.xyz>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.8.6\n"
+"X-Generator: Poedit 2.0.6\n"
-#: src/about.c:63
+#: src/about.c:60
msgid ""
"This program is free software; you can redistribute it and/or modify it "
"under the terms of the GNU Lesser General Public License as published by the "
@@ -33,7 +34,7 @@ msgstr ""
"本程序是自由软件;您可以按照自由软件基金会所发表的 GNU GPL 协议自由发放和/或"
"修改它;GPL 协议应该采用第二版或以后的任何版本。\n"
-#: src/about.c:67
+#: src/about.c:65
msgid ""
"This program is distributed in the hope that it will be useful, but WITHOUT "
"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -43,7 +44,7 @@ msgstr ""
"本程序发表的目的是希望它能够对您有用,但我们没有任何保证;对于以任何用途使用"
"它所造成的任何直接或间接后果都不承担任何责任。请参看 GNU GPL 协议中的细节。\n"
-#: src/about.c:71
+#: src/about.c:69
msgid ""
"You should have received a copy of the GNU Lesser General Public License "
"along with this program; if not, write to the Free Software Foundation, "
@@ -53,23 +54,39 @@ msgstr ""
"由软件基金会写信,地址是 51 Franklin Street, Fifth Floor, Boston, MA "
"02110-1301, USA"
-#: src/about.c:263
+#: src/about.c:260
msgid "translator-credits"
msgstr "GNOME 简体中文翻译组"
-#: src/about.c:275
+#: src/about.c:277
msgid "Display dialog boxes from shell scripts"
msgstr "在 Shell 脚本中显示对话框"
+#: src/fileselection.c:62 src/fileselection.c:76 src/password.c:60
+msgid "_OK"
+msgstr "确定(_O)"
+
+#: src/fileselection.c:63 src/fileselection.c:74 src/password.c:57
+msgid "_Cancel"
+msgstr "取消(_C)"
+
#: src/main.c:105
msgid "You must specify a dialog type. See 'zenity --help' for details\n"
msgstr "您必须指定对话框类型。请参看“zenity --help”获得更多细节\n"
-#: src/notification.c:51
+#: src/msg.c:38
+msgid "_No"
+msgstr "否(_N)"
+
+#: src/msg.c:40
+msgid "_Yes"
+msgstr "是(_Y)"
+
+#: src/notification.c:50
msgid "Could not parse message\n"
msgstr "无法解析消息\n"
-#: src/notification.c:140
+#: src/notification.c:132
msgid ""
"Invalid value for a boolean typed hint.\n"
"Supported values are 'true' or 'false'.\n"
@@ -78,784 +95,782 @@ msgstr ""
"支持的值为“true”或“false”。\n"
#. (iibiiay)
-#: src/notification.c:156
+#: src/notification.c:149
msgid "Unsupported hint. Skipping.\n"
msgstr "不支持的提示。将跳过。\n"
#. unknown hints
-#: src/notification.c:173
+#: src/notification.c:166
msgid "Unknown hint name. Skipping.\n"
msgstr "未知的提示名。将跳过。\n"
-#: src/notification.c:228
+#: src/notification.c:218
msgid "Could not parse command from stdin\n"
msgstr "无法从 stdin 解析命令\n"
-#: src/notification.c:326
+#: src/notification.c:318
msgid "Zenity notification"
msgstr "Zenity 通知"
-#: src/password.c:55
-msgid "_Cancel"
-msgstr "取消(_C)"
-
-#: src/password.c:58
-msgid "_OK"
-msgstr "确定(_O)"
-
-#. Checks if username has been passed as a parameter
-#: src/password.c:73
-msgid "Type your password"
-msgstr "输入您的密码"
-
-#: src/password.c:76
-msgid "Type your username and password"
-msgstr "输入您的用户名和密码"
-
-#: src/password.c:113
-msgid "Username:"
-msgstr "用户名:"
-
-#: src/password.c:127
-msgid "Password:"
-msgstr "密码:"
-
-#: src/scale.c:57
-msgid "Maximum value must be greater than minimum value.\n"
-msgstr "最大值必须大于最小值。\n"
-
-#: src/scale.c:64
-msgid "Value out of range.\n"
-msgstr "超出范围。\n"
-
-#: src/tree.c:376
-msgid "No column titles specified for List dialog.\n"
-msgstr "列表对话框未指定列标题。\n"
-
-#: src/tree.c:382
-msgid "You should use only one List dialog type.\n"
-msgstr "您应该只使用一种列表对话框类型。\n"
-
-#: src/zenity.ui:14 src/zenity.ui:76
-msgid "Adjust the scale value"
-msgstr "调整范围值"
-
-#: src/zenity.ui:30 src/zenity.ui:135 src/zenity.ui:247 src/zenity.ui:378
-#: src/zenity.ui:578 src/zenity.ui:784 src/zenity.ui:970
-msgid "Cancel"
-msgstr "取消"
-
-#: src/zenity.ui:44 src/zenity.ui:148 src/zenity.ui:261 src/zenity.ui:392
-#: src/zenity.ui:481 src/zenity.ui:591 src/zenity.ui:697 src/zenity.ui:798
-#: src/zenity.ui:984 src/zenity.ui:1080
-msgid "OK"
-msgstr "确定"
-
-#: src/zenity.ui:117
-msgid "Text View"
-msgstr "文字视图"
-
-#: src/zenity.ui:231
-msgid "Calendar selection"
-msgstr "日历选择"
-
-#: src/zenity.ui:298
-msgid "Select a date from below."
-msgstr "从下面选择一个日期。"
-
-#: src/zenity.ui:319
-msgid "C_alendar:"
-msgstr "日历(_A):"
-
-#: src/zenity.ui:361
-msgid "Add a new entry"
-msgstr "添加新项"
-
-#: src/zenity.ui:428
-msgid "_Enter new text:"
-msgstr "输入新文字(_E):"
-
-#: src/zenity.ui:465
-msgid "Error"
-msgstr "错误"
-
-#: src/zenity.ui:530
-msgid "An error has occurred."
-msgstr "发生了错误。"
-
-#: src/zenity.ui:658
-msgid "Forms dialog"
-msgstr "表单对话框"
-
-#: src/zenity.ui:681
-msgid "Information"
-msgstr "信息"
-
-#: src/zenity.ui:741
-msgid "All updates are complete."
-msgstr "所有更新都已完成。"
-
-#: src/zenity.ui:768
-msgid "Progress"
-msgstr "进度"
-
-#: src/zenity.ui:831
-msgid "Running..."
-msgstr "正在运行..."
-
-#: src/zenity.ui:882
-msgid "Question"
-msgstr "问题"
-
-#: src/zenity.ui:929 src/zenity.ui:1126
-msgid "Are you sure you want to proceed?"
-msgstr "您确定要继续吗?"
-
-#: src/zenity.ui:953
-msgid "Select items from the list"
-msgstr "从列表中选择项目"
-
-#: src/zenity.ui:1015
-msgid "Select items from the list below."
-msgstr "从下面的列表中选择项目。"
-
-#: src/zenity.ui:1064
-msgid "Warning"
-msgstr "警告"
-
-#: src/option.c:169
+#: src/option.c:164
msgid "Set the dialog title"
msgstr "设置对话框标题"
-#: src/option.c:170
+#: src/option.c:165
msgid "TITLE"
msgstr "标题"
-#: src/option.c:178
+#: src/option.c:171
msgid "Set the window icon"
msgstr "设置窗口图标"
-#: src/option.c:179
+#: src/option.c:172
msgid "ICONPATH"
msgstr "图标路径"
-#: src/option.c:187
+#: src/option.c:178
msgid "Set the width"
msgstr "设置宽度"
-#: src/option.c:188
+#: src/option.c:179
msgid "WIDTH"
msgstr "宽度"
-#: src/option.c:196
+#: src/option.c:185
msgid "Set the height"
msgstr "设置高度"
-#: src/option.c:197
+#: src/option.c:186
msgid "HEIGHT"
msgstr "高度"
-#: src/option.c:205
+#: src/option.c:192
msgid "Set dialog timeout in seconds"
msgstr "设置对话框超时秒数"
#. Timeout for closing the dialog
-#: src/option.c:207
+#: src/option.c:194
msgid "TIMEOUT"
msgstr "超时"
-#: src/option.c:215
+#: src/option.c:200
msgid "Set the label of the OK button"
msgstr "设定“确定”按钮标签"
-#: src/option.c:216 src/option.c:225 src/option.c:234 src/option.c:276
-#: src/option.c:336 src/option.c:345 src/option.c:379 src/option.c:437
-#: src/option.c:574 src/option.c:699 src/option.c:717 src/option.c:743
-#: src/option.c:823 src/option.c:917 src/option.c:926 src/option.c:988
-#: src/option.c:1046 src/option.c:1215
+#: src/option.c:201 src/option.c:208 src/option.c:215 src/option.c:245
+#: src/option.c:289 src/option.c:296 src/option.c:319 src/option.c:362
+#: src/option.c:468 src/option.c:565 src/option.c:579 src/option.c:598
+#: src/option.c:658 src/option.c:730 src/option.c:737 src/option.c:786
+#: src/option.c:829 src/option.c:960
msgid "TEXT"
msgstr "文字"
-#: src/option.c:224
+#: src/option.c:207
msgid "Set the label of the Cancel button"
msgstr "设定“取消”按钮标签"
-#: src/option.c:233
+#: src/option.c:214
msgid "Add an extra button"
msgstr "添加新按钮"
-#: src/option.c:242
+#: src/option.c:221
msgid "Set the modal hint"
msgstr "设置模态提示"
-#: src/option.c:251
+#: src/option.c:228
msgid "Set the parent window to attach to"
msgstr "设定要吸附的窗口"
-#: src/option.c:252
+#: src/option.c:229
msgid "WINDOW"
msgstr "窗口"
-#: src/option.c:266
+#: src/option.c:237
msgid "Display calendar dialog"
msgstr "显示日历对话框"
-#: src/option.c:275 src/option.c:335 src/option.c:378 src/option.c:436
-#: src/option.c:573 src/option.c:742 src/option.c:822 src/option.c:987
-#: src/option.c:1045 src/option.c:1214
+#: src/option.c:244 src/option.c:288 src/option.c:318 src/option.c:361
+#: src/option.c:467 src/option.c:597 src/option.c:657 src/option.c:785
+#: src/option.c:828 src/option.c:959
msgid "Set the dialog text"
msgstr "设置对话框文字"
-#: src/option.c:284
+#: src/option.c:251
msgid "Set the calendar day"
msgstr "设置日"
-#: src/option.c:285
+#: src/option.c:252
msgid "DAY"
msgstr "日"
-#: src/option.c:293
+#: src/option.c:258
msgid "Set the calendar month"
msgstr "设置月份"
-#: src/option.c:294
+#: src/option.c:259
msgid "MONTH"
msgstr "月份"
-#: src/option.c:302
+#: src/option.c:265
msgid "Set the calendar year"
msgstr "设置年份"
-#: src/option.c:303
+#: src/option.c:266
msgid "YEAR"
msgstr "年份"
-#: src/option.c:311 src/option.c:1232
+#: src/option.c:272 src/option.c:973
msgid "Set the format for the returned date"
msgstr "设置返回日期的格式"
-#: src/option.c:312 src/option.c:1233
+#: src/option.c:273 src/option.c:974
msgid "PATTERN"
msgstr "模式"
-#: src/option.c:326
+#: src/option.c:281
msgid "Display text entry dialog"
msgstr "显示文本输入对话框"
-#: src/option.c:344
+#: src/option.c:295
msgid "Set the entry text"
msgstr "设置输入文字"
-#: src/option.c:353
+#: src/option.c:302
msgid "Hide the entry text"
msgstr "隐藏输入文字"
-#: src/option.c:369
+#: src/option.c:311
msgid "Display error dialog"
msgstr "显示错误对话框"
-#: src/option.c:387 src/option.c:445 src/option.c:831 src/option.c:996
+#: src/option.c:325 src/option.c:368 src/option.c:664 src/option.c:792
msgid "Set the dialog icon"
msgstr "设置对话框图标"
-#: src/option.c:388 src/option.c:446 src/option.c:832 src/option.c:997
+#: src/option.c:326 src/option.c:369 src/option.c:665 src/option.c:793
msgid "ICON-NAME"
msgstr "图标名"
-#: src/option.c:396 src/option.c:454 src/option.c:840 src/option.c:1005
+#: src/option.c:332 src/option.c:375 src/option.c:671 src/option.c:799
msgid "Do not enable text wrapping"
msgstr "不启用文本自动换行"
-#: src/option.c:405 src/option.c:463 src/option.c:849 src/option.c:1014
+#: src/option.c:339 src/option.c:382 src/option.c:678 src/option.c:806
msgid "Do not enable Pango markup"
msgstr "不启用 pango 标记"
-#: src/option.c:413 src/option.c:471 src/option.c:866 src/option.c:1022
+#: src/option.c:345 src/option.c:388 src/option.c:691 src/option.c:812
msgid ""
"Enable ellipsizing in the dialog text. This fixes the high window size with "
"long texts"
msgstr "在对话框文本中启用简略显示。这可以修复带有长文本的窗口的尺寸过大。"
-#: src/option.c:427
+#: src/option.c:354
msgid "Display info dialog"
msgstr "显示信息对话框"
-#: src/option.c:485
+#: src/option.c:398
msgid "Display file selection dialog"
msgstr "显示文件选择对话框"
-#: src/option.c:494
+#: src/option.c:405
msgid "Set the filename"
msgstr "设置文件名"
-#: src/option.c:495 src/option.c:899
+#: src/option.c:406 src/option.c:716
msgid "FILENAME"
msgstr "文件名"
-#: src/option.c:503
+#: src/option.c:412
msgid "Allow multiple files to be selected"
msgstr "允许选中多个文件"
-#: src/option.c:512
+#: src/option.c:419
msgid "Activate directory-only selection"
msgstr "允许只选择文件夹"
-#: src/option.c:521
+#: src/option.c:426
msgid "Activate save mode"
msgstr "激活保存模式"
-#: src/option.c:530 src/option.c:618 src/option.c:1223
+#: src/option.c:433 src/option.c:502 src/option.c:966
msgid "Set output separator character"
msgstr "设置输出分隔符"
-#: src/option.c:531 src/option.c:619 src/option.c:1224
+#: src/option.c:434 src/option.c:503 src/option.c:967
msgid "SEPARATOR"
msgstr "分隔符"
-#: src/option.c:539
+#: src/option.c:440
msgid "Confirm file selection if filename already exists"
msgstr "若文件名已存在则确认是否覆盖文件"
-#: src/option.c:548
+#: src/option.c:448
msgid "Set a filename filter"
msgstr "设置文件名过滤器"
-#. Help for file-filter argument (name and patterns for file selection)
-#: src/option.c:550
+#. Help for file-filter argument (name and patterns for file
+#. selection)
+#: src/option.c:451
msgid "NAME | PATTERN1 PATTERN2 ..."
-msgstr "名称 | 模式1 模式2 ..."
+msgstr "名称 | 模式1 模式2 …"
-#: src/option.c:564
+#: src/option.c:460
msgid "Display list dialog"
msgstr "显示列表对话框"
-#: src/option.c:582
+#: src/option.c:474
msgid "Set the column header"
msgstr "设置列标题"
-#: src/option.c:583
+#: src/option.c:475
msgid "COLUMN"
msgstr "列"
-#: src/option.c:591
+#: src/option.c:481
msgid "Use check boxes for the first column"
msgstr "第一列使用复选框"
-#: src/option.c:600
+#: src/option.c:488
msgid "Use radio buttons for the first column"
msgstr "第一列使用单选钮"
-#: src/option.c:609
+#: src/option.c:495
msgid "Use an image for the first column"
msgstr "第一列使用图像"
-#: src/option.c:627
+#: src/option.c:509
msgid "Allow multiple rows to be selected"
msgstr "允许选中多行"
-#: src/option.c:636 src/option.c:907
+#: src/option.c:516 src/option.c:722
msgid "Allow changes to text"
msgstr "允许更改文字"
-#: src/option.c:645
+#: src/option.c:523
msgid ""
"Print a specific column (Default is 1. 'ALL' can be used to print all "
"columns)"
msgstr "打印指定列(默认为 1。“全部”可用于打印全部列)"
#. Column index number to print out on a list dialog
-#: src/option.c:647 src/option.c:656
+#: src/option.c:526 src/option.c:533
msgid "NUMBER"
msgstr "序号"
-#: src/option.c:655
+#: src/option.c:532
msgid "Hide a specific column"
msgstr "隐藏指定列"
-#: src/option.c:664
+#: src/option.c:539
msgid "Hide the column headers"
msgstr "隐藏列头"
-#: src/option.c:673
+#: src/option.c:546
msgid ""
"Change list default search function searching for text in the middle, not on "
"the beginning"
msgstr "改变默认列表文本搜索模式为从中间开始,而不是从头开始"
-#: src/option.c:689
+#: src/option.c:557
msgid "Display notification"
msgstr "显示通知"
-#: src/option.c:698
+#: src/option.c:564
msgid "Set the notification text"
msgstr "设定通知文字"
-#: src/option.c:707
+#: src/option.c:571
msgid "Listen for commands on stdin"
msgstr "在 stdin 上监听命令"
-#: src/option.c:716
+#: src/option.c:578
msgid "Set the notification hints"
msgstr "设定通知提示"
-#: src/option.c:733
+#: src/option.c:590
msgid "Display progress indication dialog"
msgstr "显示进度指示对话框"
-#: src/option.c:751
+#: src/option.c:604
msgid "Set initial percentage"
msgstr "设定初始百分比"
-#: src/option.c:752
+#: src/option.c:605
msgid "PERCENTAGE"
msgstr "百分比"
-#: src/option.c:760
+#: src/option.c:611
msgid "Pulsate progress bar"
msgstr "跳动进度条"
-#: src/option.c:770
+#: src/option.c:619
#, no-c-format
msgid "Dismiss the dialog when 100% has been reached"
msgstr "达到 100% 时关闭对话框"
-#: src/option.c:779
+#: src/option.c:626
msgid "Kill parent process if Cancel button is pressed"
msgstr "若按下取消按钮则终止父进程"
-#: src/option.c:788
+#: src/option.c:633
msgid "Hide Cancel button"
msgstr "隐藏取消按钮"
-#: src/option.c:798
+#: src/option.c:641
#, no-c-format
msgid "Estimate when progress will reach 100%"
msgstr "在进度快到 100% 时进行预估"
-#: src/option.c:813
+#: src/option.c:650
msgid "Display question dialog"
msgstr "显示问题对话框"
-#: src/option.c:857
+#: src/option.c:684
msgid "Give Cancel button focus by default"
msgstr "\"取消\"按钮默认取得焦点"
-#: src/option.c:874
+#: src/option.c:698
msgid "Suppress OK and Cancel buttons"
msgstr "隐藏确定和取消按钮"
-#: src/option.c:889
+#: src/option.c:708
msgid "Display text information dialog"
msgstr "显示文本信息对话框"
-#: src/option.c:898
+#: src/option.c:715
msgid "Open file"
msgstr "打开文件"
-#: src/option.c:916
+#: src/option.c:729
msgid "Set the text font"
msgstr "设置文本字体"
-#: src/option.c:925
+#: src/option.c:736
msgid "Enable an I read and agree checkbox"
msgstr "启用 我已阅读并同意 复选框"
-#: src/option.c:935
+#: src/option.c:744
msgid "Enable HTML support"
msgstr "启用 HTML 支持"
-#: src/option.c:944
+#: src/option.c:751
msgid ""
"Do not enable user interaction with the WebView. Only works if you use --"
"html option"
msgstr "不让用户与 WebView 进行交互。只在使用 --html 选项时有效"
-#: src/option.c:953
+#: src/option.c:759
msgid "Set an URL instead of a file. Only works if you use --html option"
msgstr "设置一个 URL 而非一个文件。只在使用 --html 选项时有效"
-#: src/option.c:954
+#: src/option.c:761
msgid "URL"
msgstr "URL"
-#: src/option.c:963
+#: src/option.c:768
msgid "Auto scroll the text to the end. Only when text is captured from stdin"
msgstr "自动滚动文本到末尾。只适于文本从标准输入获取的情况"
-#: src/option.c:978
+#: src/option.c:778
msgid "Display warning dialog"
msgstr "显示警告对话框"
-#: src/option.c:1036
+#: src/option.c:821
msgid "Display scale dialog"
msgstr "显示范围对话框"
-#: src/option.c:1054
+#: src/option.c:835
msgid "Set initial value"
msgstr "设置初始值"
-#: src/option.c:1055 src/option.c:1064 src/option.c:1073 src/option.c:1082
-#: src/option.c:1281
+#: src/option.c:836 src/option.c:843 src/option.c:850 src/option.c:857
+#: src/option.c:1008
msgid "VALUE"
msgstr "数值"
-#: src/option.c:1063
+#: src/option.c:842
msgid "Set minimum value"
msgstr "设置最小值"
-#: src/option.c:1072
+#: src/option.c:849
msgid "Set maximum value"
msgstr "设置最大值"
-#: src/option.c:1081
+#: src/option.c:856
msgid "Set step size"
msgstr "设置步进大小"
-#: src/option.c:1090
+#: src/option.c:863
msgid "Print partial values"
msgstr "打印部分值"
-#: src/option.c:1099
+#: src/option.c:870
msgid "Hide value"
msgstr "隐藏值"
-#: src/option.c:1114
+#: src/option.c:879
msgid "Display forms dialog"
msgstr "显示表单对话框"
-#: src/option.c:1123
+#: src/option.c:886
msgid "Add a new Entry in forms dialog"
msgstr "在表单对话框中添加新条目"
-#: src/option.c:1124 src/option.c:1133
+#: src/option.c:887 src/option.c:894
msgid "Field name"
msgstr "域名称"
-#: src/option.c:1132
+#: src/option.c:893
msgid "Add a new Password Entry in forms dialog"
msgstr "在表单对话框中添加新密码条目"
-#: src/option.c:1141
+#: src/option.c:900
msgid "Add a new Calendar in forms dialog"
msgstr "在表单对话框中添加一个新日历"
-#: src/option.c:1142
+#: src/option.c:901
msgid "Calendar field name"
msgstr "日历域名称"
-#: src/option.c:1150
+#: src/option.c:907
msgid "Add a new List in forms dialog"
msgstr "在表单对话框中添加列表"
-#: src/option.c:1151
+#: src/option.c:908
msgid "List field and header name"
msgstr "列表域和标题名"
-#: src/option.c:1159
+#: src/option.c:914
msgid "List of values for List"
msgstr "列表值的列表"
-#: src/option.c:1160 src/option.c:1169 src/option.c:1187
+#: src/option.c:915 src/option.c:922 src/option.c:936
msgid "List of values separated by |"
msgstr "| 分隔的列表值"
-#: src/option.c:1168
+#: src/option.c:921
msgid "List of values for columns"
msgstr "列值的列表"
-#: src/option.c:1177
+#: src/option.c:928
msgid "Add a new combo box in forms dialog"
msgstr "在表单对话框中添加新组合框"
-#: src/option.c:1178
+#: src/option.c:929
msgid "Combo box field name"
msgstr "组合框域名称"
-#: src/option.c:1186
+#: src/option.c:935
msgid "List of values for combo box"
msgstr "组合框值列表"
-#: src/option.c:1205
+#: src/option.c:952
msgid "Show the columns header"
msgstr "显示列标题"
-#: src/option.c:1247
+#: src/option.c:983
msgid "Display password dialog"
msgstr "显示口令对话框"
-#: src/option.c:1256
+#: src/option.c:990
msgid "Display the username option"
msgstr "显示用户名选项"
-#: src/option.c:1271
+#: src/option.c:1000
msgid "Display color selection dialog"
msgstr "显示颜色选择对话框"
-#: src/option.c:1280
+#: src/option.c:1007
msgid "Set the color"
msgstr "设定颜色"
-#: src/option.c:1289
+#: src/option.c:1014
msgid "Show the palette"
msgstr "显示调色板"
-#: src/option.c:1304
+#: src/option.c:1023
msgid "About zenity"
msgstr "关于 zenity"
-#: src/option.c:1313
+#: src/option.c:1030
msgid "Print version"
msgstr "打印版本"
-#: src/option.c:2261
+#: src/option.c:1913
msgid "General options"
msgstr "常规选项"
-#: src/option.c:2262
+#: src/option.c:1914
msgid "Show general options"
msgstr "显示常规选项"
-#: src/option.c:2272
+#: src/option.c:1926
msgid "Calendar options"
msgstr "日历选项"
-#: src/option.c:2273
+#: src/option.c:1927
msgid "Show calendar options"
msgstr "显示日历选项"
-#: src/option.c:2283
+#: src/option.c:1939
msgid "Text entry options"
msgstr "文字输入选项"
-#: src/option.c:2284
+#: src/option.c:1940
msgid "Show text entry options"
msgstr "显示文字输入选项"
-#: src/option.c:2294
+#: src/option.c:1952
msgid "Error options"
msgstr "错误选项"
-#: src/option.c:2295
+#: src/option.c:1952
msgid "Show error options"
msgstr "显示错误选项"
-#: src/option.c:2305
+#: src/option.c:1962
msgid "Info options"
msgstr "信息选项"
-#: src/option.c:2306
+#: src/option.c:1962
msgid "Show info options"
msgstr "显示信息选项"
-#: src/option.c:2316
+#: src/option.c:1972
msgid "File selection options"
msgstr "文件选择选项"
-#: src/option.c:2317
+#: src/option.c:1973
msgid "Show file selection options"
msgstr "显示文件选择选项"
-#: src/option.c:2327
+#: src/option.c:1985
msgid "List options"
msgstr "列表选项"
-#: src/option.c:2328
+#: src/option.c:1985
msgid "Show list options"
msgstr "显示列表选项"
-#: src/option.c:2339
+#: src/option.c:1996
msgid "Notification icon options"
msgstr "通知图标选项"
-#: src/option.c:2340
+#: src/option.c:1997
msgid "Show notification icon options"
msgstr "显示通知图标选项"
-#: src/option.c:2351
+#: src/option.c:2011
msgid "Progress options"
msgstr "进度选项"
-#: src/option.c:2352
+#: src/option.c:2012
msgid "Show progress options"
msgstr "显示进度选项"
-#: src/option.c:2362
+#: src/option.c:2024
msgid "Question options"
msgstr "问题选项"
-#: src/option.c:2363
+#: src/option.c:2025
msgid "Show question options"
msgstr "显示问题选项"
-#: src/option.c:2373
+#: src/option.c:2037
msgid "Warning options"
msgstr "警告选项"
-#: src/option.c:2374
+#: src/option.c:2038
msgid "Show warning options"
msgstr "显示警告选项"
-#: src/option.c:2384
+#: src/option.c:2050
msgid "Scale options"
msgstr "范围选项"
-#: src/option.c:2385
+#: src/option.c:2050
msgid "Show scale options"
msgstr "显示范围选项"
-#: src/option.c:2395
+#: src/option.c:2060
msgid "Text information options"
msgstr "文本信息选项"
-#: src/option.c:2396
+#: src/option.c:2061
msgid "Show text information options"
msgstr "显示文本信息选项"
-#: src/option.c:2406
+#: src/option.c:2073
msgid "Color selection options"
msgstr "颜色选择选项"
-#: src/option.c:2407
+#: src/option.c:2074
msgid "Show color selection options"
msgstr "显示颜色选择选项"
-#: src/option.c:2417
+#: src/option.c:2086
msgid "Password dialog options"
msgstr "口令对话框选项。"
-#: src/option.c:2418
+#: src/option.c:2087
msgid "Show password dialog options"
msgstr "显示口令对话框选项"
-#: src/option.c:2428
+#: src/option.c:2099
msgid "Forms dialog options"
msgstr "表单对话框选项"
-#: src/option.c:2429
+#: src/option.c:2100
msgid "Show forms dialog options"
msgstr "显示表单对话框选项"
-#: src/option.c:2439
+#: src/option.c:2112
msgid "Miscellaneous options"
msgstr "杂类选项"
-#: src/option.c:2440
+#: src/option.c:2113
msgid "Show miscellaneous options"
msgstr "显示杂类选项"
-#: src/option.c:2465
+#: src/option.c:2139
msgid ""
"This option is not available. Please see --help for all possible usages.\n"
msgstr "此选项不可用。请参看 --help 了解所有能用的用法。\n"
-#: src/option.c:2469
+#: src/option.c:2144
#, c-format
msgid "--%s is not supported for this dialog\n"
msgstr "此对话框不支持 --%s\n"
-#: src/option.c:2473
+#: src/option.c:2148
msgid "Two or more dialog options specified\n"
msgstr "指定了两个或更多对话框选项\n"
+#. Checks if username has been passed as a parameter
+#: src/password.c:70
+msgid "Type your password"
+msgstr "输入您的密码"
+
+#: src/password.c:73
+msgid "Type your username and password"
+msgstr "输入您的用户名和密码"
+
+#: src/password.c:100
+msgid "Username:"
+msgstr "用户名:"
+
+#: src/password.c:110
+msgid "Password:"
+msgstr "密码:"
+
+#: src/progress.c:102
+#, c-format
+msgid "Time remaining: %lu:%02lu:%02lu"
+msgstr "剩余时间:%lu:%02lu:%02lu"
+
+#: src/scale.c:62
+msgid "Maximum value must be greater than minimum value.\n"
+msgstr "最大值必须大于最小值。\n"
+
+#: src/scale.c:69
+msgid "Value out of range.\n"
+msgstr "超出范围。\n"
+
+#: src/tree.c:393
+msgid "No column titles specified for List dialog.\n"
+msgstr "列表对话框未指定列标题。\n"
+
+#: src/tree.c:399
+msgid "You should use only one List dialog type.\n"
+msgstr "您应该只使用一种列表对话框类型。\n"
+
+#: src/zenity.ui:14 src/zenity.ui:76
+msgid "Adjust the scale value"
+msgstr "调整范围值"
+
+#: src/zenity.ui:30 src/zenity.ui:135 src/zenity.ui:247 src/zenity.ui:378
+#: src/zenity.ui:578 src/zenity.ui:784 src/zenity.ui:970
+msgid "Cancel"
+msgstr "取消"
+
+#: src/zenity.ui:44 src/zenity.ui:148 src/zenity.ui:261 src/zenity.ui:392
+#: src/zenity.ui:481 src/zenity.ui:591 src/zenity.ui:697 src/zenity.ui:798
+#: src/zenity.ui:984 src/zenity.ui:1080
+msgid "OK"
+msgstr "确定"
+
+#: src/zenity.ui:117
+msgid "Text View"
+msgstr "文字视图"
+
+#: src/zenity.ui:231
+msgid "Calendar selection"
+msgstr "日历选择"
+
+#: src/zenity.ui:298
+msgid "Select a date from below."
+msgstr "从下面选择一个日期。"
+
+#: src/zenity.ui:319
+msgid "C_alendar:"
+msgstr "日历(_A):"
+
+#: src/zenity.ui:361
+msgid "Add a new entry"
+msgstr "添加新项"
+
+#: src/zenity.ui:428
+msgid "_Enter new text:"
+msgstr "输入新文字(_E):"
+
+#: src/zenity.ui:465
+msgid "Error"
+msgstr "错误"
+
+#: src/zenity.ui:530
+msgid "An error has occurred."
+msgstr "发生了错误。"
+
+#: src/zenity.ui:658
+msgid "Forms dialog"
+msgstr "表单对话框"
+
+#: src/zenity.ui:681
+msgid "Information"
+msgstr "信息"
+
+#: src/zenity.ui:741
+msgid "All updates are complete."
+msgstr "所有更新都已完成。"
+
+#: src/zenity.ui:768
+msgid "Progress"
+msgstr "进度"
+
+#: src/zenity.ui:831
+msgid "Running..."
+msgstr "正在运行…"
+
+#: src/zenity.ui:882
+msgid "Question"
+msgstr "问题"
+
+#: src/zenity.ui:929 src/zenity.ui:1126
+msgid "Are you sure you want to proceed?"
+msgstr "您确定要继续吗?"
+
+#: src/zenity.ui:953
+msgid "Select items from the list"
+msgstr "从列表中选择项目"
+
+#: src/zenity.ui:1015
+msgid "Select items from the list below."
+msgstr "从下面的列表中选择项目。"
+
+#: src/zenity.ui:1064
+msgid "Warning"
+msgstr "警告"
+
#~ msgid "Select a file"
#~ msgstr "选择文件"
diff --git a/po/zh_HK.gmo b/po/zh_HK.gmo
index e4901988..406bedad 100644
--- a/po/zh_HK.gmo
+++ b/po/zh_HK.gmo
Binary files differ
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index 4f3b7526..894b99f6 100644
--- a/po/zh_TW.gmo
+++ b/po/zh_TW.gmo
Binary files differ
diff --git a/src/Makefile.in b/src/Makefile.in
index 10411c5e..b457fd9a 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -342,7 +342,6 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
-runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
bgstack15