Merge lp:~jbicha/ubuntu/oneiric/gnome-shell/oneiric-3.2.2.1 into lp:ubuntu/oneiric-proposed/gnome-shell
- Oneiric (11.10)
- oneiric-3.2.2.1
- Merge into oneiric-proposed
Proposed by
Jeremy Bícha
Status: | Merged |
---|---|
Merged at revision: | 47 |
Proposed branch: | lp:~jbicha/ubuntu/oneiric/gnome-shell/oneiric-3.2.2.1 |
Merge into: | lp:ubuntu/oneiric-proposed/gnome-shell |
Diff against target: |
19128 lines (+5838/-3625) 50 files modified
NEWS (+51/-0) aclocal.m4 (+594/-594) browser-plugin/browser-plugin.c (+51/-20) configure (+10/-10) configure.ac (+1/-1) debian/changelog (+31/-0) debian/control (+11/-0) debian/control.in (+11/-0) debian/gnome-shell-common.install (+4/-0) debian/gnome-shell.install (+6/-0) debian/patches/02_rpath-bluetooth-applet.patch (+32/-0) debian/patches/04_remove-glx-dependency-on-armel.patch (+52/-0) debian/patches/07-NetworkMenu-fix-logic-for-updating-wifi-icon.patch (+49/-0) debian/patches/08-polkit-Find-the-best-user-to-authenticate-as.patch (+49/-0) debian/patches/09-respect-NoDisplay-semantics-for-app-menu.patch (+27/-0) debian/patches/10-bluetooth-fix-connection-from-gs-menu.patch (+31/-0) debian/patches/series (+6/-1) js/misc/config.js (+2/-2) js/misc/fileUtils.js (+1/-1) js/ui/iconGrid.js (+5/-0) js/ui/messageTray.js (+23/-3) js/ui/notificationDaemon.js (+56/-36) js/ui/status/network.js (+38/-29) js/ui/workspaceThumbnail.js (+47/-26) po/bg.po (+80/-77) po/ca.po (+138/-122) po/ca@valencia.po (+150/-135) po/cs.po (+181/-206) po/da.po (+239/-157) po/en_GB.po (+83/-71) po/eo.po (+163/-147) po/es.po (+167/-156) po/fa.po (+149/-134) po/fi.po (+212/-86) po/fr.po (+80/-67) po/ja.po (+56/-47) po/lt.po (+438/-375) po/nb.po (+143/-131) po/nn.po (+1591/-375) po/pt_BR.po (+92/-74) po/sl.po (+148/-131) po/sv.po (+187/-114) po/te.po (+151/-135) po/vi.po (+154/-140) src/gnome-shell-extension-tool.in (+2/-1) src/hotplug-sniffer/hotplug-sniffer.c (+2/-13) src/shell-app.c (+9/-6) src/st/st-icon.c (+15/-0) src/st/st-theme-node-drawing.c (+14/-2) src/st/st-theme-node.c (+6/-0) |
To merge this branch: | bzr merge lp:~jbicha/ubuntu/oneiric/gnome-shell/oneiric-3.2.2.1 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Luke Yelavich (community) | Needs Fixing | ||
Review via email: mp+89781@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
- 47. By Jeremy Bícha
-
New upstream release (LP: #921343)
- 48. By Jeremy Bícha
-
add missing files
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'NEWS' |
2 | --- NEWS 2011-10-24 06:43:05 +0000 |
3 | +++ NEWS 2012-01-25 02:33:28 +0000 |
4 | @@ -1,3 +1,54 @@ |
5 | +3.2.2.1 |
6 | +======= |
7 | +* Fix several regressions with tray icons introduced in 3.2.2 [Owen; #664138] |
8 | + |
9 | +Contributors: |
10 | + Owen Taylor |
11 | + |
12 | +3.2.2 |
13 | +===== |
14 | +* Fix crash when searching in the shell caused by .desktop files |
15 | + without Exec= lines (commonly, nautilus-pastebin) [Ray; #663815] |
16 | +* Message Tray: |
17 | + - Fix bug that would cause confusion between notifications from different |
18 | + services running in the gnome-settings-daemon process |
19 | + [Marina, Jasper; #664138] |
20 | + - Don't steal the focus when popping up beneath the pointer [Rui; #661358] |
21 | + - Only pop up the message tray from a hot corner, rather than trapping |
22 | + clicks on the entire bottom row. [Rui; #663366] |
23 | +* Browser plugin and extension.gnome.org integration |
24 | + - Fix multiple bugs that kept the plugin from working in WebKit-based browsers |
25 | + [Jasper, #663823, #666444] |
26 | + - Fix plugin crash when the shell is installed but not running [Jürg] |
27 | + - Fix problem that kept plugin uninstallation from working [Jasper] |
28 | +* gnome-shell-extension-tool |
29 | + - Fix error that was printed after creating an extension [Jasper; #661623] |
30 | + - Use xdg-open rather than the deprecated gnome-open [Jasper] |
31 | +* Don't recreate dash icons unnecessarily - this hopefully fixes various |
32 | + crashes. [Owen, Giovanni; #648450] |
33 | +* Fix several bugs that caused errors and slowdowns when updating the |
34 | + network menu. [Giovanni; #651378, #659277, #663278] |
35 | +* Fix several crashers related to updating workspace thumbnails |
36 | + [Owen; #667652] |
37 | +* Fix memory management error causing gnome-shell-hotplug-sniffer to crash |
38 | + [Owen; #667378] |
39 | +* Fix crash and misdrawing with shadowed elements [Owen; #668048, #668050] |
40 | +* Fix several small memory leaks. [Jasper, Florian] |
41 | + |
42 | +Contributors: |
43 | + Jürg Billeter, Rui Matos, Florian Müllner, Jasper St. Pierre, Ray Strode, |
44 | + Owen Taylor, Marina Zhurakhinskaya |
45 | + |
46 | +Translations: |
47 | + Alexander Shopov [bg], Gil Forcada [ca], Carles Ferrando [ca@valencia], |
48 | + Marek Černocký [cz], Kris Thomsen [dk], Bruce Cowan [en_GB], |
49 | + Kristjan Schmidt [eo], Daniel Mustieles [es], Arash Mousavi [fa], |
50 | + Ville-Pekka Vainio [fi], Bruno Brouard [fr], Hideki Yamane [ja], |
51 | + Žygimantas Beručka, Aurimas Černius [lt], Kjartan Maraas [nb], |
52 | + "Andreas N" [nn], Djavan Fagundes, Antonio Fernandes C. Neto [pt_BR], |
53 | + Daniel Nylander [se], Matej Urbančič [sl], Praveen Illa [te], |
54 | + Nguyễn Thái Ngọc Duy [vi] |
55 | + |
56 | 3.2.1 |
57 | ===== |
58 | * Restore the IM state on startup - if you were available in when you logged |
59 | |
60 | === modified file 'aclocal.m4' |
61 | --- aclocal.m4 2011-07-20 14:46:28 +0000 |
62 | +++ aclocal.m4 2012-01-25 02:33:28 +0000 |
63 | @@ -19,6 +19,600 @@ |
64 | If you have problems, you may need to regenerate the build system entirely. |
65 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
66 | |
67 | +dnl AM_GCONF_SOURCE_2 |
68 | +dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas |
69 | +dnl (i.e. pass to gconftool-2 |
70 | +dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where |
71 | +dnl you should install foo.schemas files |
72 | +dnl |
73 | + |
74 | +AC_DEFUN([AM_GCONF_SOURCE_2], |
75 | +[ |
76 | + if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then |
77 | + GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` |
78 | + else |
79 | + GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE |
80 | + fi |
81 | + |
82 | + AC_ARG_WITH([gconf-source], |
83 | + AC_HELP_STRING([--with-gconf-source=sourceaddress], |
84 | + [Config database for installing schema files.]), |
85 | + [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],) |
86 | + |
87 | + AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) |
88 | + AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) |
89 | + |
90 | + if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then |
91 | + GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' |
92 | + fi |
93 | + |
94 | + AC_ARG_WITH([gconf-schema-file-dir], |
95 | + AC_HELP_STRING([--with-gconf-schema-file-dir=dir], |
96 | + [Directory for installing schema files.]), |
97 | + [GCONF_SCHEMA_FILE_DIR="$withval"],) |
98 | + |
99 | + AC_SUBST(GCONF_SCHEMA_FILE_DIR) |
100 | + AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) |
101 | + |
102 | + AC_ARG_ENABLE(schemas-install, |
103 | + AC_HELP_STRING([--disable-schemas-install], |
104 | + [Disable the schemas installation]), |
105 | + [case ${enableval} in |
106 | + yes|no) ;; |
107 | + *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;; |
108 | + esac]) |
109 | + AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) |
110 | +]) |
111 | + |
112 | +# Configure paths for GLIB |
113 | +# Owen Taylor 1997-2001 |
114 | + |
115 | +dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) |
116 | +dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, |
117 | +dnl gthread, or gio is specified in MODULES, pass to pkg-config |
118 | +dnl |
119 | +AC_DEFUN([AM_PATH_GLIB_2_0], |
120 | +[dnl |
121 | +dnl Get the cflags and libraries from pkg-config |
122 | +dnl |
123 | +AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], |
124 | + , enable_glibtest=yes) |
125 | + |
126 | + pkg_config_args=glib-2.0 |
127 | + for module in . $4 |
128 | + do |
129 | + case "$module" in |
130 | + gmodule) |
131 | + pkg_config_args="$pkg_config_args gmodule-2.0" |
132 | + ;; |
133 | + gmodule-no-export) |
134 | + pkg_config_args="$pkg_config_args gmodule-no-export-2.0" |
135 | + ;; |
136 | + gobject) |
137 | + pkg_config_args="$pkg_config_args gobject-2.0" |
138 | + ;; |
139 | + gthread) |
140 | + pkg_config_args="$pkg_config_args gthread-2.0" |
141 | + ;; |
142 | + gio*) |
143 | + pkg_config_args="$pkg_config_args $module-2.0" |
144 | + ;; |
145 | + esac |
146 | + done |
147 | + |
148 | + PKG_PROG_PKG_CONFIG([0.16]) |
149 | + |
150 | + no_glib="" |
151 | + |
152 | + if test "x$PKG_CONFIG" = x ; then |
153 | + no_glib=yes |
154 | + PKG_CONFIG=no |
155 | + fi |
156 | + |
157 | + min_glib_version=ifelse([$1], ,2.0.0,$1) |
158 | + AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) |
159 | + |
160 | + if test x$PKG_CONFIG != xno ; then |
161 | + ## don't try to run the test against uninstalled libtool libs |
162 | + if $PKG_CONFIG --uninstalled $pkg_config_args; then |
163 | + echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" |
164 | + enable_glibtest=no |
165 | + fi |
166 | + |
167 | + if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then |
168 | + : |
169 | + else |
170 | + no_glib=yes |
171 | + fi |
172 | + fi |
173 | + |
174 | + if test x"$no_glib" = x ; then |
175 | + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` |
176 | + GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` |
177 | + GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` |
178 | + |
179 | + GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` |
180 | + GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` |
181 | + glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ |
182 | + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` |
183 | + glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ |
184 | + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` |
185 | + glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ |
186 | + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` |
187 | + if test "x$enable_glibtest" = "xyes" ; then |
188 | + ac_save_CFLAGS="$CFLAGS" |
189 | + ac_save_LIBS="$LIBS" |
190 | + CFLAGS="$CFLAGS $GLIB_CFLAGS" |
191 | + LIBS="$GLIB_LIBS $LIBS" |
192 | +dnl |
193 | +dnl Now check if the installed GLIB is sufficiently new. (Also sanity |
194 | +dnl checks the results of pkg-config to some extent) |
195 | +dnl |
196 | + rm -f conf.glibtest |
197 | + AC_TRY_RUN([ |
198 | +#include <glib.h> |
199 | +#include <stdio.h> |
200 | +#include <stdlib.h> |
201 | + |
202 | +int |
203 | +main () |
204 | +{ |
205 | + unsigned int major, minor, micro; |
206 | + char *tmp_version; |
207 | + |
208 | + fclose (fopen ("conf.glibtest", "w")); |
209 | + |
210 | + /* HP/UX 9 (%@#!) writes to sscanf strings */ |
211 | + tmp_version = g_strdup("$min_glib_version"); |
212 | + if (sscanf(tmp_version, "%u.%u.%u", &major, &minor, µ) != 3) { |
213 | + printf("%s, bad version string\n", "$min_glib_version"); |
214 | + exit(1); |
215 | + } |
216 | + |
217 | + if ((glib_major_version != $glib_config_major_version) || |
218 | + (glib_minor_version != $glib_config_minor_version) || |
219 | + (glib_micro_version != $glib_config_micro_version)) |
220 | + { |
221 | + printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", |
222 | + $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, |
223 | + glib_major_version, glib_minor_version, glib_micro_version); |
224 | + printf ("*** was found! If pkg-config was correct, then it is best\n"); |
225 | + printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); |
226 | + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); |
227 | + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); |
228 | + printf("*** required on your system.\n"); |
229 | + printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); |
230 | + printf("*** to point to the correct configuration files\n"); |
231 | + } |
232 | + else if ((glib_major_version != GLIB_MAJOR_VERSION) || |
233 | + (glib_minor_version != GLIB_MINOR_VERSION) || |
234 | + (glib_micro_version != GLIB_MICRO_VERSION)) |
235 | + { |
236 | + printf("*** GLIB header files (version %d.%d.%d) do not match\n", |
237 | + GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); |
238 | + printf("*** library (version %d.%d.%d)\n", |
239 | + glib_major_version, glib_minor_version, glib_micro_version); |
240 | + } |
241 | + else |
242 | + { |
243 | + if ((glib_major_version > major) || |
244 | + ((glib_major_version == major) && (glib_minor_version > minor)) || |
245 | + ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) |
246 | + { |
247 | + return 0; |
248 | + } |
249 | + else |
250 | + { |
251 | + printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n", |
252 | + glib_major_version, glib_minor_version, glib_micro_version); |
253 | + printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n", |
254 | + major, minor, micro); |
255 | + printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); |
256 | + printf("***\n"); |
257 | + printf("*** If you have already installed a sufficiently new version, this error\n"); |
258 | + printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); |
259 | + printf("*** being found. The easiest way to fix this is to remove the old version\n"); |
260 | + printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); |
261 | + printf("*** correct copy of pkg-config. (In this case, you will have to\n"); |
262 | + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); |
263 | + printf("*** so that the correct libraries are found at run-time))\n"); |
264 | + } |
265 | + } |
266 | + return 1; |
267 | +} |
268 | +],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) |
269 | + CFLAGS="$ac_save_CFLAGS" |
270 | + LIBS="$ac_save_LIBS" |
271 | + fi |
272 | + fi |
273 | + if test "x$no_glib" = x ; then |
274 | + AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) |
275 | + ifelse([$2], , :, [$2]) |
276 | + else |
277 | + AC_MSG_RESULT(no) |
278 | + if test "$PKG_CONFIG" = "no" ; then |
279 | + echo "*** A new enough version of pkg-config was not found." |
280 | + echo "*** See http://www.freedesktop.org/software/pkgconfig/" |
281 | + else |
282 | + if test -f conf.glibtest ; then |
283 | + : |
284 | + else |
285 | + echo "*** Could not run GLIB test program, checking why..." |
286 | + ac_save_CFLAGS="$CFLAGS" |
287 | + ac_save_LIBS="$LIBS" |
288 | + CFLAGS="$CFLAGS $GLIB_CFLAGS" |
289 | + LIBS="$LIBS $GLIB_LIBS" |
290 | + AC_TRY_LINK([ |
291 | +#include <glib.h> |
292 | +#include <stdio.h> |
293 | +], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], |
294 | + [ echo "*** The test program compiled, but did not run. This usually means" |
295 | + echo "*** that the run-time linker is not finding GLIB or finding the wrong" |
296 | + echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" |
297 | + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" |
298 | + echo "*** to the installed location Also, make sure you have run ldconfig if that" |
299 | + echo "*** is required on your system" |
300 | + echo "***" |
301 | + echo "*** If you have an old version installed, it is best to remove it, although" |
302 | + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], |
303 | + [ echo "*** The test program failed to compile or link. See the file config.log for the" |
304 | + echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) |
305 | + CFLAGS="$ac_save_CFLAGS" |
306 | + LIBS="$ac_save_LIBS" |
307 | + fi |
308 | + fi |
309 | + GLIB_CFLAGS="" |
310 | + GLIB_LIBS="" |
311 | + GLIB_GENMARSHAL="" |
312 | + GOBJECT_QUERY="" |
313 | + GLIB_MKENUMS="" |
314 | + ifelse([$3], , :, [$3]) |
315 | + fi |
316 | + AC_SUBST(GLIB_CFLAGS) |
317 | + AC_SUBST(GLIB_LIBS) |
318 | + AC_SUBST(GLIB_GENMARSHAL) |
319 | + AC_SUBST(GOBJECT_QUERY) |
320 | + AC_SUBST(GLIB_MKENUMS) |
321 | + rm -f conf.glibtest |
322 | +]) |
323 | + |
324 | +dnl GLIB_GSETTINGS |
325 | +dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether |
326 | +dnl the schema should be compiled |
327 | +dnl |
328 | + |
329 | +AC_DEFUN([GLIB_GSETTINGS], |
330 | +[ |
331 | + m4_pattern_allow([AM_V_GEN]) |
332 | + AC_ARG_ENABLE(schemas-compile, |
333 | + AS_HELP_STRING([--disable-schemas-compile], |
334 | + [Disable regeneration of gschemas.compiled on install]), |
335 | + [case ${enableval} in |
336 | + yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; |
337 | + no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; |
338 | + *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;; |
339 | + esac]) |
340 | + AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) |
341 | + PKG_PROG_PKG_CONFIG([0.16]) |
342 | + AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) |
343 | + if test x$cross_compiling != xyes; then |
344 | + GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` |
345 | + else |
346 | + AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) |
347 | + fi |
348 | + AC_SUBST(GLIB_COMPILE_SCHEMAS) |
349 | + if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then |
350 | + ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2]) |
351 | + else |
352 | + ifelse([$1],,[:],[$1]) |
353 | + fi |
354 | + |
355 | + GSETTINGS_RULES=' |
356 | +.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas |
357 | + |
358 | +mostlyclean-am: clean-gsettings-schemas |
359 | + |
360 | +gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) |
361 | + |
362 | +%.gschema.valid: %.gschema.xml $(gsettings__enum_file) |
363 | + $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@ |
364 | + |
365 | +all-am: $(gsettings_SCHEMAS:.xml=.valid) |
366 | +uninstall-am: uninstall-gsettings-schemas |
367 | +install-data-am: install-gsettings-schemas |
368 | + |
369 | +.SECONDARY: $(gsettings_SCHEMAS) |
370 | + |
371 | +install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) |
372 | + @$(NORMAL_INSTALL) |
373 | + if test -n "$^"; then \ |
374 | + test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ |
375 | + $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ |
376 | + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ |
377 | + fi |
378 | + |
379 | +uninstall-gsettings-schemas: |
380 | + @$(NORMAL_UNINSTALL) |
381 | + @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ |
382 | + files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ |
383 | + test -n "$$files" || exit 0; \ |
384 | + echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ |
385 | + cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files |
386 | + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) |
387 | + |
388 | +clean-gsettings-schemas: |
389 | + rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) |
390 | + |
391 | +ifdef gsettings_ENUM_NAMESPACE |
392 | +$(gsettings__enum_file): $(gsettings_ENUM_FILES) |
393 | + $(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail " </@type@>" --ftail "</schemalist>" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@ |
394 | +endif |
395 | +' |
396 | + _GSETTINGS_SUBST(GSETTINGS_RULES) |
397 | +]) |
398 | + |
399 | +dnl _GSETTINGS_SUBST(VARIABLE) |
400 | +dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST |
401 | +AC_DEFUN([_GSETTINGS_SUBST], |
402 | +[ |
403 | +AC_SUBST([$1]) |
404 | +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) |
405 | +] |
406 | +) |
407 | + |
408 | +dnl -*- mode: autoconf -*- |
409 | +dnl Copyright 2009 Johan Dahlin |
410 | +dnl |
411 | +dnl This file is free software; the author(s) gives unlimited |
412 | +dnl permission to copy and/or distribute it, with or without |
413 | +dnl modifications, as long as this notice is preserved. |
414 | +dnl |
415 | + |
416 | +# serial 1 |
417 | + |
418 | +m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], |
419 | +[ |
420 | + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first |
421 | + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first |
422 | + AC_BEFORE([LT_INIT],[$0])dnl setup libtool first |
423 | + |
424 | + dnl enable/disable introspection |
425 | + m4_if([$2], [require], |
426 | + [dnl |
427 | + enable_introspection=yes |
428 | + ],[dnl |
429 | + AC_ARG_ENABLE(introspection, |
430 | + AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], |
431 | + [Enable introspection for this build]),, |
432 | + [enable_introspection=auto]) |
433 | + ])dnl |
434 | + |
435 | + AC_MSG_CHECKING([for gobject-introspection]) |
436 | + |
437 | + dnl presence/version checking |
438 | + AS_CASE([$enable_introspection], |
439 | + [no], [dnl |
440 | + found_introspection="no (disabled, use --enable-introspection to enable)" |
441 | + ],dnl |
442 | + [yes],[dnl |
443 | + PKG_CHECK_EXISTS([gobject-introspection-1.0],, |
444 | + AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) |
445 | + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], |
446 | + found_introspection=yes, |
447 | + AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) |
448 | + ],dnl |
449 | + [auto],[dnl |
450 | + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) |
451 | + ],dnl |
452 | + [dnl |
453 | + AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) |
454 | + ])dnl |
455 | + |
456 | + AC_MSG_RESULT([$found_introspection]) |
457 | + |
458 | + INTROSPECTION_SCANNER= |
459 | + INTROSPECTION_COMPILER= |
460 | + INTROSPECTION_GENERATE= |
461 | + INTROSPECTION_GIRDIR= |
462 | + INTROSPECTION_TYPELIBDIR= |
463 | + if test "x$found_introspection" = "xyes"; then |
464 | + INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` |
465 | + INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` |
466 | + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` |
467 | + INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` |
468 | + INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" |
469 | + INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` |
470 | + INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` |
471 | + INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection |
472 | + fi |
473 | + AC_SUBST(INTROSPECTION_SCANNER) |
474 | + AC_SUBST(INTROSPECTION_COMPILER) |
475 | + AC_SUBST(INTROSPECTION_GENERATE) |
476 | + AC_SUBST(INTROSPECTION_GIRDIR) |
477 | + AC_SUBST(INTROSPECTION_TYPELIBDIR) |
478 | + AC_SUBST(INTROSPECTION_CFLAGS) |
479 | + AC_SUBST(INTROSPECTION_LIBS) |
480 | + AC_SUBST(INTROSPECTION_MAKEFILE) |
481 | + |
482 | + AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") |
483 | +]) |
484 | + |
485 | + |
486 | +dnl Usage: |
487 | +dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) |
488 | + |
489 | +AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], |
490 | +[ |
491 | + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) |
492 | +]) |
493 | + |
494 | +dnl Usage: |
495 | +dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) |
496 | + |
497 | + |
498 | +AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], |
499 | +[ |
500 | + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) |
501 | +]) |
502 | + |
503 | +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- |
504 | +# serial 1 (pkg-config-0.24) |
505 | +# |
506 | +# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. |
507 | +# |
508 | +# This program is free software; you can redistribute it and/or modify |
509 | +# it under the terms of the GNU General Public License as published by |
510 | +# the Free Software Foundation; either version 2 of the License, or |
511 | +# (at your option) any later version. |
512 | +# |
513 | +# This program is distributed in the hope that it will be useful, but |
514 | +# WITHOUT ANY WARRANTY; without even the implied warranty of |
515 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
516 | +# General Public License for more details. |
517 | +# |
518 | +# You should have received a copy of the GNU General Public License |
519 | +# along with this program; if not, write to the Free Software |
520 | +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
521 | +# |
522 | +# As a special exception to the GNU General Public License, if you |
523 | +# distribute this file as part of a program that contains a |
524 | +# configuration script generated by Autoconf, you may include it under |
525 | +# the same distribution terms that you use for the rest of that program. |
526 | + |
527 | +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) |
528 | +# ---------------------------------- |
529 | +AC_DEFUN([PKG_PROG_PKG_CONFIG], |
530 | +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) |
531 | +m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) |
532 | +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) |
533 | +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) |
534 | +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) |
535 | + |
536 | +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
537 | + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) |
538 | +fi |
539 | +if test -n "$PKG_CONFIG"; then |
540 | + _pkg_min_version=m4_default([$1], [0.9.0]) |
541 | + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) |
542 | + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then |
543 | + AC_MSG_RESULT([yes]) |
544 | + else |
545 | + AC_MSG_RESULT([no]) |
546 | + PKG_CONFIG="" |
547 | + fi |
548 | +fi[]dnl |
549 | +])# PKG_PROG_PKG_CONFIG |
550 | + |
551 | +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) |
552 | +# |
553 | +# Check to see whether a particular set of modules exists. Similar |
554 | +# to PKG_CHECK_MODULES(), but does not set variables or print errors. |
555 | +# |
556 | +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) |
557 | +# only at the first occurence in configure.ac, so if the first place |
558 | +# it's called might be skipped (such as if it is within an "if", you |
559 | +# have to call PKG_CHECK_EXISTS manually |
560 | +# -------------------------------------------------------------- |
561 | +AC_DEFUN([PKG_CHECK_EXISTS], |
562 | +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
563 | +if test -n "$PKG_CONFIG" && \ |
564 | + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then |
565 | + m4_default([$2], [:]) |
566 | +m4_ifvaln([$3], [else |
567 | + $3])dnl |
568 | +fi]) |
569 | + |
570 | +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) |
571 | +# --------------------------------------------- |
572 | +m4_define([_PKG_CONFIG], |
573 | +[if test -n "$$1"; then |
574 | + pkg_cv_[]$1="$$1" |
575 | + elif test -n "$PKG_CONFIG"; then |
576 | + PKG_CHECK_EXISTS([$3], |
577 | + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], |
578 | + [pkg_failed=yes]) |
579 | + else |
580 | + pkg_failed=untried |
581 | +fi[]dnl |
582 | +])# _PKG_CONFIG |
583 | + |
584 | +# _PKG_SHORT_ERRORS_SUPPORTED |
585 | +# ----------------------------- |
586 | +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], |
587 | +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) |
588 | +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
589 | + _pkg_short_errors_supported=yes |
590 | +else |
591 | + _pkg_short_errors_supported=no |
592 | +fi[]dnl |
593 | +])# _PKG_SHORT_ERRORS_SUPPORTED |
594 | + |
595 | + |
596 | +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], |
597 | +# [ACTION-IF-NOT-FOUND]) |
598 | +# |
599 | +# |
600 | +# Note that if there is a possibility the first call to |
601 | +# PKG_CHECK_MODULES might not happen, you should be sure to include an |
602 | +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac |
603 | +# |
604 | +# |
605 | +# -------------------------------------------------------------- |
606 | +AC_DEFUN([PKG_CHECK_MODULES], |
607 | +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
608 | +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl |
609 | +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl |
610 | + |
611 | +pkg_failed=no |
612 | +AC_MSG_CHECKING([for $1]) |
613 | + |
614 | +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) |
615 | +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) |
616 | + |
617 | +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS |
618 | +and $1[]_LIBS to avoid the need to call pkg-config. |
619 | +See the pkg-config man page for more details.]) |
620 | + |
621 | +if test $pkg_failed = yes; then |
622 | + AC_MSG_RESULT([no]) |
623 | + _PKG_SHORT_ERRORS_SUPPORTED |
624 | + if test $_pkg_short_errors_supported = yes; then |
625 | + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` |
626 | + else |
627 | + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` |
628 | + fi |
629 | + # Put the nasty error message in config.log where it belongs |
630 | + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD |
631 | + |
632 | + m4_default([$4], [AC_MSG_ERROR( |
633 | +[Package requirements ($2) were not met: |
634 | + |
635 | +$$1_PKG_ERRORS |
636 | + |
637 | +Consider adjusting the PKG_CONFIG_PATH environment variable if you |
638 | +installed software in a non-standard prefix. |
639 | + |
640 | +_PKG_TEXT]) |
641 | + ]) |
642 | +elif test $pkg_failed = untried; then |
643 | + AC_MSG_RESULT([no]) |
644 | + m4_default([$4], [AC_MSG_FAILURE( |
645 | +[The pkg-config script could not be found or is too old. Make sure it |
646 | +is in your PATH or set the PKG_CONFIG environment variable to the full |
647 | +path to pkg-config. |
648 | + |
649 | +_PKG_TEXT |
650 | + |
651 | +To get pkg-config, see <http://pkg-config.freedesktop.org/>.]) |
652 | + ]) |
653 | +else |
654 | + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS |
655 | + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS |
656 | + AC_MSG_RESULT([yes]) |
657 | + $3 |
658 | +fi[]dnl |
659 | +])# PKG_CHECK_MODULES |
660 | + |
661 | # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
662 | # |
663 | # This file is free software; the Free Software Foundation |
664 | @@ -1273,600 +1867,6 @@ |
665 | AC_SUBST([am__untar]) |
666 | ]) # _AM_PROG_TAR |
667 | |
668 | -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- |
669 | -# serial 1 (pkg-config-0.24) |
670 | -# |
671 | -# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. |
672 | -# |
673 | -# This program is free software; you can redistribute it and/or modify |
674 | -# it under the terms of the GNU General Public License as published by |
675 | -# the Free Software Foundation; either version 2 of the License, or |
676 | -# (at your option) any later version. |
677 | -# |
678 | -# This program is distributed in the hope that it will be useful, but |
679 | -# WITHOUT ANY WARRANTY; without even the implied warranty of |
680 | -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
681 | -# General Public License for more details. |
682 | -# |
683 | -# You should have received a copy of the GNU General Public License |
684 | -# along with this program; if not, write to the Free Software |
685 | -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
686 | -# |
687 | -# As a special exception to the GNU General Public License, if you |
688 | -# distribute this file as part of a program that contains a |
689 | -# configuration script generated by Autoconf, you may include it under |
690 | -# the same distribution terms that you use for the rest of that program. |
691 | - |
692 | -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) |
693 | -# ---------------------------------- |
694 | -AC_DEFUN([PKG_PROG_PKG_CONFIG], |
695 | -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) |
696 | -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) |
697 | -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) |
698 | -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) |
699 | -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) |
700 | - |
701 | -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
702 | - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) |
703 | -fi |
704 | -if test -n "$PKG_CONFIG"; then |
705 | - _pkg_min_version=m4_default([$1], [0.9.0]) |
706 | - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) |
707 | - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then |
708 | - AC_MSG_RESULT([yes]) |
709 | - else |
710 | - AC_MSG_RESULT([no]) |
711 | - PKG_CONFIG="" |
712 | - fi |
713 | -fi[]dnl |
714 | -])# PKG_PROG_PKG_CONFIG |
715 | - |
716 | -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) |
717 | -# |
718 | -# Check to see whether a particular set of modules exists. Similar |
719 | -# to PKG_CHECK_MODULES(), but does not set variables or print errors. |
720 | -# |
721 | -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) |
722 | -# only at the first occurence in configure.ac, so if the first place |
723 | -# it's called might be skipped (such as if it is within an "if", you |
724 | -# have to call PKG_CHECK_EXISTS manually |
725 | -# -------------------------------------------------------------- |
726 | -AC_DEFUN([PKG_CHECK_EXISTS], |
727 | -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
728 | -if test -n "$PKG_CONFIG" && \ |
729 | - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then |
730 | - m4_default([$2], [:]) |
731 | -m4_ifvaln([$3], [else |
732 | - $3])dnl |
733 | -fi]) |
734 | - |
735 | -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) |
736 | -# --------------------------------------------- |
737 | -m4_define([_PKG_CONFIG], |
738 | -[if test -n "$$1"; then |
739 | - pkg_cv_[]$1="$$1" |
740 | - elif test -n "$PKG_CONFIG"; then |
741 | - PKG_CHECK_EXISTS([$3], |
742 | - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], |
743 | - [pkg_failed=yes]) |
744 | - else |
745 | - pkg_failed=untried |
746 | -fi[]dnl |
747 | -])# _PKG_CONFIG |
748 | - |
749 | -# _PKG_SHORT_ERRORS_SUPPORTED |
750 | -# ----------------------------- |
751 | -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], |
752 | -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) |
753 | -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
754 | - _pkg_short_errors_supported=yes |
755 | -else |
756 | - _pkg_short_errors_supported=no |
757 | -fi[]dnl |
758 | -])# _PKG_SHORT_ERRORS_SUPPORTED |
759 | - |
760 | - |
761 | -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], |
762 | -# [ACTION-IF-NOT-FOUND]) |
763 | -# |
764 | -# |
765 | -# Note that if there is a possibility the first call to |
766 | -# PKG_CHECK_MODULES might not happen, you should be sure to include an |
767 | -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac |
768 | -# |
769 | -# |
770 | -# -------------------------------------------------------------- |
771 | -AC_DEFUN([PKG_CHECK_MODULES], |
772 | -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
773 | -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl |
774 | -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl |
775 | - |
776 | -pkg_failed=no |
777 | -AC_MSG_CHECKING([for $1]) |
778 | - |
779 | -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) |
780 | -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) |
781 | - |
782 | -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS |
783 | -and $1[]_LIBS to avoid the need to call pkg-config. |
784 | -See the pkg-config man page for more details.]) |
785 | - |
786 | -if test $pkg_failed = yes; then |
787 | - AC_MSG_RESULT([no]) |
788 | - _PKG_SHORT_ERRORS_SUPPORTED |
789 | - if test $_pkg_short_errors_supported = yes; then |
790 | - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` |
791 | - else |
792 | - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` |
793 | - fi |
794 | - # Put the nasty error message in config.log where it belongs |
795 | - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD |
796 | - |
797 | - m4_default([$4], [AC_MSG_ERROR( |
798 | -[Package requirements ($2) were not met: |
799 | - |
800 | -$$1_PKG_ERRORS |
801 | - |
802 | -Consider adjusting the PKG_CONFIG_PATH environment variable if you |
803 | -installed software in a non-standard prefix. |
804 | - |
805 | -_PKG_TEXT]) |
806 | - ]) |
807 | -elif test $pkg_failed = untried; then |
808 | - AC_MSG_RESULT([no]) |
809 | - m4_default([$4], [AC_MSG_FAILURE( |
810 | -[The pkg-config script could not be found or is too old. Make sure it |
811 | -is in your PATH or set the PKG_CONFIG environment variable to the full |
812 | -path to pkg-config. |
813 | - |
814 | -_PKG_TEXT |
815 | - |
816 | -To get pkg-config, see <http://pkg-config.freedesktop.org/>.]) |
817 | - ]) |
818 | -else |
819 | - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS |
820 | - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS |
821 | - AC_MSG_RESULT([yes]) |
822 | - $3 |
823 | -fi[]dnl |
824 | -])# PKG_CHECK_MODULES |
825 | - |
826 | -dnl AM_GCONF_SOURCE_2 |
827 | -dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas |
828 | -dnl (i.e. pass to gconftool-2 |
829 | -dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where |
830 | -dnl you should install foo.schemas files |
831 | -dnl |
832 | - |
833 | -AC_DEFUN([AM_GCONF_SOURCE_2], |
834 | -[ |
835 | - if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then |
836 | - GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` |
837 | - else |
838 | - GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE |
839 | - fi |
840 | - |
841 | - AC_ARG_WITH([gconf-source], |
842 | - AC_HELP_STRING([--with-gconf-source=sourceaddress], |
843 | - [Config database for installing schema files.]), |
844 | - [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],) |
845 | - |
846 | - AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) |
847 | - AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) |
848 | - |
849 | - if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then |
850 | - GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' |
851 | - fi |
852 | - |
853 | - AC_ARG_WITH([gconf-schema-file-dir], |
854 | - AC_HELP_STRING([--with-gconf-schema-file-dir=dir], |
855 | - [Directory for installing schema files.]), |
856 | - [GCONF_SCHEMA_FILE_DIR="$withval"],) |
857 | - |
858 | - AC_SUBST(GCONF_SCHEMA_FILE_DIR) |
859 | - AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) |
860 | - |
861 | - AC_ARG_ENABLE(schemas-install, |
862 | - AC_HELP_STRING([--disable-schemas-install], |
863 | - [Disable the schemas installation]), |
864 | - [case ${enableval} in |
865 | - yes|no) ;; |
866 | - *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;; |
867 | - esac]) |
868 | - AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) |
869 | -]) |
870 | - |
871 | -# Configure paths for GLIB |
872 | -# Owen Taylor 1997-2001 |
873 | - |
874 | -dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) |
875 | -dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, |
876 | -dnl gthread, or gio is specified in MODULES, pass to pkg-config |
877 | -dnl |
878 | -AC_DEFUN([AM_PATH_GLIB_2_0], |
879 | -[dnl |
880 | -dnl Get the cflags and libraries from pkg-config |
881 | -dnl |
882 | -AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], |
883 | - , enable_glibtest=yes) |
884 | - |
885 | - pkg_config_args=glib-2.0 |
886 | - for module in . $4 |
887 | - do |
888 | - case "$module" in |
889 | - gmodule) |
890 | - pkg_config_args="$pkg_config_args gmodule-2.0" |
891 | - ;; |
892 | - gmodule-no-export) |
893 | - pkg_config_args="$pkg_config_args gmodule-no-export-2.0" |
894 | - ;; |
895 | - gobject) |
896 | - pkg_config_args="$pkg_config_args gobject-2.0" |
897 | - ;; |
898 | - gthread) |
899 | - pkg_config_args="$pkg_config_args gthread-2.0" |
900 | - ;; |
901 | - gio*) |
902 | - pkg_config_args="$pkg_config_args $module-2.0" |
903 | - ;; |
904 | - esac |
905 | - done |
906 | - |
907 | - PKG_PROG_PKG_CONFIG([0.16]) |
908 | - |
909 | - no_glib="" |
910 | - |
911 | - if test "x$PKG_CONFIG" = x ; then |
912 | - no_glib=yes |
913 | - PKG_CONFIG=no |
914 | - fi |
915 | - |
916 | - min_glib_version=ifelse([$1], ,2.0.0,$1) |
917 | - AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) |
918 | - |
919 | - if test x$PKG_CONFIG != xno ; then |
920 | - ## don't try to run the test against uninstalled libtool libs |
921 | - if $PKG_CONFIG --uninstalled $pkg_config_args; then |
922 | - echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" |
923 | - enable_glibtest=no |
924 | - fi |
925 | - |
926 | - if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then |
927 | - : |
928 | - else |
929 | - no_glib=yes |
930 | - fi |
931 | - fi |
932 | - |
933 | - if test x"$no_glib" = x ; then |
934 | - GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` |
935 | - GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` |
936 | - GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` |
937 | - |
938 | - GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` |
939 | - GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` |
940 | - glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ |
941 | - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` |
942 | - glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ |
943 | - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` |
944 | - glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ |
945 | - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` |
946 | - if test "x$enable_glibtest" = "xyes" ; then |
947 | - ac_save_CFLAGS="$CFLAGS" |
948 | - ac_save_LIBS="$LIBS" |
949 | - CFLAGS="$CFLAGS $GLIB_CFLAGS" |
950 | - LIBS="$GLIB_LIBS $LIBS" |
951 | -dnl |
952 | -dnl Now check if the installed GLIB is sufficiently new. (Also sanity |
953 | -dnl checks the results of pkg-config to some extent) |
954 | -dnl |
955 | - rm -f conf.glibtest |
956 | - AC_TRY_RUN([ |
957 | -#include <glib.h> |
958 | -#include <stdio.h> |
959 | -#include <stdlib.h> |
960 | - |
961 | -int |
962 | -main () |
963 | -{ |
964 | - unsigned int major, minor, micro; |
965 | - char *tmp_version; |
966 | - |
967 | - fclose (fopen ("conf.glibtest", "w")); |
968 | - |
969 | - /* HP/UX 9 (%@#!) writes to sscanf strings */ |
970 | - tmp_version = g_strdup("$min_glib_version"); |
971 | - if (sscanf(tmp_version, "%u.%u.%u", &major, &minor, µ) != 3) { |
972 | - printf("%s, bad version string\n", "$min_glib_version"); |
973 | - exit(1); |
974 | - } |
975 | - |
976 | - if ((glib_major_version != $glib_config_major_version) || |
977 | - (glib_minor_version != $glib_config_minor_version) || |
978 | - (glib_micro_version != $glib_config_micro_version)) |
979 | - { |
980 | - printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", |
981 | - $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, |
982 | - glib_major_version, glib_minor_version, glib_micro_version); |
983 | - printf ("*** was found! If pkg-config was correct, then it is best\n"); |
984 | - printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); |
985 | - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); |
986 | - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); |
987 | - printf("*** required on your system.\n"); |
988 | - printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); |
989 | - printf("*** to point to the correct configuration files\n"); |
990 | - } |
991 | - else if ((glib_major_version != GLIB_MAJOR_VERSION) || |
992 | - (glib_minor_version != GLIB_MINOR_VERSION) || |
993 | - (glib_micro_version != GLIB_MICRO_VERSION)) |
994 | - { |
995 | - printf("*** GLIB header files (version %d.%d.%d) do not match\n", |
996 | - GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); |
997 | - printf("*** library (version %d.%d.%d)\n", |
998 | - glib_major_version, glib_minor_version, glib_micro_version); |
999 | - } |
1000 | - else |
1001 | - { |
1002 | - if ((glib_major_version > major) || |
1003 | - ((glib_major_version == major) && (glib_minor_version > minor)) || |
1004 | - ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) |
1005 | - { |
1006 | - return 0; |
1007 | - } |
1008 | - else |
1009 | - { |
1010 | - printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n", |
1011 | - glib_major_version, glib_minor_version, glib_micro_version); |
1012 | - printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n", |
1013 | - major, minor, micro); |
1014 | - printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); |
1015 | - printf("***\n"); |
1016 | - printf("*** If you have already installed a sufficiently new version, this error\n"); |
1017 | - printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); |
1018 | - printf("*** being found. The easiest way to fix this is to remove the old version\n"); |
1019 | - printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); |
1020 | - printf("*** correct copy of pkg-config. (In this case, you will have to\n"); |
1021 | - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); |
1022 | - printf("*** so that the correct libraries are found at run-time))\n"); |
1023 | - } |
1024 | - } |
1025 | - return 1; |
1026 | -} |
1027 | -],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) |
1028 | - CFLAGS="$ac_save_CFLAGS" |
1029 | - LIBS="$ac_save_LIBS" |
1030 | - fi |
1031 | - fi |
1032 | - if test "x$no_glib" = x ; then |
1033 | - AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) |
1034 | - ifelse([$2], , :, [$2]) |
1035 | - else |
1036 | - AC_MSG_RESULT(no) |
1037 | - if test "$PKG_CONFIG" = "no" ; then |
1038 | - echo "*** A new enough version of pkg-config was not found." |
1039 | - echo "*** See http://www.freedesktop.org/software/pkgconfig/" |
1040 | - else |
1041 | - if test -f conf.glibtest ; then |
1042 | - : |
1043 | - else |
1044 | - echo "*** Could not run GLIB test program, checking why..." |
1045 | - ac_save_CFLAGS="$CFLAGS" |
1046 | - ac_save_LIBS="$LIBS" |
1047 | - CFLAGS="$CFLAGS $GLIB_CFLAGS" |
1048 | - LIBS="$LIBS $GLIB_LIBS" |
1049 | - AC_TRY_LINK([ |
1050 | -#include <glib.h> |
1051 | -#include <stdio.h> |
1052 | -], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], |
1053 | - [ echo "*** The test program compiled, but did not run. This usually means" |
1054 | - echo "*** that the run-time linker is not finding GLIB or finding the wrong" |
1055 | - echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" |
1056 | - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" |
1057 | - echo "*** to the installed location Also, make sure you have run ldconfig if that" |
1058 | - echo "*** is required on your system" |
1059 | - echo "***" |
1060 | - echo "*** If you have an old version installed, it is best to remove it, although" |
1061 | - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], |
1062 | - [ echo "*** The test program failed to compile or link. See the file config.log for the" |
1063 | - echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) |
1064 | - CFLAGS="$ac_save_CFLAGS" |
1065 | - LIBS="$ac_save_LIBS" |
1066 | - fi |
1067 | - fi |
1068 | - GLIB_CFLAGS="" |
1069 | - GLIB_LIBS="" |
1070 | - GLIB_GENMARSHAL="" |
1071 | - GOBJECT_QUERY="" |
1072 | - GLIB_MKENUMS="" |
1073 | - ifelse([$3], , :, [$3]) |
1074 | - fi |
1075 | - AC_SUBST(GLIB_CFLAGS) |
1076 | - AC_SUBST(GLIB_LIBS) |
1077 | - AC_SUBST(GLIB_GENMARSHAL) |
1078 | - AC_SUBST(GOBJECT_QUERY) |
1079 | - AC_SUBST(GLIB_MKENUMS) |
1080 | - rm -f conf.glibtest |
1081 | -]) |
1082 | - |
1083 | -dnl GLIB_GSETTINGS |
1084 | -dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether |
1085 | -dnl the schema should be compiled |
1086 | -dnl |
1087 | - |
1088 | -AC_DEFUN([GLIB_GSETTINGS], |
1089 | -[ |
1090 | - m4_pattern_allow([AM_V_GEN]) |
1091 | - AC_ARG_ENABLE(schemas-compile, |
1092 | - AS_HELP_STRING([--disable-schemas-compile], |
1093 | - [Disable regeneration of gschemas.compiled on install]), |
1094 | - [case ${enableval} in |
1095 | - yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; |
1096 | - no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; |
1097 | - *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;; |
1098 | - esac]) |
1099 | - AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) |
1100 | - PKG_PROG_PKG_CONFIG([0.16]) |
1101 | - AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) |
1102 | - if test x$cross_compiling != xyes; then |
1103 | - GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` |
1104 | - else |
1105 | - AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) |
1106 | - fi |
1107 | - AC_SUBST(GLIB_COMPILE_SCHEMAS) |
1108 | - if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then |
1109 | - ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2]) |
1110 | - else |
1111 | - ifelse([$1],,[:],[$1]) |
1112 | - fi |
1113 | - |
1114 | - GSETTINGS_RULES=' |
1115 | -.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas |
1116 | - |
1117 | -mostlyclean-am: clean-gsettings-schemas |
1118 | - |
1119 | -gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) |
1120 | - |
1121 | -%.gschema.valid: %.gschema.xml $(gsettings__enum_file) |
1122 | - $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@ |
1123 | - |
1124 | -all-am: $(gsettings_SCHEMAS:.xml=.valid) |
1125 | -uninstall-am: uninstall-gsettings-schemas |
1126 | -install-data-am: install-gsettings-schemas |
1127 | - |
1128 | -.SECONDARY: $(gsettings_SCHEMAS) |
1129 | - |
1130 | -install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) |
1131 | - @$(NORMAL_INSTALL) |
1132 | - if test -n "$^"; then \ |
1133 | - test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ |
1134 | - $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ |
1135 | - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ |
1136 | - fi |
1137 | - |
1138 | -uninstall-gsettings-schemas: |
1139 | - @$(NORMAL_UNINSTALL) |
1140 | - @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ |
1141 | - files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ |
1142 | - test -n "$$files" || exit 0; \ |
1143 | - echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ |
1144 | - cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files |
1145 | - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) |
1146 | - |
1147 | -clean-gsettings-schemas: |
1148 | - rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) |
1149 | - |
1150 | -ifdef gsettings_ENUM_NAMESPACE |
1151 | -$(gsettings__enum_file): $(gsettings_ENUM_FILES) |
1152 | - $(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail " </@type@>" --ftail "</schemalist>" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@ |
1153 | -endif |
1154 | -' |
1155 | - _GSETTINGS_SUBST(GSETTINGS_RULES) |
1156 | -]) |
1157 | - |
1158 | -dnl _GSETTINGS_SUBST(VARIABLE) |
1159 | -dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST |
1160 | -AC_DEFUN([_GSETTINGS_SUBST], |
1161 | -[ |
1162 | -AC_SUBST([$1]) |
1163 | -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) |
1164 | -] |
1165 | -) |
1166 | - |
1167 | -dnl -*- mode: autoconf -*- |
1168 | -dnl Copyright 2009 Johan Dahlin |
1169 | -dnl |
1170 | -dnl This file is free software; the author(s) gives unlimited |
1171 | -dnl permission to copy and/or distribute it, with or without |
1172 | -dnl modifications, as long as this notice is preserved. |
1173 | -dnl |
1174 | - |
1175 | -# serial 1 |
1176 | - |
1177 | -m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], |
1178 | -[ |
1179 | - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first |
1180 | - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first |
1181 | - AC_BEFORE([LT_INIT],[$0])dnl setup libtool first |
1182 | - |
1183 | - dnl enable/disable introspection |
1184 | - m4_if([$2], [require], |
1185 | - [dnl |
1186 | - enable_introspection=yes |
1187 | - ],[dnl |
1188 | - AC_ARG_ENABLE(introspection, |
1189 | - AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], |
1190 | - [Enable introspection for this build]),, |
1191 | - [enable_introspection=auto]) |
1192 | - ])dnl |
1193 | - |
1194 | - AC_MSG_CHECKING([for gobject-introspection]) |
1195 | - |
1196 | - dnl presence/version checking |
1197 | - AS_CASE([$enable_introspection], |
1198 | - [no], [dnl |
1199 | - found_introspection="no (disabled, use --enable-introspection to enable)" |
1200 | - ],dnl |
1201 | - [yes],[dnl |
1202 | - PKG_CHECK_EXISTS([gobject-introspection-1.0],, |
1203 | - AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) |
1204 | - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], |
1205 | - found_introspection=yes, |
1206 | - AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) |
1207 | - ],dnl |
1208 | - [auto],[dnl |
1209 | - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) |
1210 | - ],dnl |
1211 | - [dnl |
1212 | - AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) |
1213 | - ])dnl |
1214 | - |
1215 | - AC_MSG_RESULT([$found_introspection]) |
1216 | - |
1217 | - INTROSPECTION_SCANNER= |
1218 | - INTROSPECTION_COMPILER= |
1219 | - INTROSPECTION_GENERATE= |
1220 | - INTROSPECTION_GIRDIR= |
1221 | - INTROSPECTION_TYPELIBDIR= |
1222 | - if test "x$found_introspection" = "xyes"; then |
1223 | - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` |
1224 | - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` |
1225 | - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` |
1226 | - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` |
1227 | - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" |
1228 | - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` |
1229 | - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` |
1230 | - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection |
1231 | - fi |
1232 | - AC_SUBST(INTROSPECTION_SCANNER) |
1233 | - AC_SUBST(INTROSPECTION_COMPILER) |
1234 | - AC_SUBST(INTROSPECTION_GENERATE) |
1235 | - AC_SUBST(INTROSPECTION_GIRDIR) |
1236 | - AC_SUBST(INTROSPECTION_TYPELIBDIR) |
1237 | - AC_SUBST(INTROSPECTION_CFLAGS) |
1238 | - AC_SUBST(INTROSPECTION_LIBS) |
1239 | - AC_SUBST(INTROSPECTION_MAKEFILE) |
1240 | - |
1241 | - AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") |
1242 | -]) |
1243 | - |
1244 | - |
1245 | -dnl Usage: |
1246 | -dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) |
1247 | - |
1248 | -AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], |
1249 | -[ |
1250 | - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) |
1251 | -]) |
1252 | - |
1253 | -dnl Usage: |
1254 | -dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) |
1255 | - |
1256 | - |
1257 | -AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], |
1258 | -[ |
1259 | - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) |
1260 | -]) |
1261 | - |
1262 | m4_include([m4/gettext.m4]) |
1263 | m4_include([m4/iconv.m4]) |
1264 | m4_include([m4/intlmacosx.m4]) |
1265 | |
1266 | === modified file 'browser-plugin/browser-plugin.c' |
1267 | --- browser-plugin/browser-plugin.c 2011-09-21 16:26:15 +0000 |
1268 | +++ browser-plugin/browser-plugin.c 2012-01-25 02:33:28 +0000 |
1269 | @@ -47,8 +47,6 @@ |
1270 | GDBusProxy *proxy; |
1271 | } PluginData; |
1272 | |
1273 | -/* =============== public entry points =================== */ |
1274 | - |
1275 | static NPNetscapeFuncs funcs; |
1276 | |
1277 | static inline gchar * |
1278 | @@ -71,10 +69,7 @@ |
1279 | goto out; |
1280 | |
1281 | result_str = NPVARIANT_TO_STRING (result); |
1282 | - if (strlen (result_str.UTF8Characters) != result_str.UTF8Length) |
1283 | - goto out; |
1284 | - |
1285 | - result_copy = g_strdup (result_str.UTF8Characters); |
1286 | + result_copy = g_strndup (result_str.UTF8Characters, result_str.UTF8Length); |
1287 | |
1288 | out: |
1289 | funcs.releasevariantvalue (&result); |
1290 | @@ -150,6 +145,8 @@ |
1291 | return ret; |
1292 | } |
1293 | |
1294 | +/* =============== public entry points =================== */ |
1295 | + |
1296 | NPError |
1297 | NP_Initialize(NPNetscapeFuncs *pfuncs, NPPluginFuncs *plugin) |
1298 | { |
1299 | @@ -458,7 +455,7 @@ |
1300 | NPString uuid, |
1301 | gboolean enabled) |
1302 | { |
1303 | - const gchar *uuid_str = uuid.UTF8Characters; |
1304 | + gchar *uuid_str = g_strndup (uuid.UTF8Characters, uuid.UTF8Length); |
1305 | if (!uuid_is_valid (uuid_str)) |
1306 | return FALSE; |
1307 | |
1308 | @@ -471,6 +468,8 @@ |
1309 | NULL, /* callback */ |
1310 | NULL /* user_data */); |
1311 | |
1312 | + g_free (uuid_str); |
1313 | + |
1314 | return TRUE; |
1315 | } |
1316 | |
1317 | @@ -479,21 +478,32 @@ |
1318 | NPString uuid, |
1319 | NPString version_tag) |
1320 | { |
1321 | - const gchar *uuid_str = uuid.UTF8Characters; |
1322 | + gchar *uuid_str = g_strndup (uuid.UTF8Characters, uuid.UTF8Length); |
1323 | + gchar *version_tag_str; |
1324 | + |
1325 | if (!uuid_is_valid (uuid_str)) |
1326 | - return FALSE; |
1327 | + { |
1328 | + g_free (uuid_str); |
1329 | + return FALSE; |
1330 | + } |
1331 | + |
1332 | + version_tag_str = g_strndup (version_tag.UTF8Characters, |
1333 | + version_tag.UTF8Length); |
1334 | |
1335 | g_dbus_proxy_call (obj->proxy, |
1336 | "InstallRemoteExtension", |
1337 | g_variant_new ("(ss)", |
1338 | uuid_str, |
1339 | - version_tag.UTF8Characters), |
1340 | + version_tag_str), |
1341 | G_DBUS_CALL_FLAGS_NONE, |
1342 | -1, /* timeout */ |
1343 | NULL, /* cancellable */ |
1344 | NULL, /* callback */ |
1345 | NULL /* user_data */); |
1346 | |
1347 | + g_free (uuid_str); |
1348 | + g_free (version_tag_str); |
1349 | + |
1350 | return TRUE; |
1351 | } |
1352 | |
1353 | @@ -504,11 +514,14 @@ |
1354 | { |
1355 | GError *error = NULL; |
1356 | GVariant *res; |
1357 | - const gchar *uuid_str; |
1358 | + gchar *uuid_str; |
1359 | |
1360 | - uuid_str = uuid.UTF8Characters; |
1361 | + uuid_str = g_strndup (uuid.UTF8Characters, uuid.UTF8Length); |
1362 | if (!uuid_is_valid (uuid_str)) |
1363 | - return FALSE; |
1364 | + { |
1365 | + g_free (uuid_str); |
1366 | + return FALSE; |
1367 | + } |
1368 | |
1369 | res = g_dbus_proxy_call_sync (obj->proxy, |
1370 | "UninstallExtension", |
1371 | @@ -519,6 +532,8 @@ |
1372 | NULL, /* cancellable */ |
1373 | &error); |
1374 | |
1375 | + g_free (uuid_str); |
1376 | + |
1377 | if (!res) |
1378 | { |
1379 | g_warning ("Failed to uninstall extension: %s", error->message); |
1380 | @@ -536,11 +551,14 @@ |
1381 | { |
1382 | GError *error = NULL; |
1383 | GVariant *res; |
1384 | - const gchar *uuid_str; |
1385 | + gchar *uuid_str; |
1386 | |
1387 | - uuid_str = uuid.UTF8Characters; |
1388 | + uuid_str = g_strndup (uuid.UTF8Characters, uuid.UTF8Length); |
1389 | if (!uuid_is_valid (uuid_str)) |
1390 | - return FALSE; |
1391 | + { |
1392 | + g_free (uuid_str); |
1393 | + return FALSE; |
1394 | + } |
1395 | |
1396 | res = g_dbus_proxy_call_sync (obj->proxy, |
1397 | "GetExtensionInfo", |
1398 | @@ -550,6 +568,8 @@ |
1399 | NULL, /* cancellable */ |
1400 | &error); |
1401 | |
1402 | + g_free (uuid_str); |
1403 | + |
1404 | if (!res) |
1405 | { |
1406 | g_warning ("Failed to retrieve extension metadata: %s", error->message); |
1407 | @@ -567,11 +587,14 @@ |
1408 | { |
1409 | GError *error = NULL; |
1410 | GVariant *res; |
1411 | - const gchar *uuid_str; |
1412 | + gchar *uuid_str; |
1413 | |
1414 | - uuid_str = uuid.UTF8Characters; |
1415 | + uuid_str = g_strndup (uuid.UTF8Characters, uuid.UTF8Length); |
1416 | if (!uuid_is_valid (uuid_str)) |
1417 | - return FALSE; |
1418 | + { |
1419 | + g_free (uuid_str); |
1420 | + return FALSE; |
1421 | + } |
1422 | |
1423 | res = g_dbus_proxy_call_sync (obj->proxy, |
1424 | "GetExtensionErrors", |
1425 | @@ -581,6 +604,8 @@ |
1426 | NULL, /* cancellable */ |
1427 | &error); |
1428 | |
1429 | + g_free (uuid_str); |
1430 | + |
1431 | if (!res) |
1432 | { |
1433 | g_warning ("Failed to retrieve errors: %s", error->message); |
1434 | @@ -636,7 +661,8 @@ |
1435 | STRINGN_TO_NPVARIANT (buffer, length, *result); |
1436 | |
1437 | out: |
1438 | - g_variant_unref (res); |
1439 | + if (res) |
1440 | + g_variant_unref (res); |
1441 | return ret; |
1442 | } |
1443 | |
1444 | @@ -816,6 +842,11 @@ |
1445 | |
1446 | *(NPObject**)value = funcs.createobject (instance, &plugin_class); |
1447 | break; |
1448 | + |
1449 | + case NPPVpluginNeedsXEmbed: |
1450 | + *(bool *)value = TRUE; |
1451 | + break; |
1452 | + |
1453 | default: |
1454 | ; |
1455 | } |
1456 | |
1457 | === modified file 'configure' |
1458 | --- configure 2011-10-24 06:43:05 +0000 |
1459 | +++ configure 2012-01-25 02:33:28 +0000 |
1460 | @@ -1,6 +1,6 @@ |
1461 | #! /bin/sh |
1462 | # Guess values for system-dependent variables and create Makefiles. |
1463 | -# Generated by GNU Autoconf 2.68 for gnome-shell 3.2.1. |
1464 | +# Generated by GNU Autoconf 2.68 for gnome-shell 3.2.2.1. |
1465 | # |
1466 | # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell>. |
1467 | # |
1468 | @@ -571,8 +571,8 @@ |
1469 | # Identity of this package. |
1470 | PACKAGE_NAME='gnome-shell' |
1471 | PACKAGE_TARNAME='gnome-shell' |
1472 | -PACKAGE_VERSION='3.2.1' |
1473 | -PACKAGE_STRING='gnome-shell 3.2.1' |
1474 | +PACKAGE_VERSION='3.2.2.1' |
1475 | +PACKAGE_STRING='gnome-shell 3.2.2.1' |
1476 | PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell' |
1477 | PACKAGE_URL='' |
1478 | |
1479 | @@ -1453,7 +1453,7 @@ |
1480 | # Omit some internal or obsolete options to make the list less imposing. |
1481 | # This message is too long to be a string in the A/UX 3.1 sh. |
1482 | cat <<_ACEOF |
1483 | -\`configure' configures gnome-shell 3.2.1 to adapt to many kinds of systems. |
1484 | +\`configure' configures gnome-shell 3.2.2.1 to adapt to many kinds of systems. |
1485 | |
1486 | Usage: $0 [OPTION]... [VAR=VALUE]... |
1487 | |
1488 | @@ -1523,7 +1523,7 @@ |
1489 | |
1490 | if test -n "$ac_init_help"; then |
1491 | case $ac_init_help in |
1492 | - short | recursive ) echo "Configuration of gnome-shell 3.2.1:";; |
1493 | + short | recursive ) echo "Configuration of gnome-shell 3.2.2.1:";; |
1494 | esac |
1495 | cat <<\_ACEOF |
1496 | |
1497 | @@ -1698,7 +1698,7 @@ |
1498 | test -n "$ac_init_help" && exit $ac_status |
1499 | if $ac_init_version; then |
1500 | cat <<\_ACEOF |
1501 | -gnome-shell configure 3.2.1 |
1502 | +gnome-shell configure 3.2.2.1 |
1503 | generated by GNU Autoconf 2.68 |
1504 | |
1505 | Copyright (C) 2010 Free Software Foundation, Inc. |
1506 | @@ -2067,7 +2067,7 @@ |
1507 | This file contains any messages produced by compilers while |
1508 | running configure, to aid debugging if configure makes a mistake. |
1509 | |
1510 | -It was created by gnome-shell $as_me 3.2.1, which was |
1511 | +It was created by gnome-shell $as_me 3.2.2.1, which was |
1512 | generated by GNU Autoconf 2.68. Invocation command line was |
1513 | |
1514 | $ $0 $@ |
1515 | @@ -2894,7 +2894,7 @@ |
1516 | |
1517 | # Define the identity of the package. |
1518 | PACKAGE='gnome-shell' |
1519 | - VERSION='3.2.1' |
1520 | + VERSION='3.2.2.1' |
1521 | |
1522 | |
1523 | cat >>confdefs.h <<_ACEOF |
1524 | @@ -17250,7 +17250,7 @@ |
1525 | # report actual input values of CONFIG_FILES etc. instead of their |
1526 | # values after options handling. |
1527 | ac_log=" |
1528 | -This file was extended by gnome-shell $as_me 3.2.1, which was |
1529 | +This file was extended by gnome-shell $as_me 3.2.2.1, which was |
1530 | generated by GNU Autoconf 2.68. Invocation command line was |
1531 | |
1532 | CONFIG_FILES = $CONFIG_FILES |
1533 | @@ -17316,7 +17316,7 @@ |
1534 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
1535 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
1536 | ac_cs_version="\\ |
1537 | -gnome-shell config.status 3.2.1 |
1538 | +gnome-shell config.status 3.2.2.1 |
1539 | configured by $0, generated by GNU Autoconf 2.68, |
1540 | with options \\"\$ac_cs_config\\" |
1541 | |
1542 | |
1543 | === modified file 'configure.ac' |
1544 | --- configure.ac 2011-10-24 06:43:05 +0000 |
1545 | +++ configure.ac 2012-01-25 02:33:28 +0000 |
1546 | @@ -1,5 +1,5 @@ |
1547 | AC_PREREQ(2.63) |
1548 | -AC_INIT([gnome-shell],[3.2.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell]) |
1549 | +AC_INIT([gnome-shell],[3.2.2.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell]) |
1550 | |
1551 | AC_CONFIG_HEADERS([config.h]) |
1552 | AC_CONFIG_SRCDIR([src/shell-global.c]) |
1553 | |
1554 | === modified file 'debian/changelog' |
1555 | --- debian/changelog 2011-12-19 23:13:06 +0000 |
1556 | +++ debian/changelog 2012-01-25 02:33:28 +0000 |
1557 | @@ -1,3 +1,34 @@ |
1558 | +gnome-shell (3.2.2.1-0ubuntu0.1) oneiric-proposed; urgency=low |
1559 | + |
1560 | + [ Jeremy Bicha ] |
1561 | + * New upstream release (LP: #921343) |
1562 | + - Fix broken gnome-shell-extension-tool (LP: #853882) |
1563 | + - Fixes lots of crashes and some memory leaks |
1564 | + - extensions.gnome.org should now work with Webkit-based browsers |
1565 | + * Split common files and translations to gnome-shell-common. Add |
1566 | + appropriate Breaks/Replaces. |
1567 | + * 02_rpath-bluetooth-applet.patch: |
1568 | + - Add an RPATH so that the compilation doesn't fail when g-ir-scanner |
1569 | + tries to analyze libgnome-shell.so linked against |
1570 | + * 04_remove-glx-dependency-on-armel.patch: Refactored |
1571 | + * 07-NetworkMenu-fix-logic-for-updating-wifi-icon.patch |
1572 | + - Fix the logic for connecting to the current wifi strength, |
1573 | + prevents the network icon from becoming stale (from upstream git) |
1574 | + * 08-polkit-Find-the-best-user-to-authenticate-as.patch: |
1575 | + - When picking a user to authenticate with, try the current user |
1576 | + first, then root and if all else fails the first user that is allowed to |
1577 | + authenticate. (from upstream git) |
1578 | + * 09-respect-NoDisplay-semantics-for-app-menu.patch: |
1579 | + - Respect NoDisplay semantics for applications menu. This avoids duplicate |
1580 | + menu entries when menu-xdg is installed. Closes: #649559 |
1581 | + |
1582 | + [ Timo Kluck ] |
1583 | + * 10-bluetooth-fix-connection-from-gs-menu.patch: |
1584 | + - Fix bluetooth panel switch moving independently from actual |
1585 | + connection status (LP: #918208) |
1586 | + |
1587 | + -- Jeremy Bicha <jbicha@ubuntu.com> Mon, 23 Jan 2012 14:25:45 -0500 |
1588 | + |
1589 | gnome-shell (3.2.1-0ubuntu1.1) oneiric-proposed; urgency=low |
1590 | |
1591 | * No-change rebuild to fix up dependencies (LP: #903382) |
1592 | |
1593 | === modified file 'debian/control' |
1594 | --- debian/control 2011-10-24 06:43:05 +0000 |
1595 | +++ debian/control 2012-01-25 02:33:28 +0000 |
1596 | @@ -63,6 +63,7 @@ |
1597 | ${misc:Depends}, |
1598 | caribou, |
1599 | cups-pk-helper, |
1600 | + gnome-shell-common (= ${source:Version}), |
1601 | gnome-settings-daemon (>= 2.91.5.1), |
1602 | gsettings-desktop-schemas (>= 0.1.7), |
1603 | gnome-icon-theme-symbolic (>= 2.91), |
1604 | @@ -90,3 +91,13 @@ |
1605 | by the GNOME Panel and by the window manager in previous versions of |
1606 | GNOME. The GNOME Shell has rich visual effects enabled by new |
1607 | graphical technologies. |
1608 | + |
1609 | +Package: gnome-shell-common |
1610 | +Architecture: all |
1611 | +Depends: ${misc:Depends} |
1612 | +Replaces: gnome-shell (<< 3.2.1-6) |
1613 | +Breaks: gnome-shell (<< 3.2.1-6), |
1614 | + gnome-tweak-tool (<< 3.2) |
1615 | +Description: common files for the GNOME graphical shell |
1616 | + This package contains translations and data files for the GNOME shell. |
1617 | + |
1618 | |
1619 | === modified file 'debian/control.in' |
1620 | --- debian/control.in 2011-10-24 06:43:05 +0000 |
1621 | +++ debian/control.in 2012-01-25 02:33:28 +0000 |
1622 | @@ -58,6 +58,7 @@ |
1623 | ${misc:Depends}, |
1624 | caribou, |
1625 | cups-pk-helper, |
1626 | + gnome-shell-common (= ${source:Version}), |
1627 | gnome-settings-daemon (>= 2.91.5.1), |
1628 | gsettings-desktop-schemas (>= 0.1.7), |
1629 | gnome-icon-theme-symbolic (>= 2.91), |
1630 | @@ -85,3 +86,13 @@ |
1631 | by the GNOME Panel and by the window manager in previous versions of |
1632 | GNOME. The GNOME Shell has rich visual effects enabled by new |
1633 | graphical technologies. |
1634 | + |
1635 | +Package: gnome-shell-common |
1636 | +Architecture: all |
1637 | +Depends: ${misc:Depends} |
1638 | +Replaces: gnome-shell (<< 3.2.1-6) |
1639 | +Breaks: gnome-shell (<< 3.2.1-6), |
1640 | + gnome-tweak-tool (<< 3.2) |
1641 | +Description: common files for the GNOME graphical shell |
1642 | + This package contains translations and data files for the GNOME shell. |
1643 | + |
1644 | |
1645 | === added file 'debian/gnome-shell-common.install' |
1646 | --- debian/gnome-shell-common.install 1970-01-01 00:00:00 +0000 |
1647 | +++ debian/gnome-shell-common.install 2012-01-25 02:33:28 +0000 |
1648 | @@ -0,0 +1,4 @@ |
1649 | +debian/tmp/etc/gconf |
1650 | +debian/tmp/usr/share/glib-2.0 |
1651 | +debian/tmp/usr/share/gnome-shell |
1652 | +debian/tmp/usr/share/locale |
1653 | |
1654 | === added file 'debian/gnome-shell.install' |
1655 | --- debian/gnome-shell.install 1970-01-01 00:00:00 +0000 |
1656 | +++ debian/gnome-shell.install 2012-01-25 02:33:28 +0000 |
1657 | @@ -0,0 +1,6 @@ |
1658 | +debian/tmp/usr/bin |
1659 | +debian/tmp/usr/lib/gnome-shell |
1660 | +debian/tmp/usr/lib/mozilla |
1661 | +debian/tmp/usr/share/applications |
1662 | +debian/tmp/usr/share/dbus-1 |
1663 | +debian/tmp/usr/share/man |
1664 | |
1665 | === added file 'debian/patches/02_rpath-bluetooth-applet.patch' |
1666 | --- debian/patches/02_rpath-bluetooth-applet.patch 1970-01-01 00:00:00 +0000 |
1667 | +++ debian/patches/02_rpath-bluetooth-applet.patch 2012-01-25 02:33:28 +0000 |
1668 | @@ -0,0 +1,32 @@ |
1669 | +Description: Define rpath for linking against gnome-bluetooth |
1670 | + Modified by Raphael Hertzog to actually make it work. |
1671 | +Author: Rico Tzschichholz <ricotz@ubuntu.com> |
1672 | +Forwarded: no |
1673 | +Last-Update: 2011-04-11 |
1674 | + |
1675 | +Index: gnome-shell-3.2.1/src/Makefile.am |
1676 | +=================================================================== |
1677 | +--- gnome-shell-3.2.1.orig/src/Makefile.am 2011-09-20 23:06:39.000000000 +0200 |
1678 | ++++ gnome-shell-3.2.1/src/Makefile.am 2011-12-03 06:31:28.812401727 +0100 |
1679 | +@@ -259,7 +259,7 @@ |
1680 | + rm -f $(@F).tmp |
1681 | + EXTRA_DIST += shell-enum-types.c.in |
1682 | + |
1683 | +-libgnome_shell_la_LDFLAGS = -avoid-version |
1684 | ++libgnome_shell_la_LDFLAGS = -avoid-version -rpath $(pkglibdir):/usr/lib/gnome-bluetooth -R $(pkglibdir) |
1685 | + libgnome_shell_la_LIBADD = \ |
1686 | + -lm \ |
1687 | + $(GNOME_SHELL_LIBS) \ |
1688 | +Index: gnome-shell-3.2.1/src/Makefile.in |
1689 | +=================================================================== |
1690 | +--- gnome-shell-3.2.1.orig/src/Makefile.in 2011-10-18 06:24:10.000000000 +0200 |
1691 | ++++ gnome-shell-3.2.1/src/Makefile.in 2011-12-03 06:31:28.816401727 +0100 |
1692 | +@@ -888,7 +888,7 @@ |
1693 | + run_js_test_SOURCES = \ |
1694 | + run-js-test.c |
1695 | + |
1696 | +-libgnome_shell_la_LDFLAGS = -avoid-version |
1697 | ++libgnome_shell_la_LDFLAGS = -avoid-version -rpath $(pkglibdir):/usr/lib/gnome-bluetooth -R $(pkglibdir) |
1698 | + libgnome_shell_la_LIBADD = \ |
1699 | + -lm \ |
1700 | + $(GNOME_SHELL_LIBS) \ |
1701 | |
1702 | === added file 'debian/patches/04_remove-glx-dependency-on-armel.patch' |
1703 | --- debian/patches/04_remove-glx-dependency-on-armel.patch 1970-01-01 00:00:00 +0000 |
1704 | +++ debian/patches/04_remove-glx-dependency-on-armel.patch 2012-01-25 02:33:28 +0000 |
1705 | @@ -0,0 +1,52 @@ |
1706 | +From: Robert Bragg <robert@linux.intel.com> |
1707 | +Date: Wed, 13 Jul 2011 12:20:43 +0100 |
1708 | +Subject: [PATCH] Remove GLX dependency |
1709 | + |
1710 | +Index: oneiric/src/gnome-shell-plugin.c |
1711 | +=================================================================== |
1712 | +--- oneiric.orig/src/gnome-shell-plugin.c 2011-09-04 04:01:43.713265027 -0400 |
1713 | ++++ oneiric/src/gnome-shell-plugin.c 2011-09-06 11:20:47.243195279 -0400 |
1714 | +@@ -30,8 +30,11 @@ |
1715 | + |
1716 | + #include <clutter/clutter.h> |
1717 | + #include <clutter/x11/clutter-x11.h> |
1718 | ++#if defined (__arm__) |
1719 | ++#else |
1720 | + #include <GL/glx.h> |
1721 | + #include <GL/glxext.h> |
1722 | ++#endif |
1723 | + #include <gjs/gjs.h> |
1724 | + #include <meta/display.h> |
1725 | + #include <meta/meta-plugin.h> |
1726 | +@@ -146,14 +149,23 @@ |
1727 | + gnome_shell_plugin_start (MetaPlugin *plugin) |
1728 | + { |
1729 | + GnomeShellPlugin *shell_plugin = GNOME_SHELL_PLUGIN (plugin); |
1730 | ++#if defined (__arm__) |
1731 | ++#else |
1732 | + MetaScreen *screen; |
1733 | + MetaDisplay *display; |
1734 | + Display *xdisplay; |
1735 | ++#endif |
1736 | + GError *error = NULL; |
1737 | + int status; |
1738 | ++#if defined (__arm__) |
1739 | ++#else |
1740 | + const char *glx_extensions; |
1741 | ++#endif |
1742 | + GjsContext *gjs_context; |
1743 | + |
1744 | ++#if defined (__arm__) |
1745 | ++ shell_plugin->have_swap_event = 0; |
1746 | ++#else |
1747 | + screen = meta_plugin_get_screen (plugin); |
1748 | + display = meta_screen_get_display (screen); |
1749 | + |
1750 | +@@ -166,6 +178,7 @@ |
1751 | + glx_extensions = glXQueryExtensionsString (xdisplay, |
1752 | + meta_screen_get_screen_number (screen)); |
1753 | + shell_plugin->have_swap_event = strstr (glx_extensions, "GLX_INTEL_swap_event") != NULL; |
1754 | ++#endif |
1755 | + |
1756 | + shell_perf_log_define_event (shell_perf_log_get_default (), |
1757 | + "glx.swapComplete", |
1758 | |
1759 | === added file 'debian/patches/07-NetworkMenu-fix-logic-for-updating-wifi-icon.patch' |
1760 | --- debian/patches/07-NetworkMenu-fix-logic-for-updating-wifi-icon.patch 1970-01-01 00:00:00 +0000 |
1761 | +++ debian/patches/07-NetworkMenu-fix-logic-for-updating-wifi-icon.patch 2012-01-25 02:33:28 +0000 |
1762 | @@ -0,0 +1,49 @@ |
1763 | +From 9aae5cf478fe3c04cb956b23b166fd49261b8d61 Mon Sep 17 00:00:00 2001 |
1764 | +From: Giovanni Campagna <gcampagna@src.gnome.org> |
1765 | +Date: Sat, 29 Oct 2011 14:35:09 +0200 |
1766 | +Subject: [PATCH 3/3] NetworkMenu: fix logic for updating wifi icon |
1767 | + |
1768 | +Previously, we connected to notify::strength only if there was |
1769 | +already a signal connected, and the AP changed (thus, by induction, |
1770 | +we never connected). As a result, the icon became stale and different |
1771 | +from that shown inside the menu (which is correctly updated). |
1772 | + |
1773 | +https://bugzilla.gnome.org/show_bug.cgi?id=650007 |
1774 | +--- |
1775 | + js/ui/status/network.js | 12 +++++++----- |
1776 | + 1 files changed, 7 insertions(+), 5 deletions(-) |
1777 | + |
1778 | +diff --git a/js/ui/status/network.js b/js/ui/status/network.js |
1779 | +index aa9b277..d40f7a6 100644 |
1780 | +--- a/js/ui/status/network.js |
1781 | ++++ b/js/ui/status/network.js |
1782 | +@@ -2061,10 +2061,11 @@ NMApplet.prototype = { |
1783 | + } |
1784 | + this.setIcon('network-wireless-connected'); |
1785 | + } else { |
1786 | +- if (this._accessPointUpdateId && this._activeAccessPoint != ap) { |
1787 | +- this._activeAccessPoint.disconnect(this._accessPointUpdateId); |
1788 | ++ if (this._activeAccessPoint != ap) { |
1789 | ++ if (this._accessPointUpdateId) |
1790 | ++ this._activeAccessPoint.disconnect(this._accessPointUpdateId); |
1791 | + this._activeAccessPoint = ap; |
1792 | +- this._activeAccessPointUpdateId = ap.connect('notify::strength', Lang.bind(function() { |
1793 | ++ this._activeAccessPointUpdateId = ap.connect('notify::strength', Lang.bind(this, function() { |
1794 | + this.setIcon('network-wireless-signal-' + signalToIcon(ap.strength)); |
1795 | + })); |
1796 | + } |
1797 | +@@ -2091,8 +2092,9 @@ NMApplet.prototype = { |
1798 | + break; |
1799 | + } |
1800 | + |
1801 | +- if (this._mobileUpdateId && this._mobileUpdateDevice != dev) { |
1802 | +- this._mobileUpdateDevice.disconnect(this._mobileUpdateId); |
1803 | ++ if (dev.mobileDevice != this._mobileUpdateDevice) { |
1804 | ++ if (this._mobileUpdateId) |
1805 | ++ this._mobileUpdateDevice.disconnect(this._mobileUpdateId); |
1806 | + this._mobileUpdateDevice = dev.mobileDevice; |
1807 | + this._mobileUpdateId = dev.mobileDevice.connect('notify::signal-quality', Lang.bind(this, function() { |
1808 | + this.setIcon('network-cellular-signal-' + signalToIcon(dev.mobileDevice.signal_quality)); |
1809 | +-- |
1810 | +1.7.7.3 |
1811 | + |
1812 | |
1813 | === added file 'debian/patches/08-polkit-Find-the-best-user-to-authenticate-as.patch' |
1814 | --- debian/patches/08-polkit-Find-the-best-user-to-authenticate-as.patch 1970-01-01 00:00:00 +0000 |
1815 | +++ debian/patches/08-polkit-Find-the-best-user-to-authenticate-as.patch 2012-01-25 02:33:28 +0000 |
1816 | @@ -0,0 +1,49 @@ |
1817 | +From b98e1daac76ea0a5417ca1efd0ba668fb8ec4816 Mon Sep 17 00:00:00 2001 |
1818 | +From: Matthias Clasen <mclasen@redhat.com> |
1819 | +Date: Thu, 17 Nov 2011 22:42:37 -0500 |
1820 | +Subject: [PATCH] polkit: Find the best user to authenticate as |
1821 | + |
1822 | +We prefer to ask the user for his own password. If PolicyKit |
1823 | +is not configured to accept that, try the root password. If |
1824 | +PolicyKit does not accept that either, ask for password of |
1825 | +the first user that PolicyKit _will_ accept. The last case |
1826 | +is a bit broken, but should rarely occur in real-life |
1827 | +configurations. |
1828 | + |
1829 | +https://bugzilla.gnome.org/show_bug.cgi?id=651547 |
1830 | +--- |
1831 | + js/ui/polkitAuthenticationAgent.js | 9 +++++++-- |
1832 | + 1 files changed, 7 insertions(+), 2 deletions(-) |
1833 | + |
1834 | +diff --git a/js/ui/polkitAuthenticationAgent.js b/js/ui/polkitAuthenticationAgent.js |
1835 | +index 2d7063a..6f01039 100644 |
1836 | +--- a/js/ui/polkitAuthenticationAgent.js |
1837 | ++++ b/js/ui/polkitAuthenticationAgent.js |
1838 | +@@ -27,6 +27,7 @@ const AccountsService = imports.gi.AccountsService; |
1839 | + const Clutter = imports.gi.Clutter; |
1840 | + const St = imports.gi.St; |
1841 | + const Pango = imports.gi.Pango; |
1842 | ++const GLib = imports.gi.GLib; |
1843 | + const Gio = imports.gi.Gio; |
1844 | + const Mainloop = imports.mainloop; |
1845 | + const Polkit = imports.gi.Polkit; |
1846 | +@@ -88,10 +89,14 @@ AuthenticationDialog.prototype = { |
1847 | + if (userNames.length > 1) { |
1848 | + log('polkitAuthenticationAgent: Received ' + userNames.length + |
1849 | + ' identities that can be used for authentication. Only ' + |
1850 | +- 'considering the first one.'); |
1851 | ++ 'considering one.'); |
1852 | + } |
1853 | + |
1854 | +- let userName = userNames[0]; |
1855 | ++ let userName = GLib.get_user_name(); |
1856 | ++ if (userNames.indexOf(userName) < 0) |
1857 | ++ userName = 'root'; |
1858 | ++ if (userNames.indexOf(userName) < 0) |
1859 | ++ userName = userNames[0]; |
1860 | + |
1861 | + this._user = AccountsService.UserManager.get_default().get_user(userName); |
1862 | + let userRealName = this._user.get_real_name() |
1863 | +-- |
1864 | +1.7.7.3 |
1865 | + |
1866 | |
1867 | === added file 'debian/patches/09-respect-NoDisplay-semantics-for-app-menu.patch' |
1868 | --- debian/patches/09-respect-NoDisplay-semantics-for-app-menu.patch 1970-01-01 00:00:00 +0000 |
1869 | +++ debian/patches/09-respect-NoDisplay-semantics-for-app-menu.patch 2012-01-25 02:33:28 +0000 |
1870 | @@ -0,0 +1,27 @@ |
1871 | +From 3013e942d862840e46eb07de9e84f9d80e7e13cc Mon Sep 17 00:00:00 2001 |
1872 | +From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@0d.be> |
1873 | +Date: Sun, 4 Sep 2011 15:29:38 +0200 |
1874 | +Subject: [PATCH] Also respect NoDisplay semantics for applications menu |
1875 | + |
1876 | +https://bugzilla.gnome.org/show_bug.cgi?id=658176 |
1877 | +--- |
1878 | + src/shell-app-system.c | 6 +----- |
1879 | + 1 files changed, 1 insertions(+), 5 deletions(-) |
1880 | + |
1881 | +Index: gnome-shell-3.2.1/src/shell-app-system.c |
1882 | +=================================================================== |
1883 | +--- gnome-shell-3.2.1.orig/src/shell-app-system.c 2011-10-17 17:24:49.000000000 +0200 |
1884 | ++++ gnome-shell-3.2.1/src/shell-app-system.c 2011-12-03 06:31:39.572401347 +0100 |
1885 | +@@ -102,11 +102,7 @@ |
1886 | + NULL, |
1887 | + (GDestroyNotify)g_object_unref); |
1888 | + |
1889 | +- /* For now, we want to pick up Evince, Nautilus, etc. We'll |
1890 | +- * handle NODISPLAY semantics at a higher level or investigate them |
1891 | +- * case by case. |
1892 | +- */ |
1893 | +- priv->apps_tree = gmenu_tree_new ("applications.menu", GMENU_TREE_FLAGS_INCLUDE_NODISPLAY); |
1894 | ++ priv->apps_tree = gmenu_tree_new ("applications.menu", 0); |
1895 | + g_signal_connect (priv->apps_tree, "changed", G_CALLBACK (on_apps_tree_changed_cb), self); |
1896 | + |
1897 | + priv->settings_tree = gmenu_tree_new ("gnomecc.menu", 0); |
1898 | |
1899 | === added file 'debian/patches/10-bluetooth-fix-connection-from-gs-menu.patch' |
1900 | --- debian/patches/10-bluetooth-fix-connection-from-gs-menu.patch 1970-01-01 00:00:00 +0000 |
1901 | +++ debian/patches/10-bluetooth-fix-connection-from-gs-menu.patch 2012-01-25 02:33:28 +0000 |
1902 | @@ -0,0 +1,31 @@ |
1903 | +From 0ed0dc89b51f8e584dd21c87a7178ba138bed44b Mon Sep 17 00:00:00 2001 |
1904 | +From: Alessandro Crismani <alessandro.crismani@gmail.com> |
1905 | +Date: Tue, 13 Dec 2011 10:01:34 +0100 |
1906 | +Subject: [PATCH] Bluetooth: fix connecting devices from GS's panel on 3.2.1 |
1907 | + |
1908 | +Connecting devices from Gnome Shell's panel on Gnome 3.2.1 fails because |
1909 | +of an undefined variable in |
1910 | +js/ui/status/bluetooth.js:buildDeviceSubMenu. More explicitly, the |
1911 | +menuitem variable is not declared and hence connecting and disconnecting |
1912 | +fails. Fix it to make the bluetooth panel menu item work. |
1913 | +--- |
1914 | + js/ui/status/bluetooth.js | 3 ++- |
1915 | + 1 files changed, 2 insertions(+), 1 deletions(-) |
1916 | + |
1917 | +diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js |
1918 | +index f2d95f5..3aa7960 100644 |
1919 | +--- a/js/ui/status/bluetooth.js |
1920 | ++++ b/js/ui/status/bluetooth.js |
1921 | +@@ -205,7 +205,8 @@ Indicator.prototype = { |
1922 | + _buildDeviceSubMenu: function(item, device) { |
1923 | + if (device.can_connect) { |
1924 | + item._connected = device.connected; |
1925 | +- item._connectedMenuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected); |
1926 | ++ let menuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected); |
1927 | ++ item._connectedMenuitem = menuitem; |
1928 | + item._connectedMenuitem.connect('toggled', Lang.bind(this, function() { |
1929 | + if (item._connected > ConnectionState.CONNECTED) { |
1930 | + // operation already in progress, revert |
1931 | +-- |
1932 | +1.7.8 |
1933 | + |
1934 | |
1935 | === modified file 'debian/patches/series' |
1936 | --- debian/patches/series 2011-10-24 06:43:05 +0000 |
1937 | +++ debian/patches/series 2012-01-25 02:33:28 +0000 |
1938 | @@ -1,1 +1,6 @@ |
1939 | -03_remove-glx-dependency-on-armel.patch |
1940 | +02_rpath-bluetooth-applet.patch |
1941 | +04_remove-glx-dependency-on-armel.patch |
1942 | +07-NetworkMenu-fix-logic-for-updating-wifi-icon.patch |
1943 | +08-polkit-Find-the-best-user-to-authenticate-as.patch |
1944 | +09-respect-NoDisplay-semantics-for-app-menu.patch |
1945 | +10-bluetooth-fix-connection-from-gs-menu.patch |
1946 | |
1947 | === modified file 'js/misc/config.js' |
1948 | --- js/misc/config.js 2011-10-24 06:43:05 +0000 |
1949 | +++ js/misc/config.js 2012-01-25 02:33:28 +0000 |
1950 | @@ -3,9 +3,9 @@ |
1951 | /* The name of this package (not localized) */ |
1952 | const PACKAGE_NAME = 'gnome-shell'; |
1953 | /* The version of this package */ |
1954 | -const PACKAGE_VERSION = '3.2.1'; |
1955 | +const PACKAGE_VERSION = '3.2.2.1'; |
1956 | /* The version of GJS we're linking to */ |
1957 | -const GJS_VERSION = '1.30.0'; |
1958 | +const GJS_VERSION = '1.30.1'; |
1959 | /* 1 if gnome-bluetooth is available, 0 otherwise */ |
1960 | const HAVE_BLUETOOTH = 1; |
1961 | /* The system TLS CA list */ |
1962 | |
1963 | === modified file 'js/misc/fileUtils.js' |
1964 | --- js/misc/fileUtils.js 2011-10-24 06:43:05 +0000 |
1965 | +++ js/misc/fileUtils.js 2012-01-25 02:33:28 +0000 |
1966 | @@ -38,7 +38,7 @@ |
1967 | let child = dir.get_child(info.get_name()); |
1968 | if (type == Gio.FileType.REGULAR) |
1969 | deleteGFile(child); |
1970 | - else if (type == Gio.TypeType.DIRECTORY) |
1971 | + else if (type == Gio.FileType.DIRECTORY) |
1972 | recursivelyDeleteDir(child); |
1973 | } |
1974 | |
1975 | |
1976 | === modified file 'js/ui/iconGrid.js' |
1977 | --- js/ui/iconGrid.js 2011-10-24 06:43:05 +0000 |
1978 | +++ js/ui/iconGrid.js 2012-01-25 02:33:28 +0000 |
1979 | @@ -147,6 +147,11 @@ |
1980 | size = found ? len : ICON_SIZE; |
1981 | } |
1982 | |
1983 | + // don't create icons unnecessarily |
1984 | + if (size == this.iconSize && |
1985 | + this._iconBin.child) |
1986 | + return; |
1987 | + |
1988 | this._createIconTexture(size); |
1989 | } |
1990 | }; |
1991 | |
1992 | === modified file 'js/ui/messageTray.js' |
1993 | --- js/ui/messageTray.js 2011-10-24 06:43:05 +0000 |
1994 | +++ js/ui/messageTray.js 2012-01-25 02:33:28 +0000 |
1995 | @@ -1419,8 +1419,16 @@ |
1996 | this._notificationRemoved = false; |
1997 | this._reNotifyAfterHideNotification = null; |
1998 | |
1999 | + this._corner = new Clutter.Rectangle({ width: 1, |
2000 | + height: 1, |
2001 | + opacity: 0, |
2002 | + reactive: true }); |
2003 | + this._corner.connect('enter-event', Lang.bind(this, this._onCornerEnter)); |
2004 | + Main.layoutManager.trayBox.add_actor(this._corner); |
2005 | + Main.layoutManager.trackChrome(this._corner); |
2006 | + |
2007 | Main.layoutManager.trayBox.add_actor(this.actor); |
2008 | - this.actor.y = -1; |
2009 | + this.actor.y = this.actor.height; |
2010 | Main.layoutManager.trackChrome(this.actor); |
2011 | Main.layoutManager.trackChrome(this._notificationBin); |
2012 | |
2013 | @@ -1459,12 +1467,24 @@ |
2014 | this._chatSummaryItemsCount = 0; |
2015 | }, |
2016 | |
2017 | + _onCornerEnter: function(actor, event) { |
2018 | + this._pointerInSummary = true; |
2019 | + this._updateState(); |
2020 | + }, |
2021 | + |
2022 | _setSizePosition: function() { |
2023 | let monitor = Main.layoutManager.bottomMonitor; |
2024 | this._notificationBin.x = 0; |
2025 | this._notificationBin.width = monitor.width; |
2026 | this._summaryBin.x = 0; |
2027 | this._summaryBin.width = monitor.width; |
2028 | + |
2029 | + if (St.Widget.get_default_direction() == St.TextDirection.RTL) |
2030 | + this._corner.x = 0; |
2031 | + else |
2032 | + this._corner.x = Main.layoutManager.trayBox.width - 1; |
2033 | + |
2034 | + this._corner.y = Main.layoutManager.trayBox.height - 1; |
2035 | }, |
2036 | |
2037 | contains: function(source) { |
2038 | @@ -1832,7 +1852,7 @@ |
2039 | // automatically. Instead, the user is able to expand the notification by mousing away from it and then |
2040 | // mousing back in. Because this is an expected action, we set the boolean flag that indicates that a longer |
2041 | // timeout should be used before popping down the notification. |
2042 | - if (this._notificationBin.contains(actorAtShowNotificationPosition)) { |
2043 | + if (this.actor.contains(actorAtShowNotificationPosition)) { |
2044 | this._useLongerTrayLeftTimeout = true; |
2045 | return; |
2046 | } |
2047 | @@ -2057,7 +2077,7 @@ |
2048 | |
2049 | _hideTray: function() { |
2050 | this._tween(this.actor, '_trayState', State.HIDDEN, |
2051 | - { y: -1, |
2052 | + { y: this.actor.height, |
2053 | time: ANIMATION_TIME, |
2054 | transition: 'easeOutQuad' |
2055 | }); |
2056 | |
2057 | === modified file 'js/ui/notificationDaemon.js' |
2058 | --- js/ui/notificationDaemon.js 2011-10-24 06:43:05 +0000 |
2059 | +++ js/ui/notificationDaemon.js 2012-01-25 02:33:28 +0000 |
2060 | @@ -92,7 +92,7 @@ |
2061 | _init: function() { |
2062 | DBus.session.exportObject('/org/freedesktop/Notifications', this); |
2063 | |
2064 | - this._sources = {}; |
2065 | + this._sources = []; |
2066 | this._senderToPid = {}; |
2067 | this._notifications = {}; |
2068 | this._busProxy = new Bus(); |
2069 | @@ -150,14 +150,30 @@ |
2070 | } |
2071 | }, |
2072 | |
2073 | + _lookupSource: function(title, pid, trayIcon) { |
2074 | + for (let i = 0; i < this._sources.length; i++) { |
2075 | + let source = this._sources[i]; |
2076 | + if (source.pid == pid && |
2077 | + (source.initialTitle == title || source.trayIcon || trayIcon)) |
2078 | + return source; |
2079 | + } |
2080 | + return null; |
2081 | + }, |
2082 | + |
2083 | // Returns the source associated with ndata.notification if it is set. |
2084 | - // Otherwise, returns the source associated with the pid if one is |
2085 | - // stored in this._sources and the notification is not transient. |
2086 | - // Otherwise, creates a new source as long as pid is provided. |
2087 | + // Otherwise, returns the source associated with the title and pid if |
2088 | + // such source is stored in this._sources and the notification is not |
2089 | + // transient. If the existing or requested source is associated with |
2090 | + // a tray icon and passed in pid matches a pid of an existing source, |
2091 | + // the title match is ignored to enable representing a tray icon and |
2092 | + // notifications from the same application with a single source. |
2093 | + // |
2094 | + // If no existing source is found, a new source is created as long as |
2095 | + // pid is provided. |
2096 | // |
2097 | // Either a pid or ndata.notification is needed to retrieve or |
2098 | // create a source. |
2099 | - _getSource: function(title, pid, ndata, sender) { |
2100 | + _getSource: function(title, pid, ndata, sender, trayIcon) { |
2101 | if (!pid && !(ndata && ndata.notification)) |
2102 | return null; |
2103 | |
2104 | @@ -174,20 +190,24 @@ |
2105 | // with a transient one from the same sender, so we |
2106 | // always create a new source object for new transient notifications |
2107 | // and never add it to this._sources . |
2108 | - if (!isForTransientNotification && this._sources[pid]) { |
2109 | - let source = this._sources[pid]; |
2110 | - source.setTitle(title); |
2111 | - return source; |
2112 | + if (!isForTransientNotification) { |
2113 | + let source = this._lookupSource(title, pid, trayIcon); |
2114 | + if (source) { |
2115 | + source.setTitle(title); |
2116 | + return source; |
2117 | + } |
2118 | } |
2119 | |
2120 | - let source = new Source(title, pid, sender); |
2121 | + let source = new Source(title, pid, sender, trayIcon); |
2122 | source.setTransient(isForTransientNotification); |
2123 | |
2124 | if (!isForTransientNotification) { |
2125 | - this._sources[pid] = source; |
2126 | + this._sources.push(source); |
2127 | source.connect('destroy', Lang.bind(this, |
2128 | function() { |
2129 | - delete this._sources[pid]; |
2130 | + let index = this._sources.indexOf(source); |
2131 | + if (index >= 0) |
2132 | + this._sources.splice(index, 1); |
2133 | })); |
2134 | } |
2135 | |
2136 | @@ -261,7 +281,7 @@ |
2137 | let sender = DBus.getCurrentMessageContext().sender; |
2138 | let pid = this._senderToPid[sender]; |
2139 | |
2140 | - let source = this._getSource(appName, pid, ndata, sender); |
2141 | + let source = this._getSource(appName, pid, ndata, sender, null); |
2142 | |
2143 | if (source) { |
2144 | this._notifyForSource(source, ndata); |
2145 | @@ -282,7 +302,7 @@ |
2146 | if (!ndata) |
2147 | return; |
2148 | |
2149 | - source = this._getSource(appName, pid, ndata, sender); |
2150 | + source = this._getSource(appName, pid, ndata, sender, null); |
2151 | |
2152 | // We only store sender-pid entries for persistent sources. |
2153 | // Removing the entries once the source is destroyed |
2154 | @@ -432,8 +452,8 @@ |
2155 | if (!tracker.focus_app) |
2156 | return; |
2157 | |
2158 | - for (let id in this._sources) { |
2159 | - let source = this._sources[id]; |
2160 | + for (let i = 0; i < this._sources.length; i++) { |
2161 | + let source = this._sources[i]; |
2162 | if (source.app == tracker.focus_app) { |
2163 | source.destroyNonResidentNotifications(); |
2164 | return; |
2165 | @@ -456,12 +476,11 @@ |
2166 | }, |
2167 | |
2168 | _onTrayIconAdded: function(o, icon) { |
2169 | - let source = this._getSource(icon.title || icon.wm_class || _("Unknown"), icon.pid, null, null); |
2170 | - source.setTrayIcon(icon); |
2171 | + let source = this._getSource(icon.title || icon.wm_class || _("Unknown"), icon.pid, null, null, icon); |
2172 | }, |
2173 | |
2174 | _onTrayIconRemoved: function(o, icon) { |
2175 | - let source = this._sources[icon.pid]; |
2176 | + let source = this._lookupSource(null, icon.pid, true); |
2177 | if (source) |
2178 | source.destroy(); |
2179 | } |
2180 | @@ -469,17 +488,19 @@ |
2181 | |
2182 | DBus.conformExport(NotificationDaemon.prototype, NotificationDaemonIface); |
2183 | |
2184 | -function Source(title, pid, sender) { |
2185 | - this._init(title, pid, sender); |
2186 | +function Source(title, pid, sender, trayIcon) { |
2187 | + this._init(title, pid, sender, trayIcon); |
2188 | } |
2189 | |
2190 | Source.prototype = { |
2191 | __proto__: MessageTray.Source.prototype, |
2192 | |
2193 | - _init: function(title, pid, sender) { |
2194 | + _init: function(title, pid, sender, trayIcon) { |
2195 | MessageTray.Source.prototype._init.call(this, title); |
2196 | |
2197 | - this._pid = pid; |
2198 | + this.initialTitle = title; |
2199 | + |
2200 | + this.pid = pid; |
2201 | if (sender) |
2202 | // TODO: dbus-glib implementation of watch_name() doesn’t return an id to be used for |
2203 | // unwatch_name() or implement unwatch_name(), however when we move to using GDBus implementation, |
2204 | @@ -496,7 +517,12 @@ |
2205 | this.title = this.app.get_name(); |
2206 | else |
2207 | this.useNotificationIcon = true; |
2208 | - this._trayIcon = null; |
2209 | + |
2210 | + this.trayIcon = trayIcon; |
2211 | + if (this.trayIcon) { |
2212 | + this._setSummaryIcon(this.trayIcon); |
2213 | + this.useNotificationIcon = false; |
2214 | + } |
2215 | }, |
2216 | |
2217 | _onNameVanished: function() { |
2218 | @@ -523,7 +549,7 @@ |
2219 | }, |
2220 | |
2221 | handleSummaryClick: function() { |
2222 | - if (!this._trayIcon) |
2223 | + if (!this.trayIcon) |
2224 | return false; |
2225 | |
2226 | let event = Clutter.get_current_event(); |
2227 | @@ -544,11 +570,11 @@ |
2228 | let id = global.connect('notify::stage-input-mode', Lang.bind(this, |
2229 | function () { |
2230 | global.disconnect(id); |
2231 | - this._trayIcon.click(event); |
2232 | + this.trayIcon.click(event); |
2233 | })); |
2234 | Main.overview.hide(); |
2235 | } else { |
2236 | - this._trayIcon.click(event); |
2237 | + this.trayIcon.click(event); |
2238 | } |
2239 | return true; |
2240 | }, |
2241 | @@ -557,31 +583,25 @@ |
2242 | if (this.app) |
2243 | return; |
2244 | |
2245 | - this.app = Shell.WindowTracker.get_default().get_app_from_pid(this._pid); |
2246 | + this.app = Shell.WindowTracker.get_default().get_app_from_pid(this.pid); |
2247 | if (!this.app) |
2248 | return; |
2249 | |
2250 | // Only override the icon if we were previously using |
2251 | // notification-based icons (ie, not a trayicon) or if it was unset before |
2252 | - if (!this._trayIcon) { |
2253 | + if (!this.trayIcon) { |
2254 | this.useNotificationIcon = false; |
2255 | this._setSummaryIcon(this.app.create_icon_texture (this.ICON_SIZE)); |
2256 | } |
2257 | }, |
2258 | |
2259 | - setTrayIcon: function(icon) { |
2260 | - this._setSummaryIcon(icon); |
2261 | - this.useNotificationIcon = false; |
2262 | - this._trayIcon = icon; |
2263 | - }, |
2264 | - |
2265 | open: function(notification) { |
2266 | this.destroyNonResidentNotifications(); |
2267 | this.openApp(); |
2268 | }, |
2269 | |
2270 | _lastNotificationRemoved: function() { |
2271 | - if (!this._trayIcon) |
2272 | + if (!this.trayIcon) |
2273 | this.destroy(); |
2274 | }, |
2275 | |
2276 | |
2277 | === modified file 'js/ui/status/network.js' |
2278 | --- js/ui/status/network.js 2011-10-24 06:43:05 +0000 |
2279 | +++ js/ui/status/network.js 2012-01-25 02:33:28 +0000 |
2280 | @@ -1104,10 +1104,10 @@ |
2281 | let activeAp = this.device.active_access_point; |
2282 | |
2283 | if (activeAp) { |
2284 | - let pos = this._findNetwork(activeAp); |
2285 | + let res = this._findExistingNetwork(activeAp); |
2286 | |
2287 | - if (pos != -1) |
2288 | - this._activeNetwork = this._networks[pos]; |
2289 | + if (res != null) |
2290 | + this._activeNetwork = this._networks[res.network]; |
2291 | } |
2292 | |
2293 | // we don't refresh the view here, setActiveConnection will |
2294 | @@ -1181,6 +1181,18 @@ |
2295 | return true; |
2296 | }, |
2297 | |
2298 | + _findExistingNetwork: function(accessPoint) { |
2299 | + for (let i = 0; i < this._networks.length; i++) { |
2300 | + let apObj = this._networks[i]; |
2301 | + for (let j = 0; j < apObj.accessPoints.length; j++) { |
2302 | + if (apObj.accessPoints[j] == accessPoint) |
2303 | + return { network: i, ap: j }; |
2304 | + } |
2305 | + } |
2306 | + |
2307 | + return null; |
2308 | + }, |
2309 | + |
2310 | _findNetwork: function(accessPoint) { |
2311 | if (accessPoint.get_ssid() == null) |
2312 | return -1; |
2313 | @@ -1273,22 +1285,15 @@ |
2314 | }, |
2315 | |
2316 | _accessPointRemoved: function(device, accessPoint) { |
2317 | - let pos = this._findNetwork(accessPoint); |
2318 | - |
2319 | - if (pos == -1) { |
2320 | - log('Removing an access point that was never added'); |
2321 | - return; |
2322 | - } |
2323 | - |
2324 | - let apObj = this._networks[pos]; |
2325 | - let i = apObj.accessPoints.indexOf(accessPoint); |
2326 | - |
2327 | - if (i == -1) { |
2328 | - log('Removing an access point that was never added'); |
2329 | - return; |
2330 | - } |
2331 | - |
2332 | - apObj.accessPoints.splice(i, 1); |
2333 | + let res = this._findExistingNetwork(accessPoint); |
2334 | + |
2335 | + if (res == null) { |
2336 | + log('Removing an access point that was never added'); |
2337 | + return; |
2338 | + } |
2339 | + |
2340 | + let apObj = this._networks[res.network]; |
2341 | + apObj.accessPoints.splice(res.ap, 1); |
2342 | |
2343 | if (apObj.accessPoints.length == 0) { |
2344 | if (this._activeNetwork == apObj) |
2345 | @@ -1302,22 +1307,26 @@ |
2346 | // we removed an item in the main menu, and we have a more submenu |
2347 | // we need to extract the first item in more and move it to the submenu |
2348 | |
2349 | - let apObj = this._overflowItem.menu.firstMenuItem; |
2350 | - if (apObj.item) { |
2351 | - apObj.item.destroy(); |
2352 | + let item = this._overflowItem.menu.firstMenuItem; |
2353 | + if (item && item._apObj) { |
2354 | + item.destroy(); |
2355 | + // clear the cycle, and allow the construction of the new item |
2356 | + item._apObj.item = null; |
2357 | |
2358 | - this._createNetworkItem(apObj, NUM_VISIBLE_NETWORKS-1); |
2359 | + this._createNetworkItem(item._apObj, NUM_VISIBLE_NETWORKS-1); |
2360 | + } else { |
2361 | + log('The more... menu was existing and empty! This should not happen'); |
2362 | } |
2363 | } |
2364 | |
2365 | // This can happen if the removed connection is from the overflow |
2366 | // menu, or if we just moved the last connection out from the menu |
2367 | - if (this._overflowItem.menu.length == 0) { |
2368 | + if (this._overflowItem.menu.numMenuItems == 0) { |
2369 | this._overflowItem.destroy(); |
2370 | this._overflowItem = null; |
2371 | } |
2372 | } |
2373 | - this._networks.splice(pos, 1); |
2374 | + this._networks.splice(res.network, 1); |
2375 | |
2376 | } else if (apObj.item) |
2377 | apObj.item.updateAccessPoints(apObj.accessPoints); |
2378 | @@ -1489,18 +1498,16 @@ |
2379 | } |
2380 | |
2381 | if(apObj.connections.length > 0) { |
2382 | - if (apObj.connections.length == 1) |
2383 | + if (apObj.connections.length == 1) { |
2384 | apObj.item = this._createAPItem(apObj.connections[0], apObj, false); |
2385 | - else { |
2386 | + } else { |
2387 | let title = apObj.ssidText; |
2388 | apObj.item = new PopupMenu.PopupSubMenuMenuItem(title); |
2389 | - apObj.item._apObj = apObj; |
2390 | for (let i = 0; i < apObj.connections.length; i++) |
2391 | apObj.item.menu.addMenuItem(this._createAPItem(apObj.connections[i], apObj, true)); |
2392 | } |
2393 | } else { |
2394 | apObj.item = new NMNetworkMenuItem(apObj.accessPoints); |
2395 | - apObj.item._apObj = apObj; |
2396 | apObj.item.connect('activate', Lang.bind(this, function() { |
2397 | let accessPoints = sortAccessPoints(apObj.accessPoints); |
2398 | if ( (accessPoints[0]._secType == NMAccessPointSecurity.WPA2_ENT) |
2399 | @@ -1515,6 +1522,8 @@ |
2400 | } |
2401 | })); |
2402 | } |
2403 | + apObj.item._apObj = apObj; |
2404 | + |
2405 | if (position < NUM_VISIBLE_NETWORKS) { |
2406 | apObj.isMore = false; |
2407 | this.section.addMenuItem(apObj.item, position); |
2408 | |
2409 | === modified file 'js/ui/workspaceThumbnail.js' |
2410 | --- js/ui/workspaceThumbnail.js 2011-10-24 06:43:05 +0000 |
2411 | +++ js/ui/workspaceThumbnail.js 2012-01-25 02:33:28 +0000 |
2412 | @@ -148,6 +148,8 @@ |
2413 | this.metaWorkspace = metaWorkspace; |
2414 | this.monitorIndex = Main.layoutManager.primaryIndex; |
2415 | |
2416 | + this._removed = false; |
2417 | + |
2418 | this.actor = new St.Group({ reactive: true, |
2419 | clip_to_allocation: true, |
2420 | style_class: 'workspace-thumbnail' }); |
2421 | @@ -173,17 +175,21 @@ |
2422 | let monitor = Main.layoutManager.primaryMonitor; |
2423 | this.setPorthole(monitor.x, monitor.y, monitor.width, monitor.height); |
2424 | |
2425 | - let windows = global.get_window_actors().filter(this._isMyWindow, this); |
2426 | + let windows = global.get_window_actors().filter(this._isWorkspaceWindow, this); |
2427 | |
2428 | // Create clones for windows that should be visible in the Overview |
2429 | this._windows = []; |
2430 | + this._allWindows = []; |
2431 | + this._minimizedChangedIds = []; |
2432 | for (let i = 0; i < windows.length; i++) { |
2433 | - windows[i].meta_window._minimizedChangedId = |
2434 | + let minimizedChangedId = |
2435 | windows[i].meta_window.connect('notify::minimized', |
2436 | Lang.bind(this, |
2437 | this._updateMinimized)); |
2438 | + this._allWindows.push(windows[i].meta_window); |
2439 | + this._minimizedChangedIds.push(minimizedChangedId); |
2440 | |
2441 | - if (this._isOverviewWindow(windows[i])) { |
2442 | + if (this._isMyWindow(windows[i]) && this._isOverviewWindow(windows[i])) { |
2443 | this._addWindowClone(windows[i]); |
2444 | } |
2445 | } |
2446 | @@ -268,17 +274,11 @@ |
2447 | let clone = this._windows[index]; |
2448 | this._windows.splice(index, 1); |
2449 | |
2450 | - if (win && this._isOverviewWindow(win)) { |
2451 | - if (metaWin._minimizedChangedId) { |
2452 | - metaWin.disconnect(metaWin._minimizedChangedId); |
2453 | - delete metaWin._minimizedChangedId; |
2454 | - } |
2455 | - } |
2456 | clone.destroy(); |
2457 | }, |
2458 | |
2459 | _doAddWindow : function(metaWin) { |
2460 | - if (this.leavingOverview) |
2461 | + if (this._removed) |
2462 | return; |
2463 | |
2464 | let win = metaWin.get_compositor_private(); |
2465 | @@ -288,7 +288,7 @@ |
2466 | // the compositor finds out about them... |
2467 | Mainloop.idle_add(Lang.bind(this, |
2468 | function () { |
2469 | - if (this.actor && |
2470 | + if (!this._removed && |
2471 | metaWin.get_compositor_private() && |
2472 | metaWin.get_workspace() == this.metaWorkspace) |
2473 | this._doAddWindow(metaWin); |
2474 | @@ -297,16 +297,19 @@ |
2475 | return; |
2476 | } |
2477 | |
2478 | + if (this._allWindows.indexOf(metaWin) == -1) { |
2479 | + let minimizedChangedId = metaWin.connect('notify::minimized', |
2480 | + Lang.bind(this, |
2481 | + this._updateMinimized)); |
2482 | + this._allWindows.push(metaWin); |
2483 | + this._minimizedChangedIds.push(minimizedChangedId); |
2484 | + } |
2485 | + |
2486 | // We might have the window in our list already if it was on all workspaces and |
2487 | // now was moved to this workspace |
2488 | if (this._lookupIndex (metaWin) != -1) |
2489 | return; |
2490 | |
2491 | - if (!metaWin._minimizedChangedId) |
2492 | - metaWin._minimizedChangedId = metaWin.connect('notify::minimized', |
2493 | - Lang.bind(this, |
2494 | - this._updateMinimized)); |
2495 | - |
2496 | if (!this._isMyWindow(win) || !this._isOverviewWindow(win)) |
2497 | return; |
2498 | |
2499 | @@ -318,6 +321,13 @@ |
2500 | }, |
2501 | |
2502 | _windowRemoved : function(metaWorkspace, metaWin) { |
2503 | + let index = this._allWindows.indexOf(metaWin); |
2504 | + if (index != -1) { |
2505 | + metaWin.disconnect(this._minimizedChangedIds[index]); |
2506 | + this._allWindows.splice(index, 1); |
2507 | + this._minimizedChangedIds.splice(index, 1); |
2508 | + } |
2509 | + |
2510 | this._doRemoveWindow(metaWin); |
2511 | }, |
2512 | |
2513 | @@ -344,27 +354,36 @@ |
2514 | this.actor.destroy(); |
2515 | }, |
2516 | |
2517 | - _onDestroy: function(actor) { |
2518 | + workspaceRemoved : function() { |
2519 | + if (this._removed) |
2520 | + return; |
2521 | + |
2522 | + this._removed = true; |
2523 | + |
2524 | this.metaWorkspace.disconnect(this._windowAddedId); |
2525 | this.metaWorkspace.disconnect(this._windowRemovedId); |
2526 | global.screen.disconnect(this._windowEnteredMonitorId); |
2527 | global.screen.disconnect(this._windowLeftMonitorId); |
2528 | |
2529 | - for (let i = 0; i < this._windows.length; i++) { |
2530 | - let metaWin = this._windows[i].metaWindow; |
2531 | - if (metaWin._minimizedChangedId) { |
2532 | - metaWin.disconnect(metaWin._minimizedChangedId); |
2533 | - delete metaWin._minimizedChangedId; |
2534 | - } |
2535 | - } |
2536 | + for (let i = 0; i < this._allWindows.length; i++) |
2537 | + this._allWindows[i].disconnect(this._minimizedChangedIds[i]); |
2538 | + }, |
2539 | + |
2540 | + _onDestroy: function(actor) { |
2541 | + this.workspaceRemoved(); |
2542 | |
2543 | this._windows = []; |
2544 | this.actor = null; |
2545 | }, |
2546 | |
2547 | + // Tests if @win belongs to this workspace |
2548 | + _isWorkspaceWindow : function (win) { |
2549 | + return Main.isWindowActorDisplayedOnWorkspace(win, this.metaWorkspace.index()); |
2550 | + }, |
2551 | + |
2552 | // Tests if @win belongs to this workspace and monitor |
2553 | _isMyWindow : function (win) { |
2554 | - return Main.isWindowActorDisplayedOnWorkspace(win, this.metaWorkspace.index()) && |
2555 | + return this._isWorkspaceWindow(win) && |
2556 | (!win.get_meta_window() || win.get_meta_window().get_monitor() == this.monitorIndex); |
2557 | }, |
2558 | |
2559 | @@ -584,8 +603,10 @@ |
2560 | if (thumbnail.state > ThumbnailState.NORMAL) |
2561 | continue; |
2562 | |
2563 | - if (currentPos >= start && currentPos < start + count) |
2564 | + if (currentPos >= start && currentPos < start + count) { |
2565 | + thumbnail.workspaceRemoved(); |
2566 | this._setThumbnailState(thumbnail, ThumbnailState.REMOVING); |
2567 | + } |
2568 | |
2569 | currentPos++; |
2570 | } |
2571 | |
2572 | === modified file 'po/bg.po' |
2573 | --- po/bg.po 2011-10-24 06:43:05 +0000 |
2574 | +++ po/bg.po 2012-01-25 02:33:28 +0000 |
2575 | @@ -5,10 +5,10 @@ |
2576 | # |
2577 | msgid "" |
2578 | msgstr "" |
2579 | -"Project-Id-Version: gnome-shell master\n" |
2580 | +"Project-Id-Version: gnome-shell gnome-3-2\n" |
2581 | "Report-Msgid-Bugs-To: \n" |
2582 | -"POT-Creation-Date: 2011-10-15 10:43+0300\n" |
2583 | -"PO-Revision-Date: 2011-10-05 13:04+0300\n" |
2584 | +"POT-Creation-Date: 2011-10-21 23:30+0300\n" |
2585 | +"PO-Revision-Date: 2011-10-21 23:30+0300\n" |
2586 | "Last-Translator: Ivaylo Valkov <ivaylo@e-valkov.org>\n" |
2587 | "Language-Team: Bulgarian <dict@fsa-bg.org>\n" |
2588 | "Language: bg\n" |
2589 | @@ -184,42 +184,42 @@ |
2590 | msgid "disabled OpenSearch providers" |
2591 | msgstr "изключени доставчици на OpenSearch" |
2592 | |
2593 | -#: ../js/gdm/loginDialog.js:617 |
2594 | +#: ../js/gdm/loginDialog.js:633 |
2595 | msgid "Session..." |
2596 | msgstr "Сесия…" |
2597 | |
2598 | -#: ../js/gdm/loginDialog.js:788 |
2599 | +#: ../js/gdm/loginDialog.js:804 |
2600 | msgctxt "title" |
2601 | msgid "Sign In" |
2602 | msgstr "Регистриране" |
2603 | |
2604 | #. translators: this message is shown below the password entry field |
2605 | #. to indicate the user can swipe their finger instead |
2606 | -#: ../js/gdm/loginDialog.js:833 |
2607 | +#: ../js/gdm/loginDialog.js:849 |
2608 | msgid "(or swipe finger)" |
2609 | msgstr "(или се регистрирайте с пръстов отпечатък)" |
2610 | |
2611 | -#: ../js/gdm/loginDialog.js:851 |
2612 | +#: ../js/gdm/loginDialog.js:867 |
2613 | msgid "Not listed?" |
2614 | msgstr "Липсва в списъка?" |
2615 | |
2616 | -#: ../js/gdm/loginDialog.js:1019 ../js/ui/endSessionDialog.js:426 |
2617 | -#: ../js/ui/extensionSystem.js:477 ../js/ui/networkAgent.js:165 |
2618 | -#: ../js/ui/polkitAuthenticationAgent.js:171 ../js/ui/status/bluetooth.js:480 |
2619 | +#: ../js/gdm/loginDialog.js:1035 ../js/ui/endSessionDialog.js:426 |
2620 | +#: ../js/ui/extensionSystem.js:477 ../js/ui/networkAgent.js:148 |
2621 | +#: ../js/ui/polkitAuthenticationAgent.js:173 ../js/ui/status/bluetooth.js:480 |
2622 | msgid "Cancel" |
2623 | msgstr "Отказване" |
2624 | |
2625 | -#: ../js/gdm/loginDialog.js:1024 |
2626 | +#: ../js/gdm/loginDialog.js:1040 |
2627 | msgctxt "button" |
2628 | msgid "Sign In" |
2629 | msgstr "Регистриране" |
2630 | |
2631 | -#: ../js/gdm/loginDialog.js:1373 |
2632 | +#: ../js/gdm/loginDialog.js:1392 |
2633 | msgid "Login Window" |
2634 | msgstr "Екран за идентификация" |
2635 | |
2636 | -#: ../js/gdm/powerMenu.js:116 ../js/ui/userMenu.js:549 |
2637 | -#: ../js/ui/userMenu.js:551 ../js/ui/userMenu.js:620 |
2638 | +#: ../js/gdm/powerMenu.js:116 ../js/ui/userMenu.js:554 |
2639 | +#: ../js/ui/userMenu.js:556 ../js/ui/userMenu.js:625 |
2640 | msgid "Suspend" |
2641 | msgstr "Приспиване" |
2642 | |
2643 | @@ -442,7 +442,7 @@ |
2644 | msgid "Next week" |
2645 | msgstr "Следващата седмица" |
2646 | |
2647 | -#: ../js/ui/contactDisplay.js:65 ../js/ui/notificationDaemon.js:444 |
2648 | +#: ../js/ui/contactDisplay.js:65 ../js/ui/notificationDaemon.js:459 |
2649 | #: ../js/ui/status/power.js:223 ../src/shell-app.c:353 |
2650 | msgid "Unknown" |
2651 | msgstr "Неизвестно" |
2652 | @@ -467,7 +467,7 @@ |
2653 | msgid "CONTACTS" |
2654 | msgstr "КОНТАКТИ" |
2655 | |
2656 | -#: ../js/ui/dash.js:172 ../js/ui/messageTray.js:1204 |
2657 | +#: ../js/ui/dash.js:174 ../js/ui/messageTray.js:1206 |
2658 | msgid "Remove" |
2659 | msgstr "Изтриване" |
2660 | |
2661 | @@ -607,100 +607,96 @@ |
2662 | msgid "Download and install '%s' from extensions.gnome.org?" |
2663 | msgstr "Да се изтегли и инсталира ли „%s“ от from extensions.gnome.org?" |
2664 | |
2665 | -#: ../js/ui/keyboard.js:309 |
2666 | +#: ../js/ui/keyboard.js:325 |
2667 | msgid "tray" |
2668 | msgstr "област за уведомяване" |
2669 | |
2670 | -#: ../js/ui/keyboard.js:531 ../js/ui/status/power.js:211 |
2671 | +#: ../js/ui/keyboard.js:547 ../js/ui/status/power.js:211 |
2672 | msgid "Keyboard" |
2673 | msgstr "Клавиатура" |
2674 | |
2675 | -#: ../js/ui/lookingGlass.js:645 |
2676 | +#: ../js/ui/lookingGlass.js:646 |
2677 | msgid "No extensions installed" |
2678 | msgstr "Няма инсталирани разширения" |
2679 | |
2680 | -#: ../js/ui/lookingGlass.js:691 |
2681 | +#: ../js/ui/lookingGlass.js:692 |
2682 | msgid "Enabled" |
2683 | msgstr "Включено" |
2684 | |
2685 | #. translators: |
2686 | #. * The device has been disabled |
2687 | -#: ../js/ui/lookingGlass.js:693 ../src/gvc/gvc-mixer-control.c:1093 |
2688 | +#: ../js/ui/lookingGlass.js:694 ../src/gvc/gvc-mixer-control.c:1093 |
2689 | msgid "Disabled" |
2690 | msgstr "Изключено" |
2691 | |
2692 | -#: ../js/ui/lookingGlass.js:695 |
2693 | +#: ../js/ui/lookingGlass.js:696 |
2694 | msgid "Error" |
2695 | msgstr "Грешка" |
2696 | |
2697 | -#: ../js/ui/lookingGlass.js:697 |
2698 | +#: ../js/ui/lookingGlass.js:698 |
2699 | msgid "Out of date" |
2700 | msgstr "Остаряло" |
2701 | |
2702 | -#: ../js/ui/lookingGlass.js:699 |
2703 | +#: ../js/ui/lookingGlass.js:700 |
2704 | msgid "Downloading" |
2705 | msgstr "Изтегляне" |
2706 | |
2707 | -#: ../js/ui/lookingGlass.js:720 |
2708 | +#: ../js/ui/lookingGlass.js:721 |
2709 | msgid "View Source" |
2710 | msgstr "Преглед на изходния код" |
2711 | |
2712 | -#: ../js/ui/lookingGlass.js:726 |
2713 | +#: ../js/ui/lookingGlass.js:727 |
2714 | msgid "Web Page" |
2715 | msgstr "Домашна страница" |
2716 | |
2717 | -#: ../js/ui/messageTray.js:1197 |
2718 | +#: ../js/ui/messageTray.js:1199 |
2719 | msgid "Open" |
2720 | msgstr "Отваряне" |
2721 | |
2722 | -#: ../js/ui/messageTray.js:2406 |
2723 | +#: ../js/ui/messageTray.js:2408 |
2724 | msgid "System Information" |
2725 | msgstr "Информация за системата" |
2726 | |
2727 | -#: ../js/ui/networkAgent.js:145 |
2728 | -msgid "Show password" |
2729 | -msgstr "Показване на парола" |
2730 | - |
2731 | -#: ../js/ui/networkAgent.js:160 |
2732 | +#: ../js/ui/networkAgent.js:143 |
2733 | msgid "Connect" |
2734 | msgstr "Свързване" |
2735 | |
2736 | #. Cisco LEAP |
2737 | -#: ../js/ui/networkAgent.js:255 ../js/ui/networkAgent.js:267 |
2738 | -#: ../js/ui/networkAgent.js:294 ../js/ui/networkAgent.js:314 |
2739 | -#: ../js/ui/networkAgent.js:324 |
2740 | +#: ../js/ui/networkAgent.js:238 ../js/ui/networkAgent.js:250 |
2741 | +#: ../js/ui/networkAgent.js:277 ../js/ui/networkAgent.js:297 |
2742 | +#: ../js/ui/networkAgent.js:307 |
2743 | msgid "Password: " |
2744 | msgstr "Парола: " |
2745 | |
2746 | #. static WEP |
2747 | -#: ../js/ui/networkAgent.js:260 |
2748 | +#: ../js/ui/networkAgent.js:243 |
2749 | msgid "Key: " |
2750 | msgstr "Ключ: " |
2751 | |
2752 | #. TTLS and PEAP are actually much more complicated, but this complication |
2753 | #. is not visible here since we only care about phase2 authentication |
2754 | #. (and don't even care of which one) |
2755 | -#: ../js/ui/networkAgent.js:292 ../js/ui/networkAgent.js:310 |
2756 | +#: ../js/ui/networkAgent.js:275 ../js/ui/networkAgent.js:293 |
2757 | msgid "Username: " |
2758 | msgstr "Потребител: " |
2759 | |
2760 | -#: ../js/ui/networkAgent.js:298 |
2761 | +#: ../js/ui/networkAgent.js:281 |
2762 | msgid "Identity: " |
2763 | msgstr "Самоличност: " |
2764 | |
2765 | -#: ../js/ui/networkAgent.js:300 |
2766 | +#: ../js/ui/networkAgent.js:283 |
2767 | msgid "Private key password: " |
2768 | msgstr "Парола за частният ключ: " |
2769 | |
2770 | -#: ../js/ui/networkAgent.js:312 |
2771 | +#: ../js/ui/networkAgent.js:295 |
2772 | msgid "Service: " |
2773 | msgstr "Услуга: " |
2774 | |
2775 | -#: ../js/ui/networkAgent.js:341 |
2776 | +#: ../js/ui/networkAgent.js:324 |
2777 | msgid "Authentication required by wireless network" |
2778 | msgstr "Изисква се удостоверяване за безжична мрежа" |
2779 | |
2780 | -#: ../js/ui/networkAgent.js:342 |
2781 | +#: ../js/ui/networkAgent.js:325 |
2782 | #, c-format |
2783 | msgid "" |
2784 | "Passwords or encryption keys are required to access the wireless network " |
2785 | @@ -709,35 +705,35 @@ |
2786 | "За достъп до безжичната мрежа „%s“ са необходими пароли или криптирани " |
2787 | "ключове." |
2788 | |
2789 | -#: ../js/ui/networkAgent.js:346 |
2790 | +#: ../js/ui/networkAgent.js:329 |
2791 | msgid "Wired 802.1X authentication" |
2792 | msgstr "Жична идентификация 802.1Х" |
2793 | |
2794 | -#: ../js/ui/networkAgent.js:348 |
2795 | +#: ../js/ui/networkAgent.js:331 |
2796 | msgid "Network name: " |
2797 | msgstr "Име на мрежата: " |
2798 | |
2799 | -#: ../js/ui/networkAgent.js:353 |
2800 | +#: ../js/ui/networkAgent.js:336 |
2801 | msgid "DSL authentication" |
2802 | msgstr "Удостоверяване за DSL" |
2803 | |
2804 | -#: ../js/ui/networkAgent.js:360 |
2805 | +#: ../js/ui/networkAgent.js:343 |
2806 | msgid "PIN code required" |
2807 | msgstr "Необходим е PIN" |
2808 | |
2809 | -#: ../js/ui/networkAgent.js:361 |
2810 | +#: ../js/ui/networkAgent.js:344 |
2811 | msgid "PIN code is needed for the mobile broadband device" |
2812 | msgstr "Мобилното устройство изисква ПИН" |
2813 | |
2814 | -#: ../js/ui/networkAgent.js:362 |
2815 | +#: ../js/ui/networkAgent.js:345 |
2816 | msgid "PIN: " |
2817 | msgstr "ПИН: " |
2818 | |
2819 | -#: ../js/ui/networkAgent.js:368 |
2820 | +#: ../js/ui/networkAgent.js:351 |
2821 | msgid "Mobile broadband network password" |
2822 | msgstr "Парола за мобилна широколентова връзка" |
2823 | |
2824 | -#: ../js/ui/networkAgent.js:369 |
2825 | +#: ../js/ui/networkAgent.js:352 |
2826 | #, c-format |
2827 | msgid "A password is required to connect to '%s'." |
2828 | msgstr "За свързване към „%s“ се изисква парола." |
2829 | @@ -793,15 +789,15 @@ |
2830 | msgid "PLACES & DEVICES" |
2831 | msgstr "МЕСТА И УСТРОЙСТВА" |
2832 | |
2833 | -#: ../js/ui/polkitAuthenticationAgent.js:72 |
2834 | +#: ../js/ui/polkitAuthenticationAgent.js:73 |
2835 | msgid "Authentication Required" |
2836 | msgstr "Необходимо е удостоверяване" |
2837 | |
2838 | -#: ../js/ui/polkitAuthenticationAgent.js:106 |
2839 | +#: ../js/ui/polkitAuthenticationAgent.js:107 |
2840 | msgid "Administrator" |
2841 | msgstr "Администратор" |
2842 | |
2843 | -#: ../js/ui/polkitAuthenticationAgent.js:175 |
2844 | +#: ../js/ui/polkitAuthenticationAgent.js:177 |
2845 | msgid "Authenticate" |
2846 | msgstr "Удостоверяване" |
2847 | |
2848 | @@ -809,11 +805,11 @@ |
2849 | #. * requested authentication was not gained; this can happen |
2850 | #. * because of an authentication error (like invalid password), |
2851 | #. * for instance. |
2852 | -#: ../js/ui/polkitAuthenticationAgent.js:256 |
2853 | +#: ../js/ui/polkitAuthenticationAgent.js:258 |
2854 | msgid "Sorry, that didn't work. Please try again." |
2855 | msgstr "Действието не беше успешно. Опитайте отново." |
2856 | |
2857 | -#: ../js/ui/polkitAuthenticationAgent.js:268 |
2858 | +#: ../js/ui/polkitAuthenticationAgent.js:270 |
2859 | msgid "Password:" |
2860 | msgstr "Парола:" |
2861 | |
2862 | @@ -826,7 +822,7 @@ |
2863 | msgid "toggle-switch-us" |
2864 | msgstr "toggle-switch-intl" |
2865 | |
2866 | -#: ../js/ui/runDialog.js:208 |
2867 | +#: ../js/ui/runDialog.js:209 |
2868 | msgid "Please enter a command:" |
2869 | msgstr "Въведете команда:" |
2870 | |
2871 | @@ -838,6 +834,22 @@ |
2872 | msgid "No matching results." |
2873 | msgstr "Няма съвпадения." |
2874 | |
2875 | +#: ../js/ui/shellEntry.js:30 |
2876 | +msgid "Copy" |
2877 | +msgstr "Копиране" |
2878 | + |
2879 | +#: ../js/ui/shellEntry.js:35 |
2880 | +msgid "Paste" |
2881 | +msgstr "Поставяне" |
2882 | + |
2883 | +#: ../js/ui/shellEntry.js:81 |
2884 | +msgid "Show Text" |
2885 | +msgstr "Показване на текста" |
2886 | + |
2887 | +#: ../js/ui/shellEntry.js:83 |
2888 | +msgid "Hide Text" |
2889 | +msgstr "Скриване на текста" |
2890 | + |
2891 | #: ../js/ui/shellMountOperation.js:285 |
2892 | msgid "Wrong password, please try again" |
2893 | msgstr "Грешна парола. Опитайте отново." |
2894 | @@ -1494,39 +1506,39 @@ |
2895 | msgid "Unavailable" |
2896 | msgstr "Недостъпно" |
2897 | |
2898 | -#: ../js/ui/userMenu.js:547 ../js/ui/userMenu.js:551 ../js/ui/userMenu.js:621 |
2899 | +#: ../js/ui/userMenu.js:552 ../js/ui/userMenu.js:556 ../js/ui/userMenu.js:626 |
2900 | msgid "Power Off..." |
2901 | msgstr "Изключване..." |
2902 | |
2903 | -#: ../js/ui/userMenu.js:583 |
2904 | +#: ../js/ui/userMenu.js:588 |
2905 | msgid "Notifications" |
2906 | msgstr "Известяване" |
2907 | |
2908 | -#: ../js/ui/userMenu.js:591 |
2909 | +#: ../js/ui/userMenu.js:596 |
2910 | msgid "Online Accounts" |
2911 | msgstr "Мрежови регистрации" |
2912 | |
2913 | -#: ../js/ui/userMenu.js:595 |
2914 | +#: ../js/ui/userMenu.js:600 |
2915 | msgid "System Settings" |
2916 | msgstr "Настройки на системата" |
2917 | |
2918 | -#: ../js/ui/userMenu.js:602 |
2919 | +#: ../js/ui/userMenu.js:607 |
2920 | msgid "Lock Screen" |
2921 | msgstr "Заключване на екрана" |
2922 | |
2923 | -#: ../js/ui/userMenu.js:607 |
2924 | +#: ../js/ui/userMenu.js:612 |
2925 | msgid "Switch User" |
2926 | msgstr "Смяна на потребител" |
2927 | |
2928 | -#: ../js/ui/userMenu.js:612 |
2929 | +#: ../js/ui/userMenu.js:617 |
2930 | msgid "Log Out..." |
2931 | msgstr "Изход…" |
2932 | |
2933 | -#: ../js/ui/userMenu.js:640 |
2934 | +#: ../js/ui/userMenu.js:645 |
2935 | msgid "Your chat status will be set to busy" |
2936 | msgstr "Състоянието ви ще се зададе да е „Зает“" |
2937 | |
2938 | -#: ../js/ui/userMenu.js:641 |
2939 | +#: ../js/ui/userMenu.js:646 |
2940 | msgid "" |
2941 | "Notifications are now disabled, including chat messages. Your online status " |
2942 | "has been adjusted to let others know that you might not see their messages." |
2943 | @@ -1539,11 +1551,11 @@ |
2944 | #. in the search entry when no search is |
2945 | #. active; it should not exceed ~30 |
2946 | #. characters. |
2947 | -#: ../js/ui/viewSelector.js:120 |
2948 | +#: ../js/ui/viewSelector.js:121 |
2949 | msgid "Type to search..." |
2950 | msgstr "Търсене на написаното…" |
2951 | |
2952 | -#: ../js/ui/viewSelector.js:140 ../src/shell-util.c:261 |
2953 | +#: ../js/ui/viewSelector.js:142 ../src/shell-util.c:261 |
2954 | msgid "Search" |
2955 | msgstr "Търсене" |
2956 | |
2957 | @@ -1618,12 +1630,3 @@ |
2958 | #, c-format |
2959 | msgid "%1$s: %2$s" |
2960 | msgstr "%1$s: %2$s" |
2961 | - |
2962 | -#~ msgid "%s has not emitted any errors." |
2963 | -#~ msgstr "Разширение %s не е давало грешки." |
2964 | - |
2965 | -#~ msgid "Hide Errors" |
2966 | -#~ msgstr "Скриване на грешките" |
2967 | - |
2968 | -#~ msgid "Show Errors" |
2969 | -#~ msgstr "Показване на грешките" |
2970 | |
2971 | === modified file 'po/ca.po' |
2972 | --- po/ca.po 2011-10-24 06:43:05 +0000 |
2973 | +++ po/ca.po 2012-01-25 02:33:28 +0000 |
2974 | @@ -8,10 +8,10 @@ |
2975 | msgstr "" |
2976 | "Project-Id-Version: HEAD\n" |
2977 | "Report-Msgid-Bugs-To: \n" |
2978 | -"POT-Creation-Date: 2011-10-04 23:29+0200\n" |
2979 | -"PO-Revision-Date: 2011-10-04 23:30+0200\n" |
2980 | +"POT-Creation-Date: 2011-10-23 23:42+0200\n" |
2981 | +"PO-Revision-Date: 2011-10-23 23:41+0200\n" |
2982 | "Last-Translator: Gil Forcada <gilforcada@guifi.net>\n" |
2983 | -"Language-Team: català; valencià <tradgnome@softcatala.org>\n" |
2984 | +"Language-Team: Catalan <tradgnome@softcatala.org>\n" |
2985 | "Language: ca\n" |
2986 | "MIME-Version: 1.0\n" |
2987 | "Content-Type: text/plain; charset=UTF-8\n" |
2988 | @@ -187,42 +187,42 @@ |
2989 | msgid "disabled OpenSearch providers" |
2990 | msgstr "inhabilita els proveïdors d'OpenSearch" |
2991 | |
2992 | -#: ../js/gdm/loginDialog.js:617 |
2993 | +#: ../js/gdm/loginDialog.js:633 |
2994 | msgid "Session..." |
2995 | msgstr "Sessió..." |
2996 | |
2997 | -#: ../js/gdm/loginDialog.js:785 |
2998 | +#: ../js/gdm/loginDialog.js:804 |
2999 | msgctxt "title" |
3000 | msgid "Sign In" |
3001 | msgstr "Entrada" |
3002 | |
3003 | #. translators: this message is shown below the password entry field |
3004 | #. to indicate the user can swipe their finger instead |
3005 | -#: ../js/gdm/loginDialog.js:830 |
3006 | +#: ../js/gdm/loginDialog.js:849 |
3007 | msgid "(or swipe finger)" |
3008 | msgstr "(o passeu el dit)" |
3009 | |
3010 | -#: ../js/gdm/loginDialog.js:848 |
3011 | +#: ../js/gdm/loginDialog.js:867 |
3012 | msgid "Not listed?" |
3013 | msgstr "No esteu llistat?" |
3014 | |
3015 | -#: ../js/gdm/loginDialog.js:1004 ../js/ui/endSessionDialog.js:426 |
3016 | -#: ../js/ui/extensionSystem.js:477 ../js/ui/networkAgent.js:165 |
3017 | -#: ../js/ui/polkitAuthenticationAgent.js:171 ../js/ui/status/bluetooth.js:480 |
3018 | +#: ../js/gdm/loginDialog.js:1035 ../js/ui/endSessionDialog.js:426 |
3019 | +#: ../js/ui/extensionSystem.js:477 ../js/ui/networkAgent.js:148 |
3020 | +#: ../js/ui/polkitAuthenticationAgent.js:173 ../js/ui/status/bluetooth.js:480 |
3021 | msgid "Cancel" |
3022 | msgstr "Cancel·la" |
3023 | |
3024 | -#: ../js/gdm/loginDialog.js:1009 |
3025 | +#: ../js/gdm/loginDialog.js:1040 |
3026 | msgctxt "button" |
3027 | msgid "Sign In" |
3028 | msgstr "Entra" |
3029 | |
3030 | -#: ../js/gdm/loginDialog.js:1358 |
3031 | +#: ../js/gdm/loginDialog.js:1392 |
3032 | msgid "Login Window" |
3033 | msgstr "Finestra d'entrada" |
3034 | |
3035 | -#: ../js/gdm/powerMenu.js:116 ../js/ui/userMenu.js:514 |
3036 | -#: ../js/ui/userMenu.js:516 ../js/ui/userMenu.js:585 |
3037 | +#: ../js/gdm/powerMenu.js:116 ../js/ui/userMenu.js:554 |
3038 | +#: ../js/ui/userMenu.js:556 ../js/ui/userMenu.js:625 |
3039 | msgid "Suspend" |
3040 | msgstr "Atura temporalment" |
3041 | |
3042 | @@ -445,32 +445,32 @@ |
3043 | msgid "Next week" |
3044 | msgstr "La setmana que ve" |
3045 | |
3046 | -#: ../js/ui/contactDisplay.js:59 ../js/ui/notificationDaemon.js:444 |
3047 | -#: ../js/ui/status/power.js:223 ../src/shell-app.c:355 |
3048 | +#: ../js/ui/contactDisplay.js:65 ../js/ui/notificationDaemon.js:459 |
3049 | +#: ../js/ui/status/power.js:223 ../src/shell-app.c:353 |
3050 | msgid "Unknown" |
3051 | msgstr "Desconegut" |
3052 | |
3053 | -#: ../js/ui/contactDisplay.js:80 ../js/ui/userMenu.js:139 |
3054 | +#: ../js/ui/contactDisplay.js:86 ../js/ui/userMenu.js:139 |
3055 | msgid "Available" |
3056 | msgstr "Disponible" |
3057 | |
3058 | -#: ../js/ui/contactDisplay.js:85 ../js/ui/userMenu.js:148 |
3059 | +#: ../js/ui/contactDisplay.js:91 ../js/ui/userMenu.js:148 |
3060 | msgid "Away" |
3061 | msgstr "Absent" |
3062 | |
3063 | -#: ../js/ui/contactDisplay.js:89 ../js/ui/userMenu.js:142 |
3064 | +#: ../js/ui/contactDisplay.js:95 ../js/ui/userMenu.js:142 |
3065 | msgid "Busy" |
3066 | msgstr "Ocupat" |
3067 | |
3068 | -#: ../js/ui/contactDisplay.js:93 |
3069 | +#: ../js/ui/contactDisplay.js:99 |
3070 | msgid "Offline" |
3071 | msgstr "Fora de línia" |
3072 | |
3073 | -#: ../js/ui/contactDisplay.js:140 |
3074 | +#: ../js/ui/contactDisplay.js:146 |
3075 | msgid "CONTACTS" |
3076 | msgstr "Contactes" |
3077 | |
3078 | -#: ../js/ui/dash.js:172 ../js/ui/messageTray.js:1204 |
3079 | +#: ../js/ui/dash.js:174 ../js/ui/messageTray.js:1206 |
3080 | msgid "Remove" |
3081 | msgstr "Suprimeix" |
3082 | |
3083 | @@ -604,100 +604,96 @@ |
3084 | msgid "Download and install '%s' from extensions.gnome.org?" |
3085 | msgstr "Voleu baixar i instal·lar «%s» de extensions.gnome.org?" |
3086 | |
3087 | -#: ../js/ui/keyboard.js:308 |
3088 | +#: ../js/ui/keyboard.js:325 |
3089 | msgid "tray" |
3090 | msgstr "safata" |
3091 | |
3092 | -#: ../js/ui/keyboard.js:530 ../js/ui/status/power.js:211 |
3093 | +#: ../js/ui/keyboard.js:547 ../js/ui/status/power.js:211 |
3094 | msgid "Keyboard" |
3095 | msgstr "Teclat" |
3096 | |
3097 | -#: ../js/ui/lookingGlass.js:645 |
3098 | +#: ../js/ui/lookingGlass.js:646 |
3099 | msgid "No extensions installed" |
3100 | msgstr "No hi ha cap extensió instal·lada" |
3101 | |
3102 | -#: ../js/ui/lookingGlass.js:691 |
3103 | +#: ../js/ui/lookingGlass.js:692 |
3104 | msgid "Enabled" |
3105 | msgstr "Habilitat" |
3106 | |
3107 | #. translators: |
3108 | #. * The device has been disabled |
3109 | -#: ../js/ui/lookingGlass.js:693 ../src/gvc/gvc-mixer-control.c:1093 |
3110 | +#: ../js/ui/lookingGlass.js:694 ../src/gvc/gvc-mixer-control.c:1093 |
3111 | msgid "Disabled" |
3112 | msgstr "Inhabilitat" |
3113 | |
3114 | -#: ../js/ui/lookingGlass.js:695 |
3115 | +#: ../js/ui/lookingGlass.js:696 |
3116 | msgid "Error" |
3117 | msgstr "Error" |
3118 | |
3119 | -#: ../js/ui/lookingGlass.js:697 |
3120 | +#: ../js/ui/lookingGlass.js:698 |
3121 | msgid "Out of date" |
3122 | msgstr "Fora d'hora" |
3123 | |
3124 | -#: ../js/ui/lookingGlass.js:699 |
3125 | +#: ../js/ui/lookingGlass.js:700 |
3126 | msgid "Downloading" |
3127 | msgstr "S'està baixant" |
3128 | |
3129 | -#: ../js/ui/lookingGlass.js:720 |
3130 | +#: ../js/ui/lookingGlass.js:721 |
3131 | msgid "View Source" |
3132 | msgstr "Mostra el codi font" |
3133 | |
3134 | -#: ../js/ui/lookingGlass.js:726 |
3135 | +#: ../js/ui/lookingGlass.js:727 |
3136 | msgid "Web Page" |
3137 | msgstr "Pàgina web" |
3138 | |
3139 | -#: ../js/ui/messageTray.js:1197 |
3140 | +#: ../js/ui/messageTray.js:1199 |
3141 | msgid "Open" |
3142 | msgstr "Obre" |
3143 | |
3144 | -#: ../js/ui/messageTray.js:2406 |
3145 | +#: ../js/ui/messageTray.js:2408 |
3146 | msgid "System Information" |
3147 | msgstr "Informació de l'ordinador" |
3148 | |
3149 | -#: ../js/ui/networkAgent.js:145 |
3150 | -msgid "Show password" |
3151 | -msgstr "Mostra la contrasenya" |
3152 | - |
3153 | -#: ../js/ui/networkAgent.js:160 |
3154 | +#: ../js/ui/networkAgent.js:143 |
3155 | msgid "Connect" |
3156 | msgstr "Connecta" |
3157 | |
3158 | #. Cisco LEAP |
3159 | -#: ../js/ui/networkAgent.js:255 ../js/ui/networkAgent.js:267 |
3160 | -#: ../js/ui/networkAgent.js:294 ../js/ui/networkAgent.js:314 |
3161 | -#: ../js/ui/networkAgent.js:324 |
3162 | +#: ../js/ui/networkAgent.js:238 ../js/ui/networkAgent.js:250 |
3163 | +#: ../js/ui/networkAgent.js:277 ../js/ui/networkAgent.js:297 |
3164 | +#: ../js/ui/networkAgent.js:307 |
3165 | msgid "Password: " |
3166 | msgstr "Contrasenya:" |
3167 | |
3168 | #. static WEP |
3169 | -#: ../js/ui/networkAgent.js:260 |
3170 | +#: ../js/ui/networkAgent.js:243 |
3171 | msgid "Key: " |
3172 | msgstr "Clau:" |
3173 | |
3174 | #. TTLS and PEAP are actually much more complicated, but this complication |
3175 | #. is not visible here since we only care about phase2 authentication |
3176 | #. (and don't even care of which one) |
3177 | -#: ../js/ui/networkAgent.js:292 ../js/ui/networkAgent.js:310 |
3178 | +#: ../js/ui/networkAgent.js:275 ../js/ui/networkAgent.js:293 |
3179 | msgid "Username: " |
3180 | msgstr "Nom d'usuari:" |
3181 | |
3182 | -#: ../js/ui/networkAgent.js:298 |
3183 | +#: ../js/ui/networkAgent.js:281 |
3184 | msgid "Identity: " |
3185 | msgstr "Identitat:" |
3186 | |
3187 | -#: ../js/ui/networkAgent.js:300 |
3188 | +#: ../js/ui/networkAgent.js:283 |
3189 | msgid "Private key password: " |
3190 | msgstr "Contrasenya de la clau privada:" |
3191 | |
3192 | -#: ../js/ui/networkAgent.js:312 |
3193 | +#: ../js/ui/networkAgent.js:295 |
3194 | msgid "Service: " |
3195 | msgstr "Servei:" |
3196 | |
3197 | -#: ../js/ui/networkAgent.js:341 |
3198 | +#: ../js/ui/networkAgent.js:324 |
3199 | msgid "Authentication required by wireless network" |
3200 | msgstr "La xarxa sense fil requereix autenticació" |
3201 | |
3202 | -#: ../js/ui/networkAgent.js:342 |
3203 | +#: ../js/ui/networkAgent.js:325 |
3204 | #, c-format |
3205 | msgid "" |
3206 | "Passwords or encryption keys are required to access the wireless network " |
3207 | @@ -706,35 +702,35 @@ |
3208 | "Per accedir a la xarxa sense fil «%s» calen les contrasenyes o les claus " |
3209 | "d'encriptació." |
3210 | |
3211 | -#: ../js/ui/networkAgent.js:346 |
3212 | +#: ../js/ui/networkAgent.js:329 |
3213 | msgid "Wired 802.1X authentication" |
3214 | msgstr "Autenticació 802.1X amb fil" |
3215 | |
3216 | -#: ../js/ui/networkAgent.js:348 |
3217 | +#: ../js/ui/networkAgent.js:331 |
3218 | msgid "Network name: " |
3219 | msgstr "Nom de la xarxa: " |
3220 | |
3221 | -#: ../js/ui/networkAgent.js:353 |
3222 | +#: ../js/ui/networkAgent.js:336 |
3223 | msgid "DSL authentication" |
3224 | msgstr "Autenticació DSL" |
3225 | |
3226 | -#: ../js/ui/networkAgent.js:360 |
3227 | +#: ../js/ui/networkAgent.js:343 |
3228 | msgid "PIN code required" |
3229 | msgstr "Cal que introduïu el codi PIN" |
3230 | |
3231 | -#: ../js/ui/networkAgent.js:361 |
3232 | +#: ../js/ui/networkAgent.js:344 |
3233 | msgid "PIN code is needed for the mobile broadband device" |
3234 | msgstr "Cal que introduïu el codi PIN del dispositiu de banda ampla mòbil" |
3235 | |
3236 | -#: ../js/ui/networkAgent.js:362 |
3237 | +#: ../js/ui/networkAgent.js:345 |
3238 | msgid "PIN: " |
3239 | msgstr "PIN: " |
3240 | |
3241 | -#: ../js/ui/networkAgent.js:368 |
3242 | +#: ../js/ui/networkAgent.js:351 |
3243 | msgid "Mobile broadband network password" |
3244 | msgstr "Contrasenya de la xarxa de banda ampla mòbil" |
3245 | |
3246 | -#: ../js/ui/networkAgent.js:369 |
3247 | +#: ../js/ui/networkAgent.js:352 |
3248 | #, c-format |
3249 | msgid "A password is required to connect to '%s'." |
3250 | msgstr "Cal que introduïu una contrasenya per connectar-vos a «%s»." |
3251 | @@ -790,15 +786,15 @@ |
3252 | msgid "PLACES & DEVICES" |
3253 | msgstr "LLOCS I DISPOSITIUS" |
3254 | |
3255 | -#: ../js/ui/polkitAuthenticationAgent.js:72 |
3256 | +#: ../js/ui/polkitAuthenticationAgent.js:73 |
3257 | msgid "Authentication Required" |
3258 | msgstr "Cal autenticació" |
3259 | |
3260 | -#: ../js/ui/polkitAuthenticationAgent.js:106 |
3261 | +#: ../js/ui/polkitAuthenticationAgent.js:107 |
3262 | msgid "Administrator" |
3263 | msgstr "Administrador" |
3264 | |
3265 | -#: ../js/ui/polkitAuthenticationAgent.js:175 |
3266 | +#: ../js/ui/polkitAuthenticationAgent.js:177 |
3267 | msgid "Authenticate" |
3268 | msgstr "Autentica" |
3269 | |
3270 | @@ -806,11 +802,11 @@ |
3271 | #. * requested authentication was not gained; this can happen |
3272 | #. * because of an authentication error (like invalid password), |
3273 | #. * for instance. |
3274 | -#: ../js/ui/polkitAuthenticationAgent.js:256 |
3275 | +#: ../js/ui/polkitAuthenticationAgent.js:258 |
3276 | msgid "Sorry, that didn't work. Please try again." |
3277 | msgstr "No ha funcionat. Torneu-ho a provar." |
3278 | |
3279 | -#: ../js/ui/polkitAuthenticationAgent.js:268 |
3280 | +#: ../js/ui/polkitAuthenticationAgent.js:270 |
3281 | msgid "Password:" |
3282 | msgstr "Contrasenya:" |
3283 | |
3284 | @@ -823,7 +819,7 @@ |
3285 | msgid "toggle-switch-us" |
3286 | msgstr "toggle-switch-intl" |
3287 | |
3288 | -#: ../js/ui/runDialog.js:208 |
3289 | +#: ../js/ui/runDialog.js:209 |
3290 | msgid "Please enter a command:" |
3291 | msgstr "Introduïu una ordre:" |
3292 | |
3293 | @@ -835,6 +831,22 @@ |
3294 | msgid "No matching results." |
3295 | msgstr "No s'ha trobat cap coincidència." |
3296 | |
3297 | +#: ../js/ui/shellEntry.js:30 |
3298 | +msgid "Copy" |
3299 | +msgstr "Copia" |
3300 | + |
3301 | +#: ../js/ui/shellEntry.js:35 |
3302 | +msgid "Paste" |
3303 | +msgstr "Enganxa" |
3304 | + |
3305 | +#: ../js/ui/shellEntry.js:81 |
3306 | +msgid "Show Text" |
3307 | +msgstr "Mostra el text" |
3308 | + |
3309 | +#: ../js/ui/shellEntry.js:83 |
3310 | +msgid "Hide Text" |
3311 | +msgstr "Oculta el text" |
3312 | + |
3313 | #: ../js/ui/shellMountOperation.js:285 |
3314 | msgid "Wrong password, please try again" |
3315 | msgstr "La contrasenya és errònia, torneu-ho a intentar" |
3316 | @@ -968,7 +980,7 @@ |
3317 | msgid "Grant this time only" |
3318 | msgstr "Permet-ho només ara" |
3319 | |
3320 | -#: ../js/ui/status/bluetooth.js:392 ../js/ui/telepathyClient.js:1200 |
3321 | +#: ../js/ui/status/bluetooth.js:392 ../js/ui/telepathyClient.js:1204 |
3322 | msgid "Reject" |
3323 | msgstr "Rebutja" |
3324 | |
3325 | @@ -1254,22 +1266,22 @@ |
3326 | msgid "Connection error" |
3327 | msgstr "S'ha produït un error de connexió" |
3328 | |
3329 | -#: ../js/ui/telepathyClient.js:737 |
3330 | +#: ../js/ui/telepathyClient.js:741 |
3331 | #, c-format |
3332 | msgid "%s is online." |
3333 | msgstr "%s és en línia." |
3334 | |
3335 | -#: ../js/ui/telepathyClient.js:742 |
3336 | +#: ../js/ui/telepathyClient.js:746 |
3337 | #, c-format |
3338 | msgid "%s is offline." |
3339 | msgstr "%s no hi és." |
3340 | |
3341 | -#: ../js/ui/telepathyClient.js:745 |
3342 | +#: ../js/ui/telepathyClient.js:749 |
3343 | #, c-format |
3344 | msgid "%s is away." |
3345 | msgstr "%s és lluny." |
3346 | |
3347 | -#: ../js/ui/telepathyClient.js:748 |
3348 | +#: ../js/ui/telepathyClient.js:752 |
3349 | #, c-format |
3350 | msgid "%s is busy." |
3351 | msgstr "%s està ocupat." |
3352 | @@ -1277,35 +1289,35 @@ |
3353 | #. Translators: this is a time format string followed by a date. |
3354 | #. If applicable, replace %X with a strftime format valid for your |
3355 | #. locale, without seconds. |
3356 | -#: ../js/ui/telepathyClient.js:982 |
3357 | +#: ../js/ui/telepathyClient.js:986 |
3358 | #, no-c-format |
3359 | msgid "Sent at <b>%X</b> on <b>%A</b>" |
3360 | msgstr "Enviat a les <b>%X</b> del <b>%A</b>" |
3361 | |
3362 | #. Translators: this is a time format in the style of "Wednesday, May 25", |
3363 | #. shown when you get a chat message in the same year. |
3364 | -#: ../js/ui/telepathyClient.js:988 |
3365 | +#: ../js/ui/telepathyClient.js:992 |
3366 | #, no-c-format |
3367 | msgid "Sent on <b>%A</b>, <b>%B %d</b>" |
3368 | msgstr "Enviat el <b>%A %d de %B</b>" |
3369 | |
3370 | #. Translators: this is a time format in the style of "Wednesday, May 25, 2012", |
3371 | #. shown when you get a chat message in a different year. |
3372 | -#: ../js/ui/telepathyClient.js:993 |
3373 | +#: ../js/ui/telepathyClient.js:997 |
3374 | #, no-c-format |
3375 | msgid "Sent on <b>%A</b>, <b>%B %d</b>, %Y" |
3376 | msgstr "Enviat el <b>%A %d de %B</b> de %Y" |
3377 | |
3378 | #. Translators: this is the other person changing their old IM name to their new |
3379 | #. IM name. |
3380 | -#: ../js/ui/telepathyClient.js:1035 |
3381 | +#: ../js/ui/telepathyClient.js:1039 |
3382 | #, c-format |
3383 | msgid "%s is now known as %s" |
3384 | msgstr "En/na %s ara es diu %s" |
3385 | |
3386 | #. translators: argument is a room name like |
3387 | #. * room@jabber.org for example. |
3388 | -#: ../js/ui/telepathyClient.js:1144 |
3389 | +#: ../js/ui/telepathyClient.js:1148 |
3390 | #, c-format |
3391 | msgid "Invitation to %s" |
3392 | msgstr "Us han convidat a entrar a %s" |
3393 | @@ -1313,34 +1325,35 @@ |
3394 | #. translators: first argument is the name of a contact and the second |
3395 | #. * one the name of a room. "Alice is inviting you to join room@jabber.org |
3396 | #. * for example. |
3397 | -#: ../js/ui/telepathyClient.js:1152 |
3398 | +#: ../js/ui/telepathyClient.js:1156 |
3399 | #, c-format |
3400 | msgid "%s is inviting you to join %s" |
3401 | msgstr "En/na %s us convida a entrar a %s" |
3402 | |
3403 | -#: ../js/ui/telepathyClient.js:1154 ../js/ui/telepathyClient.js:1243 |
3404 | -#: ../js/ui/telepathyClient.js:1347 |
3405 | +#: ../js/ui/telepathyClient.js:1158 ../js/ui/telepathyClient.js:1248 |
3406 | +#: ../js/ui/telepathyClient.js:1352 |
3407 | msgid "Decline" |
3408 | msgstr "Declina" |
3409 | |
3410 | -#: ../js/ui/telepathyClient.js:1155 ../js/ui/telepathyClient.js:1244 |
3411 | -#: ../js/ui/telepathyClient.js:1348 |
3412 | +#: ../js/ui/telepathyClient.js:1159 ../js/ui/telepathyClient.js:1249 |
3413 | +#: ../js/ui/telepathyClient.js:1353 |
3414 | msgid "Accept" |
3415 | msgstr "Accepta" |
3416 | |
3417 | #. translators: argument is a contact name like Alice for example. |
3418 | -#: ../js/ui/telepathyClient.js:1188 |
3419 | +#: ../js/ui/telepathyClient.js:1192 |
3420 | #, c-format |
3421 | msgid "Video call from %s" |
3422 | msgstr "Videotrucada de %s" |
3423 | |
3424 | #. translators: argument is a contact name like Alice for example. |
3425 | -#: ../js/ui/telepathyClient.js:1191 |
3426 | +#: ../js/ui/telepathyClient.js:1195 |
3427 | #, c-format |
3428 | msgid "Call from %s" |
3429 | msgstr "Trucada de %s" |
3430 | |
3431 | -#: ../js/ui/telepathyClient.js:1201 |
3432 | +#. translators: this is a button label (verb), not a noun |
3433 | +#: ../js/ui/telepathyClient.js:1206 |
3434 | msgid "Answer" |
3435 | msgstr "Contesta" |
3436 | |
3437 | @@ -1349,112 +1362,112 @@ |
3438 | #. * file name. The string will be something |
3439 | #. * like: "Alice is sending you test.ogg" |
3440 | #. |
3441 | -#: ../js/ui/telepathyClient.js:1237 |
3442 | +#: ../js/ui/telepathyClient.js:1242 |
3443 | #, c-format |
3444 | msgid "%s is sending you %s" |
3445 | msgstr "En/na %s us envia %s" |
3446 | |
3447 | #. To translators: The parameter is the contact's alias |
3448 | -#: ../js/ui/telepathyClient.js:1312 |
3449 | +#: ../js/ui/telepathyClient.js:1317 |
3450 | #, c-format |
3451 | msgid "%s would like permission to see when you are online" |
3452 | msgstr "%s vol poder saber quan esteu en línia" |
3453 | |
3454 | -#: ../js/ui/telepathyClient.js:1410 |
3455 | +#: ../js/ui/telepathyClient.js:1415 |
3456 | msgid "Network error" |
3457 | msgstr "Error de la xarxa" |
3458 | |
3459 | -#: ../js/ui/telepathyClient.js:1412 |
3460 | +#: ../js/ui/telepathyClient.js:1417 |
3461 | msgid "Authentication failed" |
3462 | msgstr "Ha fallat l'autenticació" |
3463 | |
3464 | -#: ../js/ui/telepathyClient.js:1414 |
3465 | +#: ../js/ui/telepathyClient.js:1419 |
3466 | msgid "Encryption error" |
3467 | msgstr "Error d'encriptació" |
3468 | |
3469 | -#: ../js/ui/telepathyClient.js:1416 |
3470 | +#: ../js/ui/telepathyClient.js:1421 |
3471 | msgid "Certificate not provided" |
3472 | msgstr "No s'ha proporcionat el certificat" |
3473 | |
3474 | -#: ../js/ui/telepathyClient.js:1418 |
3475 | +#: ../js/ui/telepathyClient.js:1423 |
3476 | msgid "Certificate untrusted" |
3477 | msgstr "El certificat no és de confiança" |
3478 | |
3479 | -#: ../js/ui/telepathyClient.js:1420 |
3480 | +#: ../js/ui/telepathyClient.js:1425 |
3481 | msgid "Certificate expired" |
3482 | msgstr "El certificat ha vençut" |
3483 | |
3484 | -#: ../js/ui/telepathyClient.js:1422 |
3485 | +#: ../js/ui/telepathyClient.js:1427 |
3486 | msgid "Certificate not activated" |
3487 | msgstr "El certificat no està activat" |
3488 | |
3489 | -#: ../js/ui/telepathyClient.js:1424 |
3490 | +#: ../js/ui/telepathyClient.js:1429 |
3491 | msgid "Certificate hostname mismatch" |
3492 | msgstr "No coincideix el nom de la màquina del certificat" |
3493 | |
3494 | -#: ../js/ui/telepathyClient.js:1426 |
3495 | +#: ../js/ui/telepathyClient.js:1431 |
3496 | msgid "Certificate fingerprint mismatch" |
3497 | msgstr "No coincideix l'empremta digital del certificat" |
3498 | |
3499 | -#: ../js/ui/telepathyClient.js:1428 |
3500 | +#: ../js/ui/telepathyClient.js:1433 |
3501 | msgid "Certificate self-signed" |
3502 | msgstr "Certificat signat per un mateix" |
3503 | |
3504 | -#: ../js/ui/telepathyClient.js:1430 |
3505 | +#: ../js/ui/telepathyClient.js:1435 |
3506 | msgid "Status is set to offline" |
3507 | msgstr "S'ha establert l'estat a fora de línia" |
3508 | |
3509 | -#: ../js/ui/telepathyClient.js:1432 |
3510 | +#: ../js/ui/telepathyClient.js:1437 |
3511 | msgid "Encryption is not available" |
3512 | msgstr "L'encriptació no està disponible" |
3513 | |
3514 | -#: ../js/ui/telepathyClient.js:1434 |
3515 | +#: ../js/ui/telepathyClient.js:1439 |
3516 | msgid "Certificate is invalid" |
3517 | msgstr "El certificat no és vàlid" |
3518 | |
3519 | -#: ../js/ui/telepathyClient.js:1436 |
3520 | +#: ../js/ui/telepathyClient.js:1441 |
3521 | msgid "Connection has been refused" |
3522 | msgstr "S'ha rebutjat la connexió" |
3523 | |
3524 | -#: ../js/ui/telepathyClient.js:1438 |
3525 | +#: ../js/ui/telepathyClient.js:1443 |
3526 | msgid "Connection can't be established" |
3527 | msgstr "No es pot establir la connexió" |
3528 | |
3529 | -#: ../js/ui/telepathyClient.js:1440 |
3530 | +#: ../js/ui/telepathyClient.js:1445 |
3531 | msgid "Connection has been lost" |
3532 | msgstr "S'ha perdut la connexió" |
3533 | |
3534 | -#: ../js/ui/telepathyClient.js:1442 |
3535 | +#: ../js/ui/telepathyClient.js:1447 |
3536 | msgid "This resource is already connected to the server" |
3537 | msgstr "Aquest recurs ja està connectat al servidor" |
3538 | |
3539 | -#: ../js/ui/telepathyClient.js:1444 |
3540 | +#: ../js/ui/telepathyClient.js:1449 |
3541 | msgid "" |
3542 | "Connection has been replaced by a new connection using the same resource" |
3543 | msgstr "" |
3544 | "S'ha reemplaçat la connexió per una altra de nova fent servir el mateix " |
3545 | "recurs" |
3546 | |
3547 | -#: ../js/ui/telepathyClient.js:1446 |
3548 | +#: ../js/ui/telepathyClient.js:1451 |
3549 | msgid "The account already exists on the server" |
3550 | msgstr "Ja existeix aquest compte al servidor" |
3551 | |
3552 | -#: ../js/ui/telepathyClient.js:1448 |
3553 | +#: ../js/ui/telepathyClient.js:1453 |
3554 | msgid "Server is currently too busy to handle the connection" |
3555 | msgstr "El servidor està massa ocupat per gestionar la connexió" |
3556 | |
3557 | -#: ../js/ui/telepathyClient.js:1450 |
3558 | +#: ../js/ui/telepathyClient.js:1455 |
3559 | msgid "Certificate has been revoked" |
3560 | msgstr "S'ha revocat el certificat" |
3561 | |
3562 | -#: ../js/ui/telepathyClient.js:1452 |
3563 | +#: ../js/ui/telepathyClient.js:1457 |
3564 | msgid "" |
3565 | "Certificate uses an insecure cipher algorithm or is cryptographically weak" |
3566 | msgstr "" |
3567 | "El certificat utilitza un algorisme criptògraf no segur o la seva fortalesa " |
3568 | "criptogràfica és feble" |
3569 | |
3570 | -#: ../js/ui/telepathyClient.js:1454 |
3571 | +#: ../js/ui/telepathyClient.js:1459 |
3572 | msgid "" |
3573 | "The length of the server certificate, or the depth of the server certificate " |
3574 | "chain, exceed the limits imposed by the cryptography library" |
3575 | @@ -1464,20 +1477,20 @@ |
3576 | |
3577 | #. translators: argument is the account name, like |
3578 | #. * name@jabber.org for example. |
3579 | -#: ../js/ui/telepathyClient.js:1463 |
3580 | +#: ../js/ui/telepathyClient.js:1468 |
3581 | #, c-format |
3582 | msgid "Connection to %s failed" |
3583 | msgstr "Ha fallat la connexió a %s" |
3584 | |
3585 | -#: ../js/ui/telepathyClient.js:1472 |
3586 | +#: ../js/ui/telepathyClient.js:1477 |
3587 | msgid "Reconnect" |
3588 | msgstr "Torna a connectar" |
3589 | |
3590 | -#: ../js/ui/telepathyClient.js:1473 |
3591 | +#: ../js/ui/telepathyClient.js:1478 |
3592 | msgid "Edit account" |
3593 | msgstr "Edita el compte" |
3594 | |
3595 | -#: ../js/ui/telepathyClient.js:1519 |
3596 | +#: ../js/ui/telepathyClient.js:1524 |
3597 | msgid "Unknown reason" |
3598 | msgstr "Motiu desconegut" |
3599 | |
3600 | @@ -1493,39 +1506,39 @@ |
3601 | msgid "Unavailable" |
3602 | msgstr "No disponible" |
3603 | |
3604 | -#: ../js/ui/userMenu.js:512 ../js/ui/userMenu.js:516 ../js/ui/userMenu.js:586 |
3605 | +#: ../js/ui/userMenu.js:552 ../js/ui/userMenu.js:556 ../js/ui/userMenu.js:626 |
3606 | msgid "Power Off..." |
3607 | msgstr "Apaga..." |
3608 | |
3609 | -#: ../js/ui/userMenu.js:548 |
3610 | +#: ../js/ui/userMenu.js:588 |
3611 | msgid "Notifications" |
3612 | msgstr "Notificacions" |
3613 | |
3614 | -#: ../js/ui/userMenu.js:556 |
3615 | +#: ../js/ui/userMenu.js:596 |
3616 | msgid "Online Accounts" |
3617 | msgstr "Comptes en línia" |
3618 | |
3619 | -#: ../js/ui/userMenu.js:560 |
3620 | +#: ../js/ui/userMenu.js:600 |
3621 | msgid "System Settings" |
3622 | msgstr "Paràmetres de l'ordinador" |
3623 | |
3624 | -#: ../js/ui/userMenu.js:567 |
3625 | +#: ../js/ui/userMenu.js:607 |
3626 | msgid "Lock Screen" |
3627 | msgstr "Bloca la pantalla" |
3628 | |
3629 | -#: ../js/ui/userMenu.js:572 |
3630 | +#: ../js/ui/userMenu.js:612 |
3631 | msgid "Switch User" |
3632 | msgstr "Canvia d'usuari" |
3633 | |
3634 | -#: ../js/ui/userMenu.js:577 |
3635 | +#: ../js/ui/userMenu.js:617 |
3636 | msgid "Log Out..." |
3637 | msgstr "Surt..." |
3638 | |
3639 | -#: ../js/ui/userMenu.js:605 |
3640 | +#: ../js/ui/userMenu.js:645 |
3641 | msgid "Your chat status will be set to busy" |
3642 | msgstr "L'estat del xat s'establirà a ocupat" |
3643 | |
3644 | -#: ../js/ui/userMenu.js:606 |
3645 | +#: ../js/ui/userMenu.js:646 |
3646 | msgid "" |
3647 | "Notifications are now disabled, including chat messages. Your online status " |
3648 | "has been adjusted to let others know that you might not see their messages." |
3649 | @@ -1538,11 +1551,11 @@ |
3650 | #. in the search entry when no search is |
3651 | #. active; it should not exceed ~30 |
3652 | #. characters. |
3653 | -#: ../js/ui/viewSelector.js:120 |
3654 | +#: ../js/ui/viewSelector.js:121 |
3655 | msgid "Type to search..." |
3656 | msgstr "Teclegeu per cercar..." |
3657 | |
3658 | -#: ../js/ui/viewSelector.js:140 ../src/shell-util.c:261 |
3659 | +#: ../js/ui/viewSelector.js:142 ../src/shell-util.c:261 |
3660 | msgid "Search" |
3661 | msgstr "Cerca" |
3662 | |
3663 | @@ -1581,7 +1594,7 @@ |
3664 | msgid "Mode used by GDM for login screen" |
3665 | msgstr "El mode que utilitzarà el GDM per a la pantalla d'entrada" |
3666 | |
3667 | -#: ../src/shell-app.c:581 |
3668 | +#: ../src/shell-app.c:579 |
3669 | #, c-format |
3670 | msgid "Failed to launch '%s'" |
3671 | msgstr "No s'ha pogut iniciar «%s»" |
3672 | @@ -1618,6 +1631,9 @@ |
3673 | msgid "%1$s: %2$s" |
3674 | msgstr "%1$s: %2$s" |
3675 | |
3676 | +#~ msgid "Show password" |
3677 | +#~ msgstr "Mostra la contrasenya" |
3678 | + |
3679 | #~ msgid "%s has not emitted any errors." |
3680 | #~ msgstr "%s no ha emès cap error." |
3681 | |
3682 | |
3683 | === modified file 'po/ca@valencia.po' |
3684 | --- po/ca@valencia.po 2011-10-24 06:43:05 +0000 |
3685 | +++ po/ca@valencia.po 2012-01-25 02:33:28 +0000 |
3686 | @@ -8,10 +8,10 @@ |
3687 | msgstr "" |
3688 | "Project-Id-Version: HEAD\n" |
3689 | "Report-Msgid-Bugs-To: \n" |
3690 | -"POT-Creation-Date: 2011-10-01 16:04+0200\n" |
3691 | -"PO-Revision-Date: 2011-10-01 16:03+0200\n" |
3692 | +"POT-Creation-Date: 2011-10-23 23:43+0200\n" |
3693 | +"PO-Revision-Date: 2011-10-23 23:41+0200\n" |
3694 | "Last-Translator: Gil Forcada <gilforcada@guifi.net>\n" |
3695 | -"Language-Team: català; valencià <tradgnome@softcatala.org>\n" |
3696 | +"Language-Team: Catalan <tradgnome@softcatala.org>\n" |
3697 | "Language: ca-XV\n" |
3698 | "MIME-Version: 1.0\n" |
3699 | "Content-Type: text/plain; charset=UTF-8\n" |
3700 | @@ -187,42 +187,42 @@ |
3701 | msgid "disabled OpenSearch providers" |
3702 | msgstr "inhabilita els proveïdors d'OpenSearch" |
3703 | |
3704 | -#: ../js/gdm/loginDialog.js:617 |
3705 | +#: ../js/gdm/loginDialog.js:633 |
3706 | msgid "Session..." |
3707 | msgstr "Sessió..." |
3708 | |
3709 | -#: ../js/gdm/loginDialog.js:785 |
3710 | +#: ../js/gdm/loginDialog.js:804 |
3711 | msgctxt "title" |
3712 | msgid "Sign In" |
3713 | msgstr "Entrada" |
3714 | |
3715 | #. translators: this message is shown below the password entry field |
3716 | #. to indicate the user can swipe their finger instead |
3717 | -#: ../js/gdm/loginDialog.js:830 |
3718 | +#: ../js/gdm/loginDialog.js:849 |
3719 | msgid "(or swipe finger)" |
3720 | msgstr "(o passeu el dit)" |
3721 | |
3722 | -#: ../js/gdm/loginDialog.js:848 |
3723 | +#: ../js/gdm/loginDialog.js:867 |
3724 | msgid "Not listed?" |
3725 | msgstr "No esteu llistat?" |
3726 | |
3727 | -#: ../js/gdm/loginDialog.js:1004 ../js/ui/endSessionDialog.js:426 |
3728 | -#: ../js/ui/extensionSystem.js:477 ../js/ui/networkAgent.js:165 |
3729 | -#: ../js/ui/polkitAuthenticationAgent.js:171 ../js/ui/status/bluetooth.js:480 |
3730 | +#: ../js/gdm/loginDialog.js:1035 ../js/ui/endSessionDialog.js:426 |
3731 | +#: ../js/ui/extensionSystem.js:477 ../js/ui/networkAgent.js:148 |
3732 | +#: ../js/ui/polkitAuthenticationAgent.js:173 ../js/ui/status/bluetooth.js:480 |
3733 | msgid "Cancel" |
3734 | msgstr "Cancel·la" |
3735 | |
3736 | -#: ../js/gdm/loginDialog.js:1009 |
3737 | +#: ../js/gdm/loginDialog.js:1040 |
3738 | msgctxt "button" |
3739 | msgid "Sign In" |
3740 | msgstr "Entra" |
3741 | |
3742 | -#: ../js/gdm/loginDialog.js:1358 |
3743 | +#: ../js/gdm/loginDialog.js:1392 |
3744 | msgid "Login Window" |
3745 | msgstr "Finestra d'entrada" |
3746 | |
3747 | -#: ../js/gdm/powerMenu.js:116 ../js/ui/userMenu.js:514 |
3748 | -#: ../js/ui/userMenu.js:516 ../js/ui/userMenu.js:585 |
3749 | +#: ../js/gdm/powerMenu.js:116 ../js/ui/userMenu.js:554 |
3750 | +#: ../js/ui/userMenu.js:556 ../js/ui/userMenu.js:625 |
3751 | msgid "Suspend" |
3752 | msgstr "Atura temporalment" |
3753 | |
3754 | @@ -445,32 +445,32 @@ |
3755 | msgid "Next week" |
3756 | msgstr "La setmana que ve" |
3757 | |
3758 | -#: ../js/ui/contactDisplay.js:59 ../js/ui/notificationDaemon.js:444 |
3759 | -#: ../js/ui/status/power.js:223 ../src/shell-app.c:355 |
3760 | +#: ../js/ui/contactDisplay.js:65 ../js/ui/notificationDaemon.js:459 |
3761 | +#: ../js/ui/status/power.js:223 ../src/shell-app.c:353 |
3762 | msgid "Unknown" |
3763 | msgstr "Desconegut" |
3764 | |
3765 | -#: ../js/ui/contactDisplay.js:80 ../js/ui/userMenu.js:139 |
3766 | +#: ../js/ui/contactDisplay.js:86 ../js/ui/userMenu.js:139 |
3767 | msgid "Available" |
3768 | msgstr "Disponible" |
3769 | |
3770 | -#: ../js/ui/contactDisplay.js:85 ../js/ui/userMenu.js:148 |
3771 | +#: ../js/ui/contactDisplay.js:91 ../js/ui/userMenu.js:148 |
3772 | msgid "Away" |
3773 | msgstr "Absent" |
3774 | |
3775 | -#: ../js/ui/contactDisplay.js:89 ../js/ui/userMenu.js:142 |
3776 | +#: ../js/ui/contactDisplay.js:95 ../js/ui/userMenu.js:142 |
3777 | msgid "Busy" |
3778 | msgstr "Ocupat" |
3779 | |
3780 | -#: ../js/ui/contactDisplay.js:93 |
3781 | +#: ../js/ui/contactDisplay.js:99 |
3782 | msgid "Offline" |
3783 | msgstr "Fora de línia" |
3784 | |
3785 | -#: ../js/ui/contactDisplay.js:140 |
3786 | +#: ../js/ui/contactDisplay.js:146 |
3787 | msgid "CONTACTS" |
3788 | msgstr "Contactes" |
3789 | |
3790 | -#: ../js/ui/dash.js:172 ../js/ui/messageTray.js:1204 |
3791 | +#: ../js/ui/dash.js:174 ../js/ui/messageTray.js:1206 |
3792 | msgid "Remove" |
3793 | msgstr "Suprimeix" |
3794 | |
3795 | @@ -604,110 +604,96 @@ |
3796 | msgid "Download and install '%s' from extensions.gnome.org?" |
3797 | msgstr "Voleu baixar i instal·lar «%s» d'extensions.gnome.org?" |
3798 | |
3799 | -#: ../js/ui/keyboard.js:529 ../js/ui/status/power.js:211 |
3800 | +#: ../js/ui/keyboard.js:325 |
3801 | +msgid "tray" |
3802 | +msgstr "safata" |
3803 | + |
3804 | +#: ../js/ui/keyboard.js:547 ../js/ui/status/power.js:211 |
3805 | msgid "Keyboard" |
3806 | msgstr "Teclat" |
3807 | |
3808 | -#: ../js/ui/lookingGlass.js:645 |
3809 | +#: ../js/ui/lookingGlass.js:646 |
3810 | msgid "No extensions installed" |
3811 | msgstr "No hi ha cap extensió instal·lada" |
3812 | |
3813 | -#. Translators: argument is an extension UUID. |
3814 | -#: ../js/ui/lookingGlass.js:700 |
3815 | -#, c-format |
3816 | -msgid "%s has not emitted any errors." |
3817 | -msgstr "%s no ha emés cap error." |
3818 | - |
3819 | -#: ../js/ui/lookingGlass.js:706 |
3820 | -msgid "Hide Errors" |
3821 | -msgstr "Amaga els errors" |
3822 | - |
3823 | -#: ../js/ui/lookingGlass.js:710 ../js/ui/lookingGlass.js:760 |
3824 | -msgid "Show Errors" |
3825 | -msgstr "Mostra els errors" |
3826 | - |
3827 | -#: ../js/ui/lookingGlass.js:719 |
3828 | +#: ../js/ui/lookingGlass.js:692 |
3829 | msgid "Enabled" |
3830 | msgstr "Habilitat" |
3831 | |
3832 | #. translators: |
3833 | #. * The device has been disabled |
3834 | -#: ../js/ui/lookingGlass.js:721 ../src/gvc/gvc-mixer-control.c:1093 |
3835 | +#: ../js/ui/lookingGlass.js:694 ../src/gvc/gvc-mixer-control.c:1093 |
3836 | msgid "Disabled" |
3837 | msgstr "Inhabilitat" |
3838 | |
3839 | -#: ../js/ui/lookingGlass.js:723 |
3840 | +#: ../js/ui/lookingGlass.js:696 |
3841 | msgid "Error" |
3842 | msgstr "Error" |
3843 | |
3844 | -#: ../js/ui/lookingGlass.js:725 |
3845 | +#: ../js/ui/lookingGlass.js:698 |
3846 | msgid "Out of date" |
3847 | msgstr "Fora d'hora" |
3848 | |
3849 | -#: ../js/ui/lookingGlass.js:727 |
3850 | +#: ../js/ui/lookingGlass.js:700 |
3851 | msgid "Downloading" |
3852 | msgstr "S'està baixant" |
3853 | |
3854 | -#: ../js/ui/lookingGlass.js:748 |
3855 | +#: ../js/ui/lookingGlass.js:721 |
3856 | msgid "View Source" |
3857 | msgstr "Mostra el codi font" |
3858 | |
3859 | -#: ../js/ui/lookingGlass.js:754 |
3860 | +#: ../js/ui/lookingGlass.js:727 |
3861 | msgid "Web Page" |
3862 | msgstr "Pàgina web" |
3863 | |
3864 | -#: ../js/ui/messageTray.js:1197 |
3865 | +#: ../js/ui/messageTray.js:1199 |
3866 | msgid "Open" |
3867 | msgstr "Obri" |
3868 | |
3869 | -#: ../js/ui/messageTray.js:2406 |
3870 | +#: ../js/ui/messageTray.js:2408 |
3871 | msgid "System Information" |
3872 | msgstr "Informació de l'ordinador" |
3873 | |
3874 | -#: ../js/ui/networkAgent.js:145 |
3875 | -msgid "Show password" |
3876 | -msgstr "Mostra la contrasenya" |
3877 | - |
3878 | -#: ../js/ui/networkAgent.js:160 |
3879 | +#: ../js/ui/networkAgent.js:143 |
3880 | msgid "Connect" |
3881 | msgstr "Connecta" |
3882 | |
3883 | #. Cisco LEAP |
3884 | -#: ../js/ui/networkAgent.js:255 ../js/ui/networkAgent.js:267 |
3885 | -#: ../js/ui/networkAgent.js:294 ../js/ui/networkAgent.js:314 |
3886 | -#: ../js/ui/networkAgent.js:324 |
3887 | +#: ../js/ui/networkAgent.js:238 ../js/ui/networkAgent.js:250 |
3888 | +#: ../js/ui/networkAgent.js:277 ../js/ui/networkAgent.js:297 |
3889 | +#: ../js/ui/networkAgent.js:307 |
3890 | msgid "Password: " |
3891 | msgstr "Contrasenya:" |
3892 | |
3893 | #. static WEP |
3894 | -#: ../js/ui/networkAgent.js:260 |
3895 | +#: ../js/ui/networkAgent.js:243 |
3896 | msgid "Key: " |
3897 | msgstr "Clau:" |
3898 | |
3899 | #. TTLS and PEAP are actually much more complicated, but this complication |
3900 | #. is not visible here since we only care about phase2 authentication |
3901 | #. (and don't even care of which one) |
3902 | -#: ../js/ui/networkAgent.js:292 ../js/ui/networkAgent.js:310 |
3903 | +#: ../js/ui/networkAgent.js:275 ../js/ui/networkAgent.js:293 |
3904 | msgid "Username: " |
3905 | msgstr "Nom d'usuari:" |
3906 | |
3907 | -#: ../js/ui/networkAgent.js:298 |
3908 | +#: ../js/ui/networkAgent.js:281 |
3909 | msgid "Identity: " |
3910 | msgstr "Identitat:" |
3911 | |
3912 | -#: ../js/ui/networkAgent.js:300 |
3913 | +#: ../js/ui/networkAgent.js:283 |
3914 | msgid "Private key password: " |
3915 | msgstr "Contrasenya de la clau privada:" |
3916 | |
3917 | -#: ../js/ui/networkAgent.js:312 |
3918 | +#: ../js/ui/networkAgent.js:295 |
3919 | msgid "Service: " |
3920 | msgstr "Servei:" |
3921 | |
3922 | -#: ../js/ui/networkAgent.js:341 |
3923 | +#: ../js/ui/networkAgent.js:324 |
3924 | msgid "Authentication required by wireless network" |
3925 | msgstr "La xarxa sense fil requereix autenticació" |
3926 | |
3927 | -#: ../js/ui/networkAgent.js:342 |
3928 | +#: ../js/ui/networkAgent.js:325 |
3929 | #, c-format |
3930 | msgid "" |
3931 | "Passwords or encryption keys are required to access the wireless network " |
3932 | @@ -716,35 +702,35 @@ |
3933 | "Per accedir a la xarxa sense fil «%s» calen les contrasenyes o les claus " |
3934 | "d'encriptació." |
3935 | |
3936 | -#: ../js/ui/networkAgent.js:346 |
3937 | +#: ../js/ui/networkAgent.js:329 |
3938 | msgid "Wired 802.1X authentication" |
3939 | msgstr "Autenticació 802.1X amb fil" |
3940 | |
3941 | -#: ../js/ui/networkAgent.js:348 |
3942 | +#: ../js/ui/networkAgent.js:331 |
3943 | msgid "Network name: " |
3944 | msgstr "Nom de la xarxa: " |
3945 | |
3946 | -#: ../js/ui/networkAgent.js:353 |
3947 | +#: ../js/ui/networkAgent.js:336 |
3948 | msgid "DSL authentication" |
3949 | msgstr "Autenticació DSL" |
3950 | |
3951 | -#: ../js/ui/networkAgent.js:360 |
3952 | +#: ../js/ui/networkAgent.js:343 |
3953 | msgid "PIN code required" |
3954 | msgstr "Cal que introduïu el codi PIN" |
3955 | |
3956 | -#: ../js/ui/networkAgent.js:361 |
3957 | +#: ../js/ui/networkAgent.js:344 |
3958 | msgid "PIN code is needed for the mobile broadband device" |
3959 | msgstr "Cal que introduïu el codi PIN del dispositiu de banda ampla mòbil" |
3960 | |
3961 | -#: ../js/ui/networkAgent.js:362 |
3962 | +#: ../js/ui/networkAgent.js:345 |
3963 | msgid "PIN: " |
3964 | msgstr "PIN: " |
3965 | |
3966 | -#: ../js/ui/networkAgent.js:368 |
3967 | +#: ../js/ui/networkAgent.js:351 |
3968 | msgid "Mobile broadband network password" |
3969 | msgstr "Contrasenya de la xarxa de banda ampla mòbil" |
3970 | |
3971 | -#: ../js/ui/networkAgent.js:369 |
3972 | +#: ../js/ui/networkAgent.js:352 |
3973 | #, c-format |
3974 | msgid "A password is required to connect to '%s'." |
3975 | msgstr "Cal que introduïu una contrasenya per connectar-vos a «%s»." |
3976 | @@ -800,15 +786,15 @@ |
3977 | msgid "PLACES & DEVICES" |
3978 | msgstr "LLOCS I DISPOSITIUS" |
3979 | |
3980 | -#: ../js/ui/polkitAuthenticationAgent.js:72 |
3981 | +#: ../js/ui/polkitAuthenticationAgent.js:73 |
3982 | msgid "Authentication Required" |
3983 | msgstr "Cal autenticació" |
3984 | |
3985 | -#: ../js/ui/polkitAuthenticationAgent.js:106 |
3986 | +#: ../js/ui/polkitAuthenticationAgent.js:107 |
3987 | msgid "Administrator" |
3988 | msgstr "Administrador" |
3989 | |
3990 | -#: ../js/ui/polkitAuthenticationAgent.js:175 |
3991 | +#: ../js/ui/polkitAuthenticationAgent.js:177 |
3992 | msgid "Authenticate" |
3993 | msgstr "Autentica" |
3994 | |
3995 | @@ -816,11 +802,11 @@ |
3996 | #. * requested authentication was not gained; this can happen |
3997 | #. * because of an authentication error (like invalid password), |
3998 | #. * for instance. |
3999 | -#: ../js/ui/polkitAuthenticationAgent.js:256 |
4000 | +#: ../js/ui/polkitAuthenticationAgent.js:258 |
4001 | msgid "Sorry, that didn't work. Please try again." |
4002 | msgstr "No ha funcionat. Torneu-ho a provar." |
4003 | |
4004 | -#: ../js/ui/polkitAuthenticationAgent.js:268 |
4005 | +#: ../js/ui/polkitAuthenticationAgent.js:270 |
4006 | msgid "Password:" |
4007 | msgstr "Contrasenya:" |
4008 | |
4009 | @@ -833,7 +819,7 @@ |
4010 | msgid "toggle-switch-us" |
4011 | msgstr "toggle-switch-intl" |
4012 | |
4013 | -#: ../js/ui/runDialog.js:208 |
4014 | +#: ../js/ui/runDialog.js:209 |
4015 | msgid "Please enter a command:" |
4016 | msgstr "Introduïu una orde:" |
4017 | |
4018 | @@ -845,6 +831,22 @@ |
4019 | msgid "No matching results." |
4020 | msgstr "No s'ha trobat cap coincidència." |
4021 | |
4022 | +#: ../js/ui/shellEntry.js:30 |
4023 | +msgid "Copy" |
4024 | +msgstr "Copia" |
4025 | + |
4026 | +#: ../js/ui/shellEntry.js:35 |
4027 | +msgid "Paste" |
4028 | +msgstr "Enganxa" |
4029 | + |
4030 | +#: ../js/ui/shellEntry.js:81 |
4031 | +msgid "Show Text" |
4032 | +msgstr "Mostra el text" |
4033 | + |
4034 | +#: ../js/ui/shellEntry.js:83 |
4035 | +msgid "Hide Text" |
4036 | +msgstr "Oculta el text" |
4037 | + |
4038 | #: ../js/ui/shellMountOperation.js:285 |
4039 | msgid "Wrong password, please try again" |
4040 | msgstr "La contrasenya és errònia, torneu-ho a intentar" |
4041 | @@ -978,7 +980,7 @@ |
4042 | msgid "Grant this time only" |
4043 | msgstr "Permet-ho només ara" |
4044 | |
4045 | -#: ../js/ui/status/bluetooth.js:392 ../js/ui/telepathyClient.js:1200 |
4046 | +#: ../js/ui/status/bluetooth.js:392 ../js/ui/telepathyClient.js:1204 |
4047 | msgid "Reject" |
4048 | msgstr "Rebutja" |
4049 | |
4050 | @@ -1264,22 +1266,22 @@ |
4051 | msgid "Connection error" |
4052 | msgstr "S'ha produït un error de connexió" |
4053 | |
4054 | -#: ../js/ui/telepathyClient.js:737 |
4055 | +#: ../js/ui/telepathyClient.js:741 |
4056 | #, c-format |
4057 | msgid "%s is online." |
4058 | msgstr "%s és en línia." |
4059 | |
4060 | -#: ../js/ui/telepathyClient.js:742 |
4061 | +#: ../js/ui/telepathyClient.js:746 |
4062 | #, c-format |
4063 | msgid "%s is offline." |
4064 | msgstr "%s no hi és." |
4065 | |
4066 | -#: ../js/ui/telepathyClient.js:745 |
4067 | +#: ../js/ui/telepathyClient.js:749 |
4068 | #, c-format |
4069 | msgid "%s is away." |
4070 | msgstr "%s és lluny." |
4071 | |
4072 | -#: ../js/ui/telepathyClient.js:748 |
4073 | +#: ../js/ui/telepathyClient.js:752 |
4074 | #, c-format |
4075 | msgid "%s is busy." |
4076 | msgstr "%s està ocupat." |
4077 | @@ -1287,35 +1289,35 @@ |
4078 | #. Translators: this is a time format string followed by a date. |
4079 | #. If applicable, replace %X with a strftime format valid for your |
4080 | #. locale, without seconds. |
4081 | -#: ../js/ui/telepathyClient.js:982 |
4082 | +#: ../js/ui/telepathyClient.js:986 |
4083 | #, no-c-format |
4084 | msgid "Sent at <b>%X</b> on <b>%A</b>" |
4085 | msgstr "Enviat a les <b>%X</b> del <b>%A</b>" |
4086 | |
4087 | #. Translators: this is a time format in the style of "Wednesday, May 25", |
4088 | #. shown when you get a chat message in the same year. |
4089 | -#: ../js/ui/telepathyClient.js:988 |
4090 | +#: ../js/ui/telepathyClient.js:992 |
4091 | #, no-c-format |
4092 | msgid "Sent on <b>%A</b>, <b>%B %d</b>" |
4093 | msgstr "Enviat el <b>%A %d de %B</b>" |
4094 | |
4095 | #. Translators: this is a time format in the style of "Wednesday, May 25, 2012", |
4096 | #. shown when you get a chat message in a different year. |
4097 | -#: ../js/ui/telepathyClient.js:993 |
4098 | +#: ../js/ui/telepathyClient.js:997 |
4099 | #, no-c-format |
4100 | msgid "Sent on <b>%A</b>, <b>%B %d</b>, %Y" |
4101 | msgstr "Enviat el <b>%A %d de %B</b> de %Y" |
4102 | |
4103 | #. Translators: this is the other person changing their old IM name to their new |
4104 | #. IM name. |
4105 | -#: ../js/ui/telepathyClient.js:1035 |
4106 | +#: ../js/ui/telepathyClient.js:1039 |
4107 | #, c-format |
4108 | msgid "%s is now known as %s" |
4109 | msgstr "En/na %s ara es diu %s" |
4110 | |
4111 | #. translators: argument is a room name like |
4112 | #. * room@jabber.org for example. |
4113 | -#: ../js/ui/telepathyClient.js:1144 |
4114 | +#: ../js/ui/telepathyClient.js:1148 |
4115 | #, c-format |
4116 | msgid "Invitation to %s" |
4117 | msgstr "Vos han convidat a entrar a %s" |
4118 | @@ -1323,34 +1325,35 @@ |
4119 | #. translators: first argument is the name of a contact and the second |
4120 | #. * one the name of a room. "Alice is inviting you to join room@jabber.org |
4121 | #. * for example. |
4122 | -#: ../js/ui/telepathyClient.js:1152 |
4123 | +#: ../js/ui/telepathyClient.js:1156 |
4124 | #, c-format |
4125 | msgid "%s is inviting you to join %s" |
4126 | msgstr "En/na %s vos convida a entrar a %s" |
4127 | |
4128 | -#: ../js/ui/telepathyClient.js:1154 ../js/ui/telepathyClient.js:1243 |
4129 | -#: ../js/ui/telepathyClient.js:1347 |
4130 | +#: ../js/ui/telepathyClient.js:1158 ../js/ui/telepathyClient.js:1248 |
4131 | +#: ../js/ui/telepathyClient.js:1352 |
4132 | msgid "Decline" |
4133 | msgstr "Declina" |
4134 | |
4135 | -#: ../js/ui/telepathyClient.js:1155 ../js/ui/telepathyClient.js:1244 |
4136 | -#: ../js/ui/telepathyClient.js:1348 |
4137 | +#: ../js/ui/telepathyClient.js:1159 ../js/ui/telepathyClient.js:1249 |
4138 | +#: ../js/ui/telepathyClient.js:1353 |
4139 | msgid "Accept" |
4140 | msgstr "Accepta" |
4141 | |
4142 | #. translators: argument is a contact name like Alice for example. |
4143 | -#: ../js/ui/telepathyClient.js:1188 |
4144 | +#: ../js/ui/telepathyClient.js:1192 |
4145 | #, c-format |
4146 | msgid "Video call from %s" |
4147 | msgstr "Videotrucada de %s" |
4148 | |
4149 | #. translators: argument is a contact name like Alice for example. |
4150 | -#: ../js/ui/telepathyClient.js:1191 |
4151 | +#: ../js/ui/telepathyClient.js:1195 |
4152 | #, c-format |
4153 | msgid "Call from %s" |
4154 | msgstr "Trucada de %s" |
4155 | |
4156 | -#: ../js/ui/telepathyClient.js:1201 |
4157 | +#. translators: this is a button label (verb), not a noun |
4158 | +#: ../js/ui/telepathyClient.js:1206 |
4159 | msgid "Answer" |
4160 | msgstr "Contesta" |
4161 | |
4162 | @@ -1359,112 +1362,112 @@ |
4163 | #. * file name. The string will be something |
4164 | #. * like: "Alice is sending you test.ogg" |
4165 | #. |
4166 | -#: ../js/ui/telepathyClient.js:1237 |
4167 | +#: ../js/ui/telepathyClient.js:1242 |
4168 | #, c-format |
4169 | msgid "%s is sending you %s" |
4170 | msgstr "En/na %s vos envia %s" |
4171 | |
4172 | #. To translators: The parameter is the contact's alias |
4173 | -#: ../js/ui/telepathyClient.js:1312 |
4174 | +#: ../js/ui/telepathyClient.js:1317 |
4175 | #, c-format |
4176 | msgid "%s would like permission to see when you are online" |
4177 | msgstr "%s vol poder saber quan esteu en línia" |
4178 | |
4179 | -#: ../js/ui/telepathyClient.js:1410 |
4180 | +#: ../js/ui/telepathyClient.js:1415 |
4181 | msgid "Network error" |
4182 | msgstr "Error de la xarxa" |
4183 | |
4184 | -#: ../js/ui/telepathyClient.js:1412 |
4185 | +#: ../js/ui/telepathyClient.js:1417 |
4186 | msgid "Authentication failed" |
4187 | msgstr "Ha fallat l'autenticació" |
4188 | |
4189 | -#: ../js/ui/telepathyClient.js:1414 |
4190 | +#: ../js/ui/telepathyClient.js:1419 |
4191 | msgid "Encryption error" |
4192 | msgstr "Error d'encriptació" |
4193 | |
4194 | -#: ../js/ui/telepathyClient.js:1416 |
4195 | +#: ../js/ui/telepathyClient.js:1421 |
4196 | msgid "Certificate not provided" |
4197 | msgstr "No s'ha proporcionat el certificat" |
4198 | |
4199 | -#: ../js/ui/telepathyClient.js:1418 |
4200 | +#: ../js/ui/telepathyClient.js:1423 |
4201 | msgid "Certificate untrusted" |
4202 | msgstr "El certificat no és de confiança" |
4203 | |
4204 | -#: ../js/ui/telepathyClient.js:1420 |
4205 | +#: ../js/ui/telepathyClient.js:1425 |
4206 | msgid "Certificate expired" |
4207 | msgstr "El certificat ha vençut" |
4208 | |
4209 | -#: ../js/ui/telepathyClient.js:1422 |
4210 | +#: ../js/ui/telepathyClient.js:1427 |
4211 | msgid "Certificate not activated" |
4212 | msgstr "El certificat no està activat" |
4213 | |
4214 | -#: ../js/ui/telepathyClient.js:1424 |
4215 | +#: ../js/ui/telepathyClient.js:1429 |
4216 | msgid "Certificate hostname mismatch" |
4217 | msgstr "No coincideix el nom de la màquina del certificat" |
4218 | |
4219 | -#: ../js/ui/telepathyClient.js:1426 |
4220 | +#: ../js/ui/telepathyClient.js:1431 |
4221 | msgid "Certificate fingerprint mismatch" |
4222 | msgstr "No coincideix l'empremta digital del certificat" |
4223 | |
4224 | -#: ../js/ui/telepathyClient.js:1428 |
4225 | +#: ../js/ui/telepathyClient.js:1433 |
4226 | msgid "Certificate self-signed" |
4227 | msgstr "Certificat signat per un mateix" |
4228 | |
4229 | -#: ../js/ui/telepathyClient.js:1430 |
4230 | +#: ../js/ui/telepathyClient.js:1435 |
4231 | msgid "Status is set to offline" |
4232 | msgstr "S'ha establit l'estat a fora de línia" |
4233 | |
4234 | -#: ../js/ui/telepathyClient.js:1432 |
4235 | +#: ../js/ui/telepathyClient.js:1437 |
4236 | msgid "Encryption is not available" |
4237 | msgstr "L'encriptació no està disponible" |
4238 | |
4239 | -#: ../js/ui/telepathyClient.js:1434 |
4240 | +#: ../js/ui/telepathyClient.js:1439 |
4241 | msgid "Certificate is invalid" |
4242 | msgstr "El certificat no és vàlid" |
4243 | |
4244 | -#: ../js/ui/telepathyClient.js:1436 |
4245 | +#: ../js/ui/telepathyClient.js:1441 |
4246 | msgid "Connection has been refused" |
4247 | msgstr "S'ha rebutjat la connexió" |
4248 | |
4249 | -#: ../js/ui/telepathyClient.js:1438 |
4250 | +#: ../js/ui/telepathyClient.js:1443 |
4251 | msgid "Connection can't be established" |
4252 | msgstr "No es pot establir la connexió" |
4253 | |
4254 | -#: ../js/ui/telepathyClient.js:1440 |
4255 | +#: ../js/ui/telepathyClient.js:1445 |
4256 | msgid "Connection has been lost" |
4257 | msgstr "S'ha perdut la connexió" |
4258 | |
4259 | -#: ../js/ui/telepathyClient.js:1442 |
4260 | +#: ../js/ui/telepathyClient.js:1447 |
4261 | msgid "This resource is already connected to the server" |
4262 | msgstr "Este recurs ja està connectat al servidor" |
4263 | |
4264 | -#: ../js/ui/telepathyClient.js:1444 |
4265 | +#: ../js/ui/telepathyClient.js:1449 |
4266 | msgid "" |
4267 | "Connection has been replaced by a new connection using the same resource" |
4268 | msgstr "" |
4269 | "S'ha reemplaçat la connexió per una altra de nova fent servir el mateix " |
4270 | "recurs" |
4271 | |
4272 | -#: ../js/ui/telepathyClient.js:1446 |
4273 | +#: ../js/ui/telepathyClient.js:1451 |
4274 | msgid "The account already exists on the server" |
4275 | msgstr "Ja existeix este compte al servidor" |
4276 | |
4277 | -#: ../js/ui/telepathyClient.js:1448 |
4278 | +#: ../js/ui/telepathyClient.js:1453 |
4279 | msgid "Server is currently too busy to handle the connection" |
4280 | msgstr "El servidor està massa ocupat per gestionar la connexió" |
4281 | |
4282 | -#: ../js/ui/telepathyClient.js:1450 |
4283 | +#: ../js/ui/telepathyClient.js:1455 |
4284 | msgid "Certificate has been revoked" |
4285 | msgstr "S'ha revocat el certificat" |
4286 | |
4287 | -#: ../js/ui/telepathyClient.js:1452 |
4288 | +#: ../js/ui/telepathyClient.js:1457 |
4289 | msgid "" |
4290 | "Certificate uses an insecure cipher algorithm or is cryptographically weak" |
4291 | msgstr "" |
4292 | "El certificat utilitza un algorisme criptògraf no segur o la seua fortalesa " |
4293 | "criptogràfica és feble" |
4294 | |
4295 | -#: ../js/ui/telepathyClient.js:1454 |
4296 | +#: ../js/ui/telepathyClient.js:1459 |
4297 | msgid "" |
4298 | "The length of the server certificate, or the depth of the server certificate " |
4299 | "chain, exceed the limits imposed by the cryptography library" |
4300 | @@ -1474,20 +1477,20 @@ |
4301 | |
4302 | #. translators: argument is the account name, like |
4303 | #. * name@jabber.org for example. |
4304 | -#: ../js/ui/telepathyClient.js:1463 |
4305 | +#: ../js/ui/telepathyClient.js:1468 |
4306 | #, c-format |
4307 | msgid "Connection to %s failed" |
4308 | msgstr "Ha fallat la connexió a %s" |
4309 | |
4310 | -#: ../js/ui/telepathyClient.js:1472 |
4311 | +#: ../js/ui/telepathyClient.js:1477 |
4312 | msgid "Reconnect" |
4313 | msgstr "Torna a connectar" |
4314 | |
4315 | -#: ../js/ui/telepathyClient.js:1473 |
4316 | +#: ../js/ui/telepathyClient.js:1478 |
4317 | msgid "Edit account" |
4318 | msgstr "Edita el compte" |
4319 | |
4320 | -#: ../js/ui/telepathyClient.js:1519 |
4321 | +#: ../js/ui/telepathyClient.js:1524 |
4322 | msgid "Unknown reason" |
4323 | msgstr "Motiu desconegut" |
4324 | |
4325 | @@ -1503,39 +1506,39 @@ |
4326 | msgid "Unavailable" |
4327 | msgstr "No disponible" |
4328 | |
4329 | -#: ../js/ui/userMenu.js:512 ../js/ui/userMenu.js:516 ../js/ui/userMenu.js:586 |
4330 | +#: ../js/ui/userMenu.js:552 ../js/ui/userMenu.js:556 ../js/ui/userMenu.js:626 |
4331 | msgid "Power Off..." |
4332 | msgstr "Apaga..." |
4333 | |
4334 | -#: ../js/ui/userMenu.js:548 |
4335 | +#: ../js/ui/userMenu.js:588 |
4336 | msgid "Notifications" |
4337 | msgstr "Notificacions" |
4338 | |
4339 | -#: ../js/ui/userMenu.js:556 |
4340 | +#: ../js/ui/userMenu.js:596 |
4341 | msgid "Online Accounts" |
4342 | msgstr "Comptes en línia" |
4343 | |
4344 | -#: ../js/ui/userMenu.js:560 |
4345 | +#: ../js/ui/userMenu.js:600 |
4346 | msgid "System Settings" |
4347 | msgstr "Paràmetres de l'ordinador" |
4348 | |
4349 | -#: ../js/ui/userMenu.js:567 |
4350 | +#: ../js/ui/userMenu.js:607 |
4351 | msgid "Lock Screen" |
4352 | msgstr "Bloca la pantalla" |
4353 | |
4354 | -#: ../js/ui/userMenu.js:572 |
4355 | +#: ../js/ui/userMenu.js:612 |
4356 | msgid "Switch User" |
4357 | msgstr "Canvia d'usuari" |
4358 | |
4359 | -#: ../js/ui/userMenu.js:577 |
4360 | +#: ../js/ui/userMenu.js:617 |
4361 | msgid "Log Out..." |
4362 | msgstr "Ix..." |
4363 | |
4364 | -#: ../js/ui/userMenu.js:605 |
4365 | +#: ../js/ui/userMenu.js:645 |
4366 | msgid "Your chat status will be set to busy" |
4367 | msgstr "L'estat del xat s'establirà a ocupat" |
4368 | |
4369 | -#: ../js/ui/userMenu.js:606 |
4370 | +#: ../js/ui/userMenu.js:646 |
4371 | msgid "" |
4372 | "Notifications are now disabled, including chat messages. Your online status " |
4373 | "has been adjusted to let others know that you might not see their messages." |
4374 | @@ -1548,11 +1551,11 @@ |
4375 | #. in the search entry when no search is |
4376 | #. active; it should not exceed ~30 |
4377 | #. characters. |
4378 | -#: ../js/ui/viewSelector.js:120 |
4379 | +#: ../js/ui/viewSelector.js:121 |
4380 | msgid "Type to search..." |
4381 | msgstr "Teclegeu per cercar..." |
4382 | |
4383 | -#: ../js/ui/viewSelector.js:140 ../src/shell-util.c:261 |
4384 | +#: ../js/ui/viewSelector.js:142 ../src/shell-util.c:261 |
4385 | msgid "Search" |
4386 | msgstr "Cerca" |
4387 | |
4388 | @@ -1591,7 +1594,7 @@ |
4389 | msgid "Mode used by GDM for login screen" |
4390 | msgstr "El mode que utilitzarà el GDM per a la pantalla d'entrada" |
4391 | |
4392 | -#: ../src/shell-app.c:581 |
4393 | +#: ../src/shell-app.c:579 |
4394 | #, c-format |
4395 | msgid "Failed to launch '%s'" |
4396 | msgstr "No s'ha pogut iniciar «%s»" |
4397 | @@ -1628,6 +1631,18 @@ |
4398 | msgid "%1$s: %2$s" |
4399 | msgstr "%1$s: %2$s" |
4400 | |
4401 | +#~ msgid "Show password" |
4402 | +#~ msgstr "Mostra la contrasenya" |
4403 | + |
4404 | +#~ msgid "%s has not emitted any errors." |
4405 | +#~ msgstr "%s no ha emès cap error." |
4406 | + |
4407 | +#~ msgid "Hide Errors" |
4408 | +#~ msgstr "Amaga els errors" |
4409 | + |
4410 | +#~ msgid "Show Errors" |
4411 | +#~ msgstr "Mostra els errors" |
4412 | + |
4413 | #~ msgid "%s has finished starting" |
4414 | #~ msgstr "S'ha acabat d'iniciar %s" |
4415 | |
4416 | |
4417 | === modified file 'po/cs.po' |
4418 | --- po/cs.po 2011-09-28 00:41:45 +0000 |
4419 | +++ po/cs.po 2012-01-25 02:33:28 +0000 |
4420 | @@ -1,20 +1,23 @@ |
4421 | # Czech translation of gnome-shell. |
4422 | # Copyright (C) 2009, 2010, 2011 the author(s) of gnome-shell. |
4423 | # This file is distributed under the same license as the gnome-shell package. |
4424 | +# |
4425 | # Andre Klapper <ak-47@gmx.net>, 2009. |
4426 | # Petr Kovar <pknbe@volny.cz>, 2009, 2010, 2011. |
4427 | +# |
4428 | msgid "" |
4429 | msgstr "" |
4430 | -"Project-Id-Version: gnome-shell\n" |
4431 | -"Report-Msgid-Bugs-To: \n" |
4432 | -"POT-Creation-Date: 2011-09-26 02:00+0200\n" |
4433 | -"PO-Revision-Date: 2011-09-26 02:00+0200\n" |
4434 | +"Project-Id-Version: gnome-shell gnome-3.2\n" |
4435 | +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" |
4436 | +"shell&keywords=I18N+L10N&component=general\n" |
4437 | +"POT-Creation-Date: 2011-10-18 19:39+0000\n" |
4438 | +"PO-Revision-Date: 2011-10-30 14:12+0100\n" |
4439 | "Last-Translator: Petr Kovar <pknbe@volny.cz>\n" |
4440 | "Language-Team: Czech <gnome-cs-list@gnome.org>\n" |
4441 | -"Language: cs\n" |
4442 | "MIME-Version: 1.0\n" |
4443 | "Content-Type: text/plain; charset=UTF-8\n" |
4444 | "Content-Transfer-Encoding: 8bit\n" |
4445 | +"Language: cs\n" |
4446 | "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" |
4447 | "X-Generator: Lokalize 1.2\n" |
4448 | |
4449 | @@ -62,19 +65,19 @@ |
4450 | |
4451 | #: ../data/org.gnome.shell.gschema.xml.in.h:7 |
4452 | msgid "History for the looking glass dialog" |
4453 | -msgstr "Historie dialogového okna \"looking glass\" (Alt-F2)" |
4454 | +msgstr "Historie dialogového okna „looking glass“ (Alt-F2)" |
4455 | |
4456 | #: ../data/org.gnome.shell.gschema.xml.in.h:8 |
4457 | msgid "If true, display date in the clock, in addition to time." |
4458 | -msgstr "Je-li \"true\", zobrazovat v hodinách kromě času i datum." |
4459 | +msgstr "Je-li zapnuto, zobrazovat v hodinách kromě času i datum." |
4460 | |
4461 | #: ../data/org.gnome.shell.gschema.xml.in.h:9 |
4462 | msgid "If true, display seconds in time." |
4463 | -msgstr "Je-li \"true\", zobrazovat čas včetně sekund." |
4464 | +msgstr "Je-li zapnuto, zobrazovat čas včetně sekund." |
4465 | |
4466 | #: ../data/org.gnome.shell.gschema.xml.in.h:10 |
4467 | msgid "If true, display the ISO week date in the calendar." |
4468 | -msgstr "Je-li \"true\", zobrazovat v kalendáři čísla týdnů dle ISO." |
4469 | +msgstr "Je-li zapnuto, zobrazovat v kalendáři čísla týdnů dle ISO." |
4470 | |
4471 | #: ../data/org.gnome.shell.gschema.xml.in.h:11 |
4472 | msgid "List of desktop file IDs for favorite applications" |
4473 | @@ -179,42 +182,42 @@ |
4474 | msgid "disabled OpenSearch providers" |
4475 | msgstr "zakázaní poskytovatelé OpenSearch" |
4476 | |
4477 | -#: ../js/gdm/loginDialog.js:617 |
4478 | +#: ../js/gdm/loginDialog.js:633 |
4479 | msgid "Session..." |
4480 | -msgstr "Sezení..." |
4481 | +msgstr "Sezení…" |
4482 | |
4483 | -#: ../js/gdm/loginDialog.js:785 |
4484 | +#: ../js/gdm/loginDialog.js:804 |
4485 | msgctxt "title" |
4486 | msgid "Sign In" |
4487 | msgstr "Přihlášení" |
4488 | |
4489 | #. translators: this message is shown below the password entry field |
4490 | #. to indicate the user can swipe their finger instead |
4491 | -#: ../js/gdm/loginDialog.js:830 |
4492 | +#: ../js/gdm/loginDialog.js:849 |
4493 | msgid "(or swipe finger)" |
4494 | msgstr "(nebo otiskněte prst)" |
4495 | |
4496 | -#: ../js/gdm/loginDialog.js:848 |
4497 | +#: ../js/gdm/loginDialog.js:867 |
4498 | msgid "Not listed?" |
4499 | msgstr "Nejste na seznamu?" |
4500 | |
4501 | -#: ../js/gdm/loginDialog.js:1004 ../js/ui/endSessionDialog.js:426 |
4502 | -#: ../js/ui/extensionSystem.js:477 ../js/ui/networkAgent.js:165 |
4503 | -#: ../js/ui/polkitAuthenticationAgent.js:171 ../js/ui/status/bluetooth.js:480 |
4504 | +#: ../js/gdm/loginDialog.js:1035 ../js/ui/endSessionDialog.js:426 |
4505 | +#: ../js/ui/extensionSystem.js:477 ../js/ui/networkAgent.js:148 |
4506 | +#: ../js/ui/polkitAuthenticationAgent.js:173 ../js/ui/status/bluetooth.js:480 |
4507 | msgid "Cancel" |
4508 | msgstr "Zrušit" |
4509 | |
4510 | -#: ../js/gdm/loginDialog.js:1009 |
4511 | +#: ../js/gdm/loginDialog.js:1040 |
4512 | msgctxt "button" |
4513 | msgid "Sign In" |
4514 | msgstr "Přihlásit se" |
4515 | |
4516 | -#: ../js/gdm/loginDialog.js:1358 |
4517 | +#: ../js/gdm/loginDialog.js:1392 |
4518 | msgid "Login Window" |
4519 | msgstr "Přihlašovací okno" |
4520 | |
4521 | -#: ../js/gdm/powerMenu.js:116 ../js/ui/userMenu.js:514 |
4522 | -#: ../js/ui/userMenu.js:516 ../js/ui/userMenu.js:585 |
4523 | +#: ../js/gdm/powerMenu.js:116 ../js/ui/userMenu.js:554 |
4524 | +#: ../js/ui/userMenu.js:556 ../js/ui/userMenu.js:625 |
4525 | msgid "Suspend" |
4526 | msgstr "Uspat do paměti" |
4527 | |
4528 | @@ -241,7 +244,7 @@ |
4529 | #: ../js/misc/util.js:127 |
4530 | #, c-format |
4531 | msgid "Execution of '%s' failed:" |
4532 | -msgstr "Vykonání \"%s\" selhalo:" |
4533 | +msgstr "Vykonání „%s“ selhalo:" |
4534 | |
4535 | #. Translators: Filter to display all applications |
4536 | #: ../js/ui/appDisplay.js:255 |
4537 | @@ -438,32 +441,32 @@ |
4538 | msgid "Next week" |
4539 | msgstr "Následující týden" |
4540 | |
4541 | -#: ../js/ui/contactDisplay.js:59 ../js/ui/notificationDaemon.js:444 |
4542 | -#: ../js/ui/status/power.js:223 ../src/shell-app.c:355 |
4543 | +#: ../js/ui/contactDisplay.js:65 ../js/ui/notificationDaemon.js:459 |
4544 | +#: ../js/ui/status/power.js:223 ../src/shell-app.c:353 |
4545 | msgid "Unknown" |
4546 | msgstr "Neznámé" |
4547 | |
4548 | -#: ../js/ui/contactDisplay.js:80 ../js/ui/userMenu.js:139 |
4549 | +#: ../js/ui/contactDisplay.js:86 ../js/ui/userMenu.js:139 |
4550 | msgid "Available" |
4551 | msgstr "Přítomen" |
4552 | |
4553 | -#: ../js/ui/contactDisplay.js:85 ../js/ui/userMenu.js:148 |
4554 | +#: ../js/ui/contactDisplay.js:91 ../js/ui/userMenu.js:148 |
4555 | msgid "Away" |
4556 | msgstr "Nepřítomen" |
4557 | |
4558 | -#: ../js/ui/contactDisplay.js:89 ../js/ui/userMenu.js:142 |
4559 | +#: ../js/ui/contactDisplay.js:95 ../js/ui/userMenu.js:142 |
4560 | msgid "Busy" |
4561 | msgstr "Zaneprázdněn" |
4562 | |
4563 | -#: ../js/ui/contactDisplay.js:93 |
4564 | +#: ../js/ui/contactDisplay.js:99 |
4565 | msgid "Offline" |
4566 | msgstr "Odpojen" |
4567 | |
4568 | -#: ../js/ui/contactDisplay.js:140 |
4569 | +#: ../js/ui/contactDisplay.js:146 |
4570 | msgid "CONTACTS" |
4571 | msgstr "KONTAKTY" |
4572 | |
4573 | -#: ../js/ui/dash.js:172 ../js/ui/messageTray.js:1204 |
4574 | +#: ../js/ui/dash.js:174 ../js/ui/messageTray.js:1206 |
4575 | msgid "Remove" |
4576 | msgstr "Odstranit" |
4577 | |
4578 | @@ -608,138 +611,139 @@ |
4579 | #: ../js/ui/extensionSystem.js:485 |
4580 | #, c-format |
4581 | msgid "Download and install '%s' from extensions.gnome.org?" |
4582 | -msgstr "Stáhnout a nainstalovat \"%s\" z extensions.gnome.org?" |
4583 | - |
4584 | -#: ../js/ui/keyboard.js:517 ../js/ui/status/power.js:211 |
4585 | +msgstr "Stáhnout a nainstalovat „%s“ z extensions.gnome.org?" |
4586 | + |
4587 | +#: ../js/ui/keyboard.js:325 |
4588 | +#| msgid "Retry" |
4589 | +msgid "tray" |
4590 | +msgstr "panel" |
4591 | + |
4592 | +#: ../js/ui/keyboard.js:547 ../js/ui/status/power.js:211 |
4593 | msgid "Keyboard" |
4594 | msgstr "Klávesnice" |
4595 | |
4596 | -#: ../js/ui/lookingGlass.js:645 |
4597 | +#: ../js/ui/lookingGlass.js:646 |
4598 | msgid "No extensions installed" |
4599 | msgstr "Nejsou nainstalována žádná rozšíření" |
4600 | |
4601 | -#: ../js/ui/lookingGlass.js:691 |
4602 | +#: ../js/ui/lookingGlass.js:692 |
4603 | msgid "Enabled" |
4604 | msgstr "Povoleno" |
4605 | |
4606 | #. translators: |
4607 | #. * The device has been disabled |
4608 | -#: ../js/ui/lookingGlass.js:693 ../src/gvc/gvc-mixer-control.c:1093 |
4609 | +#: ../js/ui/lookingGlass.js:694 ../src/gvc/gvc-mixer-control.c:1093 |
4610 | msgid "Disabled" |
4611 | msgstr "Zakázáno" |
4612 | |
4613 | -#: ../js/ui/lookingGlass.js:695 |
4614 | +#: ../js/ui/lookingGlass.js:696 |
4615 | msgid "Error" |
4616 | msgstr "Chyba" |
4617 | |
4618 | -#: ../js/ui/lookingGlass.js:697 |
4619 | +#: ../js/ui/lookingGlass.js:698 |
4620 | msgid "Out of date" |
4621 | msgstr "Neaktuální" |
4622 | |
4623 | -#: ../js/ui/lookingGlass.js:699 |
4624 | +#: ../js/ui/lookingGlass.js:700 |
4625 | msgid "Downloading" |
4626 | msgstr "Stahování" |
4627 | |
4628 | -#: ../js/ui/lookingGlass.js:724 |
4629 | +#: ../js/ui/lookingGlass.js:721 |
4630 | msgid "View Source" |
4631 | msgstr "Zobrazit zdroj" |
4632 | |
4633 | -#: ../js/ui/lookingGlass.js:730 |
4634 | +#: ../js/ui/lookingGlass.js:727 |
4635 | msgid "Web Page" |
4636 | msgstr "Webová stránka" |
4637 | |
4638 | -#: ../js/ui/messageTray.js:1197 |
4639 | +#: ../js/ui/messageTray.js:1199 |
4640 | msgid "Open" |
4641 | msgstr "Otevřít" |
4642 | |
4643 | -#: ../js/ui/messageTray.js:2405 |
4644 | +#: ../js/ui/messageTray.js:2408 |
4645 | msgid "System Information" |
4646 | msgstr "Informace o systému" |
4647 | |
4648 | -#: ../js/ui/networkAgent.js:145 |
4649 | -msgid "Show password" |
4650 | -msgstr "Zobrazit heslo" |
4651 | - |
4652 | -#: ../js/ui/networkAgent.js:160 |
4653 | +#: ../js/ui/networkAgent.js:143 |
4654 | msgid "Connect" |
4655 | msgstr "Připojit" |
4656 | |
4657 | #. Cisco LEAP |
4658 | -#: ../js/ui/networkAgent.js:255 ../js/ui/networkAgent.js:267 |
4659 | -#: ../js/ui/networkAgent.js:294 ../js/ui/networkAgent.js:314 |
4660 | -#: ../js/ui/networkAgent.js:324 |
4661 | +#: ../js/ui/networkAgent.js:238 ../js/ui/networkAgent.js:250 |
4662 | +#: ../js/ui/networkAgent.js:277 ../js/ui/networkAgent.js:297 |
4663 | +#: ../js/ui/networkAgent.js:307 |
4664 | msgid "Password: " |
4665 | msgstr "Heslo: " |
4666 | |
4667 | #. static WEP |
4668 | -#: ../js/ui/networkAgent.js:260 |
4669 | +#: ../js/ui/networkAgent.js:243 |
4670 | msgid "Key: " |
4671 | msgstr "Klíč: " |
4672 | |
4673 | #. TTLS and PEAP are actually much more complicated, but this complication |
4674 | #. is not visible here since we only care about phase2 authentication |
4675 | #. (and don't even care of which one) |
4676 | -#: ../js/ui/networkAgent.js:292 ../js/ui/networkAgent.js:310 |
4677 | +#: ../js/ui/networkAgent.js:275 ../js/ui/networkAgent.js:293 |
4678 | msgid "Username: " |
4679 | msgstr "Uživatelské jméno: " |
4680 | |
4681 | -#: ../js/ui/networkAgent.js:298 |
4682 | +#: ../js/ui/networkAgent.js:281 |
4683 | msgid "Identity: " |
4684 | msgstr "Indentita: " |
4685 | |
4686 | -#: ../js/ui/networkAgent.js:300 |
4687 | +#: ../js/ui/networkAgent.js:283 |
4688 | msgid "Private key password: " |
4689 | msgstr "Heslo soukromého klíče: " |
4690 | |
4691 | -#: ../js/ui/networkAgent.js:312 |
4692 | +#: ../js/ui/networkAgent.js:295 |
4693 | msgid "Service: " |
4694 | msgstr "Služba: " |
4695 | |
4696 | -#: ../js/ui/networkAgent.js:341 |
4697 | +#: ../js/ui/networkAgent.js:324 |
4698 | msgid "Authentication required by wireless network" |
4699 | msgstr "K bezdrátové síti je vyžadováno ověření" |
4700 | |
4701 | -#: ../js/ui/networkAgent.js:342 |
4702 | +#: ../js/ui/networkAgent.js:325 |
4703 | #, c-format |
4704 | msgid "" |
4705 | "Passwords or encryption keys are required to access the wireless network " |
4706 | "'%s'." |
4707 | msgstr "" |
4708 | -"Pro přístup k bezdrátové síti \"%s\" jsou vyžadována hesla nebo šifrovací " |
4709 | +"Pro přístup k bezdrátové síti „%s“ jsou vyžadována hesla nebo šifrovací " |
4710 | "klíče." |
4711 | |
4712 | -#: ../js/ui/networkAgent.js:346 |
4713 | +#: ../js/ui/networkAgent.js:329 |
4714 | msgid "Wired 802.1X authentication" |
4715 | msgstr "Ověření drátového připojení 802.1X" |
4716 | |
4717 | -#: ../js/ui/networkAgent.js:348 |
4718 | +#: ../js/ui/networkAgent.js:331 |
4719 | msgid "Network name: " |
4720 | msgstr "Název sítě: " |
4721 | |
4722 | -#: ../js/ui/networkAgent.js:353 |
4723 | +#: ../js/ui/networkAgent.js:336 |
4724 | msgid "DSL authentication" |
4725 | msgstr "Ověření DSL" |
4726 | |
4727 | -#: ../js/ui/networkAgent.js:360 |
4728 | +#: ../js/ui/networkAgent.js:343 |
4729 | msgid "PIN code required" |
4730 | msgstr "Požadován kód PIN" |
4731 | |
4732 | -#: ../js/ui/networkAgent.js:361 |
4733 | +#: ../js/ui/networkAgent.js:344 |
4734 | msgid "PIN code is needed for the mobile broadband device" |
4735 | msgstr "Pro mobilní širokopásmové zařízení je vyžadován kód PIN" |
4736 | |
4737 | -#: ../js/ui/networkAgent.js:362 |
4738 | +#: ../js/ui/networkAgent.js:345 |
4739 | msgid "PIN: " |
4740 | msgstr "PIN: " |
4741 | |
4742 | -#: ../js/ui/networkAgent.js:368 |
4743 | +#: ../js/ui/networkAgent.js:351 |
4744 | msgid "Mobile broadband network password" |
4745 | msgstr "Heslo k mobilní širokopásmové síti" |
4746 | |
4747 | -#: ../js/ui/networkAgent.js:369 |
4748 | +#: ../js/ui/networkAgent.js:352 |
4749 | #, c-format |
4750 | msgid "A password is required to connect to '%s'." |
4751 | -msgstr "Pro připojení k \"%s\" je vyžadováno heslo." |
4752 | +msgstr "Pro připojení k „%s“ je vyžadováno heslo." |
4753 | |
4754 | #: ../js/ui/overview.js:91 |
4755 | msgid "Undo" |
4756 | @@ -778,7 +782,7 @@ |
4757 | #: ../js/ui/placeDisplay.js:120 |
4758 | #, c-format |
4759 | msgid "Failed to unmount '%s'" |
4760 | -msgstr "Nelze odpojit \"%s\"" |
4761 | +msgstr "Nelze odpojit „%s“" |
4762 | |
4763 | #: ../js/ui/placeDisplay.js:123 |
4764 | msgid "Retry" |
4765 | @@ -786,21 +790,21 @@ |
4766 | |
4767 | #: ../js/ui/placeDisplay.js:163 |
4768 | msgid "Connect to..." |
4769 | -msgstr "Připojit se k..." |
4770 | +msgstr "Připojit se k…" |
4771 | |
4772 | #: ../js/ui/placeDisplay.js:375 |
4773 | msgid "PLACES & DEVICES" |
4774 | msgstr "MÍSTA A ZAŘÍZENÍ" |
4775 | |
4776 | -#: ../js/ui/polkitAuthenticationAgent.js:72 |
4777 | +#: ../js/ui/polkitAuthenticationAgent.js:73 |
4778 | msgid "Authentication Required" |
4779 | msgstr "Je vyžadováno ověření" |
4780 | |
4781 | -#: ../js/ui/polkitAuthenticationAgent.js:106 |
4782 | +#: ../js/ui/polkitAuthenticationAgent.js:107 |
4783 | msgid "Administrator" |
4784 | msgstr "Správce" |
4785 | |
4786 | -#: ../js/ui/polkitAuthenticationAgent.js:175 |
4787 | +#: ../js/ui/polkitAuthenticationAgent.js:177 |
4788 | msgid "Authenticate" |
4789 | msgstr "Ověřit" |
4790 | |
4791 | @@ -808,11 +812,11 @@ |
4792 | #. * requested authentication was not gained; this can happen |
4793 | #. * because of an authentication error (like invalid password), |
4794 | #. * for instance. |
4795 | -#: ../js/ui/polkitAuthenticationAgent.js:256 |
4796 | +#: ../js/ui/polkitAuthenticationAgent.js:258 |
4797 | msgid "Sorry, that didn't work. Please try again." |
4798 | msgstr "Ověření bohužel nebylo úspěšné. Zkuste to prosím znovu." |
4799 | |
4800 | -#: ../js/ui/polkitAuthenticationAgent.js:268 |
4801 | +#: ../js/ui/polkitAuthenticationAgent.js:270 |
4802 | msgid "Password:" |
4803 | msgstr "Heslo:" |
4804 | |
4805 | @@ -825,18 +829,35 @@ |
4806 | msgid "toggle-switch-us" |
4807 | msgstr "toggle-switch-intl" |
4808 | |
4809 | -#: ../js/ui/runDialog.js:208 |
4810 | +#: ../js/ui/runDialog.js:209 |
4811 | msgid "Please enter a command:" |
4812 | msgstr "Zadejte prosím příkaz:" |
4813 | |
4814 | #: ../js/ui/searchDisplay.js:340 |
4815 | msgid "Searching..." |
4816 | -msgstr "Hledá se..." |
4817 | +msgstr "Hledá se…" |
4818 | |
4819 | #: ../js/ui/searchDisplay.js:363 |
4820 | msgid "No matching results." |
4821 | msgstr "Neodpovídá ani jeden z výsledků." |
4822 | |
4823 | +#: ../js/ui/shellEntry.js:30 |
4824 | +msgid "Copy" |
4825 | +msgstr "Kopírovat" |
4826 | + |
4827 | +#: ../js/ui/shellEntry.js:35 |
4828 | +msgid "Paste" |
4829 | +msgstr "Vložit" |
4830 | + |
4831 | +#: ../js/ui/shellEntry.js:81 |
4832 | +msgid "Show Text" |
4833 | +msgstr "Zobrazit text" |
4834 | + |
4835 | +#: ../js/ui/shellEntry.js:83 |
4836 | +#| msgid "Large Text" |
4837 | +msgid "Hide Text" |
4838 | +msgstr "Skrýt text" |
4839 | + |
4840 | #: ../js/ui/shellMountOperation.js:285 |
4841 | msgid "Wrong password, please try again" |
4842 | msgstr "Špatné heslo, zkuste to prosím znovu" |
4843 | @@ -896,11 +917,11 @@ |
4844 | |
4845 | #: ../js/ui/status/bluetooth.js:66 |
4846 | msgid "Send Files to Device..." |
4847 | -msgstr "Odeslat soubory na zařízení..." |
4848 | +msgstr "Odeslat soubory na zařízení…" |
4849 | |
4850 | #: ../js/ui/status/bluetooth.js:67 |
4851 | msgid "Set up a New Device..." |
4852 | -msgstr "Nastavit nové zařízení..." |
4853 | +msgstr "Nastavit nové zařízení…" |
4854 | |
4855 | #: ../js/ui/status/bluetooth.js:91 |
4856 | msgid "Bluetooth Settings" |
4857 | @@ -917,19 +938,19 @@ |
4858 | |
4859 | #: ../js/ui/status/bluetooth.js:217 ../js/ui/status/network.js:486 |
4860 | msgid "disconnecting..." |
4861 | -msgstr "odpojování..." |
4862 | +msgstr "odpojování…" |
4863 | |
4864 | #: ../js/ui/status/bluetooth.js:230 ../js/ui/status/network.js:492 |
4865 | msgid "connecting..." |
4866 | -msgstr "připojování..." |
4867 | +msgstr "připojování…" |
4868 | |
4869 | #: ../js/ui/status/bluetooth.js:248 |
4870 | msgid "Send Files..." |
4871 | -msgstr "Odeslat soubory..." |
4872 | +msgstr "Odeslat soubory…" |
4873 | |
4874 | #: ../js/ui/status/bluetooth.js:253 |
4875 | msgid "Browse Files..." |
4876 | -msgstr "Procházet soubory..." |
4877 | +msgstr "Procházet soubory…" |
4878 | |
4879 | #: ../js/ui/status/bluetooth.js:262 |
4880 | msgid "Error browsing device" |
4881 | @@ -938,7 +959,7 @@ |
4882 | #: ../js/ui/status/bluetooth.js:263 |
4883 | #, c-format |
4884 | msgid "The requested device cannot be browsed, error is '%s'" |
4885 | -msgstr "Procházení požadovaného zařízení se nezdařilo, chybou je \"%s\"" |
4886 | +msgstr "Procházení požadovaného zařízení se nezdařilo, chybou je „%s“" |
4887 | |
4888 | #: ../js/ui/status/bluetooth.js:271 |
4889 | msgid "Keyboard Settings" |
4890 | @@ -960,7 +981,7 @@ |
4891 | #: ../js/ui/status/bluetooth.js:388 |
4892 | #, c-format |
4893 | msgid "Device %s wants access to the service '%s'" |
4894 | -msgstr "Zařízení %s požaduje přístup ke službě \"%s\"" |
4895 | +msgstr "Zařízení %s požaduje přístup ke službě „%s“" |
4896 | |
4897 | #: ../js/ui/status/bluetooth.js:390 |
4898 | msgid "Always grant access" |
4899 | @@ -970,7 +991,7 @@ |
4900 | msgid "Grant this time only" |
4901 | msgstr "Udělit pouze tentokrát" |
4902 | |
4903 | -#: ../js/ui/status/bluetooth.js:392 ../js/ui/telepathyClient.js:1196 |
4904 | +#: ../js/ui/status/bluetooth.js:392 ../js/ui/telepathyClient.js:1204 |
4905 | msgid "Reject" |
4906 | msgstr "Odmítnout" |
4907 | |
4908 | @@ -987,7 +1008,7 @@ |
4909 | #: ../js/ui/status/bluetooth.js:429 |
4910 | #, c-format |
4911 | msgid "Please confirm whether the PIN '%s' matches the one on the device." |
4912 | -msgstr "Ověřte prosím, zda PIN \"%s\" souhlasí s tím na zařízení." |
4913 | +msgstr "Ověřte prosím, zda PIN „%s“ souhlasí s tím na zařízení." |
4914 | |
4915 | #: ../js/ui/status/bluetooth.js:431 |
4916 | msgid "Matches" |
4917 | @@ -1061,7 +1082,7 @@ |
4918 | |
4919 | #: ../js/ui/status/network.js:575 ../js/ui/status/network.js:1523 |
4920 | msgid "More..." |
4921 | -msgstr "Více..." |
4922 | +msgstr "Více…" |
4923 | |
4924 | #. TRANSLATORS: this is the indication that a connection for another logged in user is active, |
4925 | #. and we cannot access its settings (including the name) |
4926 | @@ -1143,7 +1164,7 @@ |
4927 | #. to estimate battery life |
4928 | #: ../js/ui/status/power.js:103 |
4929 | msgid "Estimating..." |
4930 | -msgstr "Odhaduje se..." |
4931 | +msgstr "Odhaduje se…" |
4932 | |
4933 | #: ../js/ui/status/power.js:110 |
4934 | #, c-format |
4935 | @@ -1243,39 +1264,39 @@ |
4936 | msgstr "Pozvání" |
4937 | |
4938 | #. We got the TpContact |
4939 | -#: ../js/ui/telepathyClient.js:325 |
4940 | +#: ../js/ui/telepathyClient.js:327 |
4941 | msgid "Call" |
4942 | msgstr "Hovor" |
4943 | |
4944 | #. We got the TpContact |
4945 | -#: ../js/ui/telepathyClient.js:353 |
4946 | +#: ../js/ui/telepathyClient.js:357 |
4947 | msgid "File Transfer" |
4948 | msgstr "Přenos souborů" |
4949 | |
4950 | -#: ../js/ui/telepathyClient.js:434 |
4951 | +#: ../js/ui/telepathyClient.js:438 |
4952 | msgid "Subscription request" |
4953 | msgstr "Požadavek na přihlášení" |
4954 | |
4955 | -#: ../js/ui/telepathyClient.js:470 |
4956 | +#: ../js/ui/telepathyClient.js:474 |
4957 | msgid "Connection error" |
4958 | msgstr "Chyba připojení" |
4959 | |
4960 | -#: ../js/ui/telepathyClient.js:733 |
4961 | +#: ../js/ui/telepathyClient.js:741 |
4962 | #, c-format |
4963 | msgid "%s is online." |
4964 | msgstr "Kontakt %s je připojen." |
4965 | |
4966 | -#: ../js/ui/telepathyClient.js:738 |
4967 | +#: ../js/ui/telepathyClient.js:746 |
4968 | #, c-format |
4969 | msgid "%s is offline." |
4970 | msgstr "Kontakt %s je odpojen." |
4971 | |
4972 | -#: ../js/ui/telepathyClient.js:741 |
4973 | +#: ../js/ui/telepathyClient.js:749 |
4974 | #, c-format |
4975 | msgid "%s is away." |
4976 | msgstr "Kontakt %s je nepřítomen." |
4977 | |
4978 | -#: ../js/ui/telepathyClient.js:744 |
4979 | +#: ../js/ui/telepathyClient.js:752 |
4980 | #, c-format |
4981 | msgid "%s is busy." |
4982 | msgstr "Kontakt %s je zaneprázdněn." |
4983 | @@ -1283,35 +1304,35 @@ |
4984 | #. Translators: this is a time format string followed by a date. |
4985 | #. If applicable, replace %X with a strftime format valid for your |
4986 | #. locale, without seconds. |
4987 | -#: ../js/ui/telepathyClient.js:978 |
4988 | +#: ../js/ui/telepathyClient.js:986 |
4989 | #, no-c-format |
4990 | msgid "Sent at <b>%X</b> on <b>%A</b>" |
4991 | msgstr "Čas odeslání: <b>%X</b>, den odeslání: <b>%A</b>" |
4992 | |
4993 | #. Translators: this is a time format in the style of "Wednesday, May 25", |
4994 | #. shown when you get a chat message in the same year. |
4995 | -#: ../js/ui/telepathyClient.js:984 |
4996 | +#: ../js/ui/telepathyClient.js:992 |
4997 | #, no-c-format |
4998 | msgid "Sent on <b>%A</b>, <b>%B %d</b>" |
4999 | msgstr "Den odeslání: <b>%A</b>, <b>%e. %B</b>" |
5000 |
The diff has been truncated for viewing.
THe branch looks good, but I don't see any SRU paperwork in either bug, it may also be good to have a metabug for the gnome-shell upstrea stable update, along the lines of what is done for stable release updates for GNOME components. Please see https:/ /wiki.ubuntu. com/StableRelea seUpdates for more info.