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