Compare commits

..

1 Commits

Author SHA1 Message Date
Mario Sanchez Prada
1b7577298a window-tracker: check WM_CLASS for sandboxed apps before the app's ID
For sandboxed apps, the shell needs to consider the app's ID when
matching its windows against the right .desktop file, but that
check can't be done before having attempted to match using the
WM_CLASS property of the app's window, otherwise apps installing
multiple desktop files (e.g. LibreOffice) will always match every
single window against the same .desktop file, ignoring hints such
as the StartupWMClass key.

This commit moves the call to get_app_from_sandboxed_app_id() after
get_app_from_window_wmclass() and before get_app_from_window_pid(),
so that we only rely on the sandboxed app's ID when no match has
succeed using the WM_CLASS property, but before checking by PID to
prevent wrong groups that could be created when the PID of the app
inside the sandbox matches the one from a process outside of it.

Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/219
2018-04-20 14:09:28 +01:00
56 changed files with 1652 additions and 1830 deletions

0
AUTHORS Normal file
View File

View File

@@ -1,16 +1,19 @@
# Coding guide Coding guide
============
Our goal is to have all JavaScript code in GNOME follow a consistent style. In Our goal is to have all JavaScript code in GNOME follow a consistent style. In
a dynamic language like JavaScript, it is essential to be rigorous about style a dynamic language like JavaScript, it is essential to be rigorous about style
(and unit tests), or you rapidly end up with a spaghetti-code mess. (and unit tests), or you rapidly end up with a spaghetti-code mess.
## A quick note A quick note
------------
Life isn't fun if you can't break the rules. If a rule seems unnecessarily Life isn't fun if you can't break the rules. If a rule seems unnecessarily
restrictive while you're coding, ignore it, and let the patch reviewer decide restrictive while you're coding, ignore it, and let the patch reviewer decide
what to do. what to do.
## Indentation and whitespace Indentation and whitespace
--------------------------
Use four-space indents. Braces are on the same line as their associated Use four-space indents. Braces are on the same line as their associated
statements. You should only omit braces if *both* sides of the statement are statements. You should only omit braces if *both* sides of the statement are
@@ -19,7 +22,7 @@ on one line.
* One space after the `function` keyword. No space between the function name * One space after the `function` keyword. No space between the function name
* in a declaration or a call. One space before the parens in the `if` * in a declaration or a call. One space before the parens in the `if`
* statements, or `while`, or `for` loops. * statements, or `while`, or `for` loops.
```javascript
function foo(a, b) { function foo(a, b) {
let bar; let bar;
@@ -36,20 +39,22 @@ on one line.
print(20); print(20);
} }
} }
```
## Semicolons Semicolons
----------
JavaScript allows omitting semicolons at the end of lines, but don't. Always JavaScript allows omitting semicolons at the end of lines, but don't. Always
end statements with a semicolon. end statements with a semicolon.
## js2-mode js2-mode
--------
If using Emacs, do not use js2-mode. It is outdated and hasn't worked for a If using Emacs, do not use js2-mode. It is outdated and hasn't worked for a
while. emacs now has a built-in JavaScript mode, js-mode, based on while. emacs now has a built-in JavaScript mode, js-mode, based on
espresso-mode. It is the de facto emacs mode for JavaScript. espresso-mode. It is the de facto emacs mode for JavaScript.
## File naming and creation File naming and creation
------------------------
For JavaScript files, use lowerCamelCase-style names, with a `.js` extension. For JavaScript files, use lowerCamelCase-style names, with a `.js` extension.
@@ -62,13 +67,14 @@ library name followed by a dash, e.g. `shell-app-system.c`. Create a
`-private.h` header when you want to share code internally in the `-private.h` header when you want to share code internally in the
library. These headers are not installed, distributed or introspected. library. These headers are not installed, distributed or introspected.
## Imports Imports
-------
Use UpperCamelCase when importing modules to distinguish them from ordinary Use UpperCamelCase when importing modules to distinguish them from ordinary
variables, e.g. variables, e.g.
```javascript
const GLib = imports.gi.GLib; const GLib = imports.gi.GLib;
```
Imports should be categorized into one of two places. The top-most import block Imports should be categorized into one of two places. The top-most import block
should contain only "environment imports". These are either modules from should contain only "environment imports". These are either modules from
gobject-introspection or modules added by gjs itself. gobject-introspection or modules added by gjs itself.
@@ -79,7 +85,7 @@ e.g. `imports.ui.popupMenu`.
Each import block should be sorted alphabetically. Don't import modules you Each import block should be sorted alphabetically. Don't import modules you
don't use. don't use.
```javascript
const GLib = imports.gi.GLib; const GLib = imports.gi.GLib;
const Gio = imports.gi.Gio; const Gio = imports.gi.Gio;
const Lang = imports.lang; const Lang = imports.lang;
@@ -89,22 +95,23 @@ don't use.
const Params = imports.misc.params; const Params = imports.misc.params;
const Tweener = imports.ui.tweener; const Tweener = imports.ui.tweener;
const Util = imports.misc.util; const Util = imports.misc.util;
```
The alphabetical ordering should be done independently of the location of the The alphabetical ordering should be done independently of the location of the
location. Never reference `imports` in actual code. location. Never reference `imports` in actual code.
## Constants Constants
---------
We use CONSTANTS_CASE to define constants. All constants should be directly We use CONSTANTS_CASE to define constants. All constants should be directly
under the imports: under the imports:
```javascript
const MY_DBUS_INTERFACE = 'org.my.Interface';
```
## Variable declaration const MY_DBUS_INTERFACE = 'org.my.Interface';
Variable declaration
--------------------
Always use either `const` or `let` when defining a variable. Always use either `const` or `let` when defining a variable.
```javascript
// Iterating over an array // Iterating over an array
for (let i = 0; i < arr.length; ++i) { for (let i = 0; i < arr.length; ++i) {
let item = arr[i]; let item = arr[i];
@@ -114,17 +121,17 @@ Always use either `const` or `let` when defining a variable.
for (let prop in someobj) { for (let prop in someobj) {
... ...
} }
```
If you use "var" then the variable is added to function scope, not block scope. If you use "var" then the variable is added to function scope, not block scope.
See [What's new in JavaScript 1.7](https://developer.mozilla.org/en/JavaScript/New_in_JavaScript/1.7#Block_scope_with_let_%28Merge_into_let_Statement%29) See [What's new in JavaScript 1.7](https://developer.mozilla.org/en/JavaScript/New_in_JavaScript/1.7#Block_scope_with_let_%28Merge_into_let_Statement%29)
## Classes Classes
-------
There are many approaches to classes in JavaScript. We use our own class framework There are many approaches to classes in JavaScript. We use our own class framework
(sigh), which is built in gjs. The advantage is that it supports inheriting from (sigh), which is built in gjs. The advantage is that it supports inheriting from
GObjects, although this feature isn't used very often in the Shell itself. GObjects, although this feature isn't used very often in the Shell itself.
```javascript
var IconLabelMenuItem = new Lang.Class({ var IconLabelMenuItem = new Lang.Class({
Name: 'IconLabelMenuItem', Name: 'IconLabelMenuItem',
Extends: PopupMenu.PopupMenuBaseItem, Extends: PopupMenu.PopupMenuBaseItem,
@@ -139,7 +146,6 @@ GObjects, although this feature isn't used very often in the Shell itself.
log("menu opened!"); log("menu opened!");
} }
}); });
```
* 'Name' is required. 'Extends' is optional. If you leave it out, you will * 'Name' is required. 'Extends' is optional. If you leave it out, you will
automatically inherit from Object. automatically inherit from Object.
@@ -156,12 +162,13 @@ GObjects, although this feature isn't used very often in the Shell itself.
still a giant function call, even though it may resemble a more still a giant function call, even though it may resemble a more
conventional syntax. conventional syntax.
## GObject Introspection GObject Introspection
---------------------
GObject Introspection is a powerful feature that allows us to have native GObject Introspection is a powerful feature that allows us to have native
bindings for almost any library built around GObject. If a library requires bindings for almost any library built around GObject. If a library requires
you to inherit from a type to use it, you can do so: you to inherit from a type to use it, you can do so:
```javascript
var MyClutterActor = new Lang.Class({ var MyClutterActor = new Lang.Class({
Name: 'MyClutterActor', Name: 'MyClutterActor',
Extends: Clutter.Actor, Extends: Clutter.Actor,
@@ -181,9 +188,9 @@ you to inherit from a type to use it, you can do so:
alloc.x2, alloc.y2); alloc.x2, alloc.y2);
} }
}); });
```
## Translatable strings, `environment.js` Translatable strings, `environment.js`
--------------------------------------
We use gettext to translate the GNOME Shell into all the languages that GNOME We use gettext to translate the GNOME Shell into all the languages that GNOME
supports. The `gettext` function is aliased globally as `_`, you do not need to supports. The `gettext` function is aliased globally as `_`, you do not need to
@@ -197,7 +204,8 @@ and "double quotes" for strings that the user may see. This allows us to
quickly find untranslated or mistranslated strings by grepping through the quickly find untranslated or mistranslated strings by grepping through the
sources for double quotes without a gettext call around them. sources for double quotes without a gettext call around them.
## `actor` and `_delegate` `actor` and `_delegate`
-----------------------
gjs allows us to set so-called "expando properties" on introspected objects, gjs allows us to set so-called "expando properties" on introspected objects,
allowing us to treat them like any other. Because the Shell was built before allowing us to treat them like any other. Because the Shell was built before
@@ -206,7 +214,7 @@ that has a property called `actor`. We call this wrapper class the "delegate".
We sometimes use expando properties to set a property called `_delegate` on We sometimes use expando properties to set a property called `_delegate` on
the actor itself: the actor itself:
```javascript
var MyClass = new Lang.Class({ var MyClass = new Lang.Class({
Name: 'MyClass', Name: 'MyClass',
@@ -221,7 +229,6 @@ the actor itself:
actor.set_label("You clicked the button!"); actor.set_label("You clicked the button!");
} }
}); });
```
The 'delegate' property is important for anything which trying to get the The 'delegate' property is important for anything which trying to get the
delegate object from an associated actor. For instance, the drag and drop delegate object from an associated actor. For instance, the drag and drop
@@ -229,14 +236,16 @@ system calls the `handleDragOver` function on the delegate of a "drop target"
when the user drags an item over it. If you do not set the `_delegate` when the user drags an item over it. If you do not set the `_delegate`
property, your actor will not be able to be dropped onto. property, your actor will not be able to be dropped onto.
## Functional style Functional style
----------------
JavaScript Array objects offer a lot of common functional programming JavaScript Array objects offer a lot of common functional programming
capabilities such as forEach, map, filter and so on. You can use these when capabilities such as forEach, map, filter and so on. You can use these when
they make sense, but please don't have a spaghetti mess of function programming they make sense, but please don't have a spaghetti mess of function programming
messed in a procedural style. Use your best judgment. messed in a procedural style. Use your best judgment.
## Closures Closures
--------
`this` will not be captured in a closure, it is relative to how the closure is `this` will not be captured in a closure, it is relative to how the closure is
invoked, not to the value of this where the closure is created, because "this" invoked, not to the value of this where the closure is created, because "this"
@@ -245,16 +254,15 @@ variable that can be captured in closures.
All closures should be wrapped with Function.prototype.bind or use arrow All closures should be wrapped with Function.prototype.bind or use arrow
notation. notation.
```javascript
const Lang = imports.lang; const Lang = imports.lang;
let closure1 = () => { this._fnorbate(); }; let closure1 = () => { this._fnorbate(); };
let closure2 = this._fnorbate.bind(this); let closure2 = this._fnorbate.bind(this);
```
A more realistic example would be connecting to a signal on a method of a A more realistic example would be connecting to a signal on a method of a
prototype: prototype:
```javascript
const Lang = imports.lang; const Lang = imports.lang;
const FnorbLib = imports.fborbLib; const FnorbLib = imports.fborbLib;
@@ -268,21 +276,19 @@ prototype:
this._updateFnorb(); this._updateFnorb();
} }
}); });
```
## Object literal syntax Object literal syntax
---------------------
In JavaScript, these are equivalent: In JavaScript, these are equivalent:
```javascript
foo = { 'bar': 42 }; foo = { 'bar': 42 };
foo = { bar: 42 }; foo = { bar: 42 };
```
and so are these: and so are these:
```javascript
var b = foo['bar']; var b = foo['bar'];
var b = foo.bar; var b = foo.bar;
```
If your usage of an object is like an object, then you're defining "member If your usage of an object is like an object, then you're defining "member
variables." For member variables, use the no-quotes no-brackets syntax: `{ bar: variables." For member variables, use the no-quotes no-brackets syntax: `{ bar:
@@ -292,13 +298,14 @@ If your usage of an object is like a hash table (and thus conceptually the keys
can have special chars in them), don't use quotes, but use brackets: `{ bar: 42 can have special chars in them), don't use quotes, but use brackets: `{ bar: 42
}`, `foo['bar']`. }`, `foo['bar']`.
## Getters, setters, and Tweener Getters, setters, and Tweener
-----------------------------
Getters and setters should be used when you are dealing with an API that is Getters and setters should be used when you are dealing with an API that is
designed around setting properties, like Tweener. If you want to animate an designed around setting properties, like Tweener. If you want to animate an
arbitrary property, create a getter and setter, and use Tweener to animate the arbitrary property, create a getter and setter, and use Tweener to animate the
property. property.
```javascript
var ANIMATION_TIME = 2000; var ANIMATION_TIME = 2000;
var MyClass = new Lang.Class({ var MyClass = new Lang.Class({
@@ -324,4 +331,3 @@ property.
{ position: 100, { position: 100,
time: ANIMATION_TIME, time: ANIMATION_TIME,
transition: 'easeOutQuad' }); transition: 'easeOutQuad' });
```

7
MAINTAINERS Normal file
View File

@@ -0,0 +1,7 @@
Owen Taylor
E-mail: otaylor@redhat.com
Userid: otaylor
Colin Walters
E-mail: walters@verbum.org
Userid: walters

32
NEWS
View File

@@ -1,35 +1,3 @@
3.29.2
======
* Guard against untimely keyboard map changes [Carlos; #240]
* Fix icons in search provider results [Florian; #249]
* Fix blurriness of OSD under some resolutions [Silvère; #782011]
* Fix lagging pointer when zoomed [Daniel; #682013]
* Misc. bug fixes [Milan, Xiaoguang, Florian, Mario, Ole; #244, #787871,
#781471, #136, #214, #294]
Contributors:
Ole Jørgen Brønner, Milan Crha, Carlos Garnacho, Yussuf Khalil,
Silvère Latchurié, Florian Müllner, Mario Sanchez Prada, Ray Strode,
Daniel van Vugt, Xiaoguang Wang
Translators:
Rafael Fontenelle [pt_BR], Kukuh Syafaat [id], Marcos Lans [gl],
Anders Jonsson [sv], Mingcong Bai [zh_CN]
3.29.1
======
* Support icons in app-menu [Florian; #760985]
* Misc. bug fixes [Marco, Florian, Lubomir; #792687, #221, !63]
Contributors:
Piotr Drąg, Takao Fujiwara, Christian Kellner, Florian Müllner,
Mario Sanchez Prada, Lubomir Rintel, Didier Roche, Marco Trevisan (Treviño),
verdre
Translators:
gogo [hr], Stas Solovey [ru], Matej Urbančič [sl], Daniel Șerbănescu [ro],
Fabio Tomat [fur], Marek Cernocky [cs], Daniel Mustieles [es]
3.28.1 3.28.1
====== ======
* Fix compose characters in shell entries [Carlos; #115] * Fix compose characters in shell entries [Carlos; #115]

View File

@@ -1,4 +1,3 @@
# GNOME Shell
GNOME Shell provides core user interface functions for the GNOME 3 desktop, GNOME Shell provides core user interface functions for the GNOME 3 desktop,
like switching to windows and launching applications. GNOME Shell takes like switching to windows and launching applications. GNOME Shell takes
advantage of the capabilities of modern graphics hardware and introduces advantage of the capabilities of modern graphics hardware and introduces
@@ -7,14 +6,15 @@ easy to use experience.
For more information about GNOME Shell, including instructions on how For more information about GNOME Shell, including instructions on how
to build GNOME Shell from source and how to get involved with the project, to build GNOME Shell from source and how to get involved with the project,
see the [project wiki][wiki] see:
Bugs should be reported to the GNOME [bug tracking system][bug-tracker]. https://wiki.gnome.org/Projects/GnomeShell
## License Bugs should be reported at http://bugzilla.gnome.org against the 'gnome-shell'
product.
License
=======
GNOME Shell is distributed under the terms of the GNU General Public License, GNOME Shell is distributed under the terms of the GNU General Public License,
version 2 or later. See the [COPYING][license] file for details. version 2 or later. See the COPYING file for details.
[project-wiki]: https://wiki.gnome.org/Projects/GnomeShell
[bug-tracker]: https://gitlab.gnome.org/GNOME/gnome-shell/issues
[license]: COPYING

View File

@@ -4,14 +4,14 @@ the extensions repository to provide good integration, letting the website
know which extensions are enabled and disabled, and allowing the website to know which extensions are enabled and disabled, and allowing the website to
enable, disable and install them. enable, disable and install them.
Bugs should be reported to the GNOME [bug tracking system][bug-tracker]. Bugs should be reported at http://bugzilla.gnome.org against the 'gnome-shell'
product.
## License License
=======
The GNOME Shell Browser Plugin, like GNOME Shell itself is distributed under The GNOME Shell Browser Plugin, like GNOME Shell itself is distributed under
the GNU General Public License, version 2 or later. The plugin also contains the GNU General Public License, version 2 or later. The plugin also contains
header files from the "NPAPI SDK" project, tri-licensed under MPL 1.1, GPL 2.0 header files from the "NPAPI SDK" project, tri-licensed under MPL 1.1, GPL 2.0
and LGPL 2.1. These headers are third-party sources and can be retrieved from: and LGPL 2.1. These headers are third-party sources and can be retrieved from:
http://code.google.com/p/npapi-sdk/ http://code.google.com/p/npapi-sdk/
[bug-tracker]: https://gitlab.gnome.org/GNOME/gnome-shell/issues

3
data/theme/HACKING Normal file
View File

@@ -0,0 +1,3 @@
To generate the css files, from the project directory:
sass --sourcemap=none --update .

31
data/theme/README Normal file
View File

@@ -0,0 +1,31 @@
Summary
-------
* Do not edit the CSS directly, edit the source SCSS files and the CSS files will be generated
automatically when building with meson + ninja and left inside the build directory to be
incorporated into the gresource XML (you'll need to have sassc installed).
How to tweak the theme
----------------------
Adwaita is a complex theme, so to keep it maintainable it's written and processed in SASS, the
generated CSS is then transformed into a gresource file during gtk build and used at runtime in a
non-legible or editable form.
It is very likely your change will happen in the _common.scss file. That's where all the widget
selectors are defined. Here's a rundown of the "supporting" stylesheets, that are unlikely to be the
right place for a drive by stylesheet fix:
_colors.scss - global color definitions. We keep the number of defined colors to a necessary minimum,
most colors are derived from a handful of basics. It is an exact copy of the gtk+
counterpart. Light theme is used for the classic theme and dark is for GNOME3 shell
default.
_drawing.scss - drawing helper mixings/functions to allow easier definition of widget drawing under
specific context. This is why Adwaita isn't 15000 LOC.
_common.scss - actual definitions of style for each widget. This is where you are likely to add/remove
your changes.
You can read about SASS at http://sass-lang.com/documentation/. Once you make your changes to the
_common.scss file, you can run ninja to generate the final CSS files.

View File

@@ -1,32 +0,0 @@
## Summary
Do not edit the CSS directly, edit the source SCSS files and the CSS files
will be generated automatically when building with meson + ninja and left
inside the build directory to be incorporated into the gresource XML (you'll
need to have sassc installed).
## How to tweak the theme
Adwaita is a complex theme, so to keep it maintainable it's written and
processed in SASS, the generated CSS is then transformed into a gresource
file during gtk build and used at runtime in a non-legible or editable form.
It is very likely your change will happen in the [_common.scss][common] file.
That's where all the widget selectors are defined. Here's a rundown of
the "supporting" stylesheets, that are unlikely to be the right place
for a drive by stylesheet fix:
| File | Description |
| ------------------------ | ----------------- |
| [_colors.scss][colors] | global color definitions. We keep the number of defined colors to a necessary minimum, most colors are derived from a handful of basics. It is an exact copy of the gtk+ counterpart. Light theme is used for the classic theme and dark is for GNOME3 shell default. |
| [_drawing.scss][drawing] | drawing helper mixings/functions to allow easier definition of widget drawing under specific context. This is why Adwaita isn't 15000 LOC. |
| [_common.scss][common] | actual definitions of style for each widget. This is where you are likely to add/remove your changes. |
You can read about SASS on its [web page][sass-web]. Once you make your
changes to the [_common.scss][common] file, you can run ninja to generate the
final CSS files.
[common]: data/theme/gnome-shell-sass/_common.scss
[colors]: data/theme/gnome-shell-sass/_colors.scss
[drawing]: data/theme/gnome-shell-sass/_drawing.scss
[sass-web]: http://sass-lang.com/documentation/

View File

@@ -0,0 +1,6 @@
--- Generating the css file ---
You need sass to generate the css file.
To generate them run from a command line in the project directory:
sass --sourcemap=none --update ./

View File

@@ -0,0 +1,7 @@
GNOME Shell Sass is a project intended to allow the sharing of the theme sources in sass between gnome-shell and other projects like gnome-shell-extensions.
License
=======
GNOME Shell Sass is distributed under the terms of the GNU General Public License,
version 2 or later. See the COPYING file for details.

View File

@@ -1,16 +0,0 @@
# GNOME Shell Sass
GNOME Shell Sass is a project intended to allow the sharing of the
theme sources in sass between gnome-shell and other projects like
gnome-shell-extensions.
Any changes should be done in the [GNOME Shell subtree][shell-subtree]
and not the stand-alone [gnome-shell-sass repository][sass-repo]. They
will then be synchronized periodically before releases.
## License
GNOME Shell Sass is distributed under the terms of the GNU General Public
License, version 2 or later. See the [COPYING][license] file for details.
[shell-subtree]: https://gitlab.gnome.org/GNOME/gnome-shell/tree/master/data/theme/gnome-shell-sass
[sass-repo]: https://gitlab.gnome.org/GNOME/gnome-shell-sass
[license]: COPYING

View File

@@ -733,7 +733,6 @@ StScrollBar {
transition-duration: 500ms; transition-duration: 500ms;
font-weight: bold; font-weight: bold;
height: 1.86em; height: 1.86em;
font-feature-settings: "tnum";
&.unlock-screen, &.unlock-screen,
&.login-screen, &.login-screen,
@@ -959,7 +958,6 @@ StScrollBar {
padding: 0.1em; padding: 0.1em;
margin: 2px; margin: 2px;
border-radius: 1.4em; border-radius: 1.4em;
font-feature-settings: "tnum";
&:hover,&:focus { background-color: lighten($bg_color,5%); } &:hover,&:focus { background-color: lighten($bg_color,5%); }
&:active,&:selected { &:active,&:selected {
color: lighten($selected_fg_color,5%); color: lighten($selected_fg_color,5%);
@@ -1869,7 +1867,6 @@ StScrollBar {
.screen-shield-clock-time { .screen-shield-clock-time {
font-size: 72pt; font-size: 72pt;
text-shadow: 0px 2px 2px rgba(0,0,0,0.4); text-shadow: 0px 2px 2px rgba(0,0,0,0.4);
font-feature-settings: "tnum";
} }
.screen-shield-clock-date { .screen-shield-clock-date {

View File

@@ -89,8 +89,6 @@ var KeyboardManager = new Lang.Class({
}, },
setUserLayouts(ids) { setUserLayouts(ids) {
let currentId = this._current ? this._current.id : null;
let currentGroupIndex = this._current ? this._current.groupIndex : null;
this._current = null; this._current = null;
this._layoutInfos = {}; this._layoutInfos = {};
@@ -117,9 +115,6 @@ var KeyboardManager = new Lang.Class({
info.group = group; info.group = group;
info.groupIndex = groupIndex; info.groupIndex = groupIndex;
if (currentId == id && currentGroupIndex == groupIndex)
this._current = info;
i += 1; i += 1;
} }
}, },

View File

@@ -136,7 +136,8 @@ function run() {
global.frame_finish_timestamp = true; global.frame_finish_timestamp = true;
for (let k = 0; k < 5; k++) for (let k = 0; k < 5; k++)
yield Scripting.createTestWindow({ maximized: true }); yield Scripting.createTestWindow(640, 480,
{ maximized: true });
yield Scripting.waitTestWindows(); yield Scripting.waitTestWindows();
yield Scripting.sleep(1000); yield Scripting.sleep(1000);
@@ -157,7 +158,8 @@ function run() {
yield Scripting.destroyTestWindows(); yield Scripting.destroyTestWindows();
Main.overview.hide(); Main.overview.hide();
yield Scripting.createTestWindow({ maximized: true, yield Scripting.createTestWindow(640, 480,
{ maximized: true,
redraws: true}); redraws: true});
yield Scripting.waitTestWindows(); yield Scripting.waitTestWindows();

View File

@@ -1778,11 +1778,10 @@ var AppIcon = new Lang.Class({
activate(button) { activate(button) {
let event = Clutter.get_current_event(); let event = Clutter.get_current_event();
let modifiers = event ? event.get_state() : 0; let modifiers = event ? event.get_state() : 0;
let isMiddleButton = button && button == Clutter.BUTTON_MIDDLE; let openNewWindow = this.app.can_open_new_window () &&
let isCtrlPressed = (modifiers & Clutter.ModifierType.CONTROL_MASK) != 0; modifiers & Clutter.ModifierType.CONTROL_MASK &&
let openNewWindow = this.app.can_open_new_window() && this.app.state == Shell.AppState.RUNNING ||
this.app.state == Shell.AppState.RUNNING && button && button == 2;
(isCtrlPressed || isMiddleButton);
if (this.app.state == Shell.AppState.STOPPED || openNewWindow) if (this.app.state == Shell.AppState.STOPPED || openNewWindow)
this.animateLaunch(); this.animateLaunch();
@@ -1871,9 +1870,7 @@ var AppIconMenu = new Lang.Class({
this._appendSeparator(); this._appendSeparator();
separatorShown = true; separatorShown = true;
} }
let title = window.title ? window.title let item = this._appendMenuItem(window.title);
: this._source.app.get_name();
let item = this._appendMenuItem(title);
item.connect('activate', () => { item.connect('activate', () => {
this.emit('activate-window', window); this.emit('activate-window', window);
}); });

View File

@@ -2,7 +2,6 @@
const Clutter = imports.gi.Clutter; const Clutter = imports.gi.Clutter;
const Gio = imports.gi.Gio; const Gio = imports.gi.Gio;
const GLib = imports.gi.GLib;
const GObject = imports.gi.GObject; const GObject = imports.gi.GObject;
const Lang = imports.lang; const Lang = imports.lang;
const Meta = imports.gi.Meta; const Meta = imports.gi.Meta;
@@ -14,7 +13,6 @@ const Tweener = imports.ui.tweener;
var FROZEN_WINDOW_BRIGHTNESS = -0.3 var FROZEN_WINDOW_BRIGHTNESS = -0.3
var DIALOG_TRANSITION_TIME = 0.15 var DIALOG_TRANSITION_TIME = 0.15
var ALIVE_TIMEOUT = 5000;
var CloseDialog = new Lang.Class({ var CloseDialog = new Lang.Class({
Name: 'CloseDialog', Name: 'CloseDialog',
@@ -28,7 +26,6 @@ var CloseDialog = new Lang.Class({
this.parent(); this.parent();
this._window = window; this._window = window;
this._dialog = null; this._dialog = null;
this._timeoutId = 0;
}, },
get window() { get window() {
@@ -100,14 +97,6 @@ var CloseDialog = new Lang.Class({
if (this._dialog != null) if (this._dialog != null)
return; return;
Meta.disable_unredirect_for_screen(global.screen);
this._timeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, ALIVE_TIMEOUT,
() => {
this._window.check_alive(global.display.get_current_time_roundtrip());
return GLib.SOURCE_CONTINUE;
});
this._addWindowEffect(); this._addWindowEffect();
this._initDialog(); this._initDialog();
@@ -128,11 +117,6 @@ var CloseDialog = new Lang.Class({
if (this._dialog == null) if (this._dialog == null)
return; return;
Meta.enable_unredirect_for_screen(global.screen);
GLib.source_remove(this._timeoutId);
this._timeoutId = 0;
let dialog = this._dialog; let dialog = this._dialog;
this._dialog = null; this._dialog = null;
this._removeWindowEffect(); this._removeWindowEffect();

View File

@@ -604,17 +604,12 @@ var NetworkAgent = new Lang.Class({
this._native.connect('new-request', this._newRequest.bind(this)); this._native.connect('new-request', this._newRequest.bind(this));
this._native.connect('cancel-request', this._cancelRequest.bind(this)); this._native.connect('cancel-request', this._cancelRequest.bind(this));
try {
this._initialized = false; this._native.init(null);
this._native.init_async(GLib.PRIORITY_DEFAULT, null, (o, res) => { } catch(e) {
try { this._native = null;
this._native.init_finish(res); logError(e, 'error initializing the NetworkManager Agent');
this._initialized = true; }
} catch(e) {
this._native = null;
logError(e, 'error initializing the NetworkManager Agent');
}
});
}, },
enable() { enable() {
@@ -622,7 +617,7 @@ var NetworkAgent = new Lang.Class({
return; return;
this._native.auto_register = true; this._native.auto_register = true;
if (this._initialized && !this._native.registered) if (!this._native.registered)
this._native.register_async(null, null); this._native.register_async(null, null);
}, },
@@ -645,7 +640,7 @@ var NetworkAgent = new Lang.Class({
return; return;
this._native.auto_register = false; this._native.auto_register = false;
if (this._initialized && this._native.registered) if (this._native.registered)
this._native.unregister_async(null, null); this._native.unregister_async(null, null);
}, },
@@ -660,7 +655,7 @@ var NetworkAgent = new Lang.Class({
switch (connectionType) { switch (connectionType) {
case '802-11-wireless': case '802-11-wireless':
let wirelessSetting = connection.get_setting_wireless(); let wirelessSetting = connection.get_setting_wireless();
let ssid = NM.utils_ssid_to_utf8(wirelessSetting.get_ssid().get_data()); let ssid = NM.utils_ssid_to_utf8(wirelessSetting.get_ssid());
title = _("Authentication required by wireless network"); title = _("Authentication required by wireless network");
body = _("Passwords or encryption keys are required to access the wireless network “%s”.").format(ssid); body = _("Passwords or encryption keys are required to access the wireless network “%s”.").format(ssid);
break; break;

View File

@@ -201,9 +201,7 @@ var AuthenticationDialog = new Lang.Class({
close(timestamp) { close(timestamp) {
this.parent(timestamp); this.parent(timestamp);
if (this._sessionUpdatedId) Main.sessionMode.disconnect(this._sessionUpdatedId);
Main.sessionMode.disconnect(this._sessionUpdatedId);
this._sessionUpdatedId = 0;
}, },
_ensureOpen() { _ensureOpen() {

View File

@@ -19,6 +19,7 @@ const MagnifierDBus = imports.ui.magnifierDBus;
const Params = imports.misc.params; const Params = imports.misc.params;
const PointerWatcher = imports.ui.pointerWatcher; const PointerWatcher = imports.ui.pointerWatcher;
var MOUSE_POLL_FREQUENCY = 50;
var CROSSHAIRS_CLIP_SIZE = [100, 100]; var CROSSHAIRS_CLIP_SIZE = [100, 100];
var NO_CHANGE = 0.0; var NO_CHANGE = 0.0;
@@ -151,10 +152,8 @@ var Magnifier = new Lang.Class({
* Turn on mouse tracking, if not already doing so. * Turn on mouse tracking, if not already doing so.
*/ */
startTrackingMouse() { startTrackingMouse() {
if (!this._pointerWatch) { if (!this._pointerWatch)
let interval = 1000 / Clutter.get_default_frame_rate(); this._pointerWatch = PointerWatcher.getPointerWatcher().addWatch(MOUSE_POLL_FREQUENCY, this.scrollToMousePos.bind(this));
this._pointerWatch = PointerWatcher.getPointerWatcher().addWatch(interval, this.scrollToMousePos.bind(this));
}
}, },
/** /**

View File

@@ -14,7 +14,6 @@ const St = imports.gi.St;
const AccessDialog = imports.ui.accessDialog; const AccessDialog = imports.ui.accessDialog;
const AudioDeviceSelection = imports.ui.audioDeviceSelection; const AudioDeviceSelection = imports.ui.audioDeviceSelection;
const Components = imports.ui.components; const Components = imports.ui.components;
const Config = imports.misc.config;
const CtrlAltTab = imports.ui.ctrlAltTab; const CtrlAltTab = imports.ui.ctrlAltTab;
const EndSessionDialog = imports.ui.endSessionDialog; const EndSessionDialog = imports.ui.endSessionDialog;
const Environment = imports.ui.environment; const Environment = imports.ui.environment;
@@ -250,61 +249,26 @@ function _initializeUI() {
}); });
} }
function _findThemeDirByVersion(dir, major, minor, name) {
let path;
let stylesheet;
let subpath;
/* Don't search back to before we introduced this support */
let max_minor = (major == 3) ? 28 : 0;
for (let i = minor; i >= max_minor; i = i - 2) {
subpath = major + '.' + i;
path = GLib.build_filenamev([dir, 'gnome-shell', subpath, 'theme', name]);
stylesheet = Gio.file_new_for_path(path);
log('Checking for ' + path);
if (stylesheet.query_exists(null)) {
log('Using ' + path);
return stylesheet;
}
}
path = GLib.build_filenamev([dir, 'gnome-shell', 'theme', name]);
stylesheet = Gio.file_new_for_path(path);
if (stylesheet.query_exists(null)) {
log('Using unversioned' + path);
return stylesheet;
}
return null;
}
function _getStylesheet(name) { function _getStylesheet(name) {
let stylesheet; let stylesheet;
let [major, minor] = Config.PACKAGE_VERSION.split('.');
// Directories are versioned according to the stable version
if ((minor % 2) == 1)
minor++;
stylesheet = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/' + name); stylesheet = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/' + name);
if (stylesheet.query_exists(null)) { if (stylesheet.query_exists(null))
log('Using built-in default theme ' + name)
return stylesheet; return stylesheet;
}
let dataDirs = GLib.get_system_data_dirs(); let dataDirs = GLib.get_system_data_dirs();
for (let i = 0; i < dataDirs.length; i++) { for (let i = 0; i < dataDirs.length; i++) {
stylesheet = _findThemeDirByVersion(dataDirs[i], major, minor, name) let path = GLib.build_filenamev([dataDirs[i], 'gnome-shell', 'theme', name]);
if (stylesheet != null) let stylesheet = Gio.file_new_for_path(path);
if (stylesheet.query_exists(null))
return stylesheet; return stylesheet;
} }
return _findThemeDirByVersion(global.datadir, major, minor, name); stylesheet = Gio.File.new_for_path(global.datadir + '/theme/' + name);
if (stylesheet.query_exists(null))
return stylesheet;
return null;
} }
function _getDefaultStylesheet() { function _getDefaultStylesheet() {

View File

@@ -27,7 +27,6 @@ function _fixMarkup(text, allowMarkup) {
// Support <b>, <i>, and <u>, escape anything else // Support <b>, <i>, and <u>, escape anything else
// so it displays as raw markup. // so it displays as raw markup.
// Ref: https://developer.gnome.org/notification-spec/#markup
_text = _text.replace(/<(?!\/?[biu]>)/g, '&lt;'); _text = _text.replace(/<(?!\/?[biu]>)/g, '&lt;');
try { try {

View File

@@ -315,10 +315,10 @@ var NotificationApplicationPolicy = new Lang.Class({
// You can add a secondary icon to the banner with 'secondaryGIcon'. There // You can add a secondary icon to the banner with 'secondaryGIcon'. There
// is no fallback for this icon. // is no fallback for this icon.
// //
// If @params contains 'bannerMarkup', with the value %true, a subset (<b>, // If @params contains 'bannerMarkup', with the value %true, then
// <i> and <u>) of the markup in [1] will be interpreted within @banner. If // the corresponding element is assumed to use pango markup. If the
// the parameter is not present, then anything that looks like markup // parameter is not present for an element, then anything that looks
// in @banner will appear literally in the output. // like markup in that element will appear literally in the output.
// //
// If @params contains a 'clear' parameter with the value %true, then // If @params contains a 'clear' parameter with the value %true, then
// the content and the action area of the notification will be cleared. // the content and the action area of the notification will be cleared.
@@ -328,8 +328,6 @@ var NotificationApplicationPolicy = new Lang.Class({
// If @params contains 'soundName' or 'soundFile', the corresponding // If @params contains 'soundName' or 'soundFile', the corresponding
// event sound is played when the notification is shown (if the policy for // event sound is played when the notification is shown (if the policy for
// @source allows playing sounds). // @source allows playing sounds).
//
// [1] https://developer.gnome.org/notification-spec/#markup
var Notification = new Lang.Class({ var Notification = new Lang.Class({
Name: 'Notification', Name: 'Notification',

View File

@@ -204,7 +204,7 @@ var OsdWindow = new Lang.Class({
let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor; let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
this._icon.icon_size = popupSize / (2 * scaleFactor); this._icon.icon_size = popupSize / (2 * scaleFactor);
this._box.translation_y = Math.round(monitor.height / 4); this._box.translation_y = monitor.height / 4;
this._boxConstraint.minSize = popupSize; this._boxConstraint.minSize = popupSize;
} }
}); });

View File

@@ -295,7 +295,7 @@ var RemoteSearchProvider = new Lang.Class({
name: metas[i]['name'], name: metas[i]['name'],
description: metas[i]['description'], description: metas[i]['description'],
createIcon: size => { createIcon: size => {
return this.createIcon(size, metas[i]); this.createIcon(size, metas[i]);
}, },
clipboardText: metas[i]['clipboardText'] }); clipboardText: metas[i]['clipboardText'] });
} }

View File

@@ -133,7 +133,7 @@ function _callRemote(obj, method, ...args) {
* because of the normal X asynchronous mapping process, to actually wait * because of the normal X asynchronous mapping process, to actually wait
* until the window has been mapped and exposed, use waitTestWindows(). * until the window has been mapped and exposed, use waitTestWindows().
*/ */
function createTestWindow(params) { function createTestWindow(width, height, params) {
params = Params.parse(params, { width: 640, params = Params.parse(params, { width: 640,
height: 480, height: 480,
alpha: false, alpha: false,

View File

@@ -995,16 +995,8 @@ var NMWirelessDialog = new Lang.Class({
else if (!oneHasConnection && twoHasConnection) else if (!oneHasConnection && twoHasConnection)
return 1; return 1;
let oneAp = one.accessPoints[0] || null; let oneStrength = one.accessPoints[0].strength;
let twoAp = two.accessPoints[0] || null; let twoStrength = two.accessPoints[0].strength;
if (oneAp != null && twoAp == null)
return -1;
else if (oneAp == null && twoAp != null)
return 1;
let oneStrength = oneAp.strength;
let twoStrength = twoAp.strength;
// place stronger connections first // place stronger connections first
if (oneStrength != twoStrength) if (oneStrength != twoStrength)
@@ -1164,11 +1156,6 @@ var NMWirelessDialog = new Lang.Class({
Util.ensureActorVisibleInScrollView(this._scrollView, network.item.actor); Util.ensureActorVisibleInScrollView(this._scrollView, network.item.actor);
this._selectNetwork(network); this._selectNetwork(network);
}); });
network.item.actor.connect('destroy', () => {
let keyFocus = global.stage.key_focus;
if (keyFocus && keyFocus.contains(network.item.actor))
this._itemBox.grab_key_focus();
});
}, },
}); });
@@ -1957,7 +1944,6 @@ var NMApplet = new Lang.Class({
this.indicators.visible = this._client.nm_running; this.indicators.visible = this._client.nm_running;
this.menu.actor.visible = this._client.networking_enabled; this.menu.actor.visible = this._client.networking_enabled;
this._updateIcon();
this._syncConnectivity(); this._syncConnectivity();
}, },

View File

@@ -49,17 +49,19 @@ const BoltDeviceInterface = '<node> \
</interface> \ </interface> \
</node>'; </node>';
const BoltClientProxy = Gio.DBusProxy.makeProxyWrapper(BoltClientInterface);
const BoltDeviceProxy = Gio.DBusProxy.makeProxyWrapper(BoltDeviceInterface); const BoltDeviceProxy = Gio.DBusProxy.makeProxyWrapper(BoltDeviceInterface);
/* */ /* */
var Status = { var Status = {
DISCONNECTED: 'disconnected', DISCONNECTED: 'disconnected',
CONNECTING: 'connecting',
CONNECTED: 'connected', CONNECTED: 'connected',
AUTHORIZING: 'authorizing', AUTHORIZING: 'authorizing',
AUTH_ERROR: 'auth-error', AUTH_ERROR: 'auth-error',
AUTHORIZED: 'authorized' AUTHORIZED: 'authorized',
AUTHORIZED_SECURE: 'authorized-secure',
AUTHORIZED_NEWKEY: 'authorized-newkey'
}; };
var Policy = { var Policy = {
@@ -68,7 +70,7 @@ var Policy = {
AUTO: 'auto' AUTO: 'auto'
}; };
var AuthCtrl = { var AuthFlags = {
NONE: 'none', NONE: 'none',
}; };
@@ -77,7 +79,6 @@ var AuthMode = {
ENABLED: 'enabled' ENABLED: 'enabled'
}; };
const BOLT_DBUS_CLIENT_IFACE = 'org.freedesktop.bolt1.Manager';
const BOLT_DBUS_NAME = 'org.freedesktop.bolt'; const BOLT_DBUS_NAME = 'org.freedesktop.bolt';
const BOLT_DBUS_PATH = '/org/freedesktop/bolt'; const BOLT_DBUS_PATH = '/org/freedesktop/bolt';
@@ -87,26 +88,22 @@ var Client = new Lang.Class({
_init() { _init() {
this._proxy = null; this._proxy = null;
let nodeInfo = Gio.DBusNodeInfo.new_for_xml(BoltClientInterface); new BoltClientProxy(
Gio.DBusProxy.new(Gio.DBus.system, Gio.DBus.system,
Gio.DBusProxyFlags.DO_NOT_AUTO_START, BOLT_DBUS_NAME,
nodeInfo.lookup_interface(BOLT_DBUS_CLIENT_IFACE), BOLT_DBUS_PATH,
BOLT_DBUS_NAME, this._onProxyReady.bind(this)
BOLT_DBUS_PATH, );
BOLT_DBUS_CLIENT_IFACE,
null,
this._onProxyReady.bind(this));
this.probing = false; this.probing = false;
}, },
_onProxyReady(o, res) { _onProxyReady(proxy, error) {
try { if (error !== null) {
this._proxy = Gio.DBusProxy.new_finish(res); log('error creating bolt proxy: %s'.format(error.message));
} catch(e) { return;
log('error creating bolt proxy: %s'.format(e.message)); }
return; this._proxy = proxy;
}
this._propsChangedId = this._proxy.connect('g-properties-changed', this._onPropertiesChanged.bind(this)); this._propsChangedId = this._proxy.connect('g-properties-changed', this._onPropertiesChanged.bind(this));
this._deviceAddedId = this._proxy.connectSignal('DeviceAdded', this._onDeviceAdded.bind(this)); this._deviceAddedId = this._proxy.connectSignal('DeviceAdded', this._onDeviceAdded.bind(this));
@@ -144,10 +141,9 @@ var Client = new Lang.Class({
}, },
enrollDevice(id, policy, callback) { enrollDevice(id, policy, callback) {
this._proxy.EnrollDeviceRemote(id, policy, AuthCtrl.NONE, this._proxy.EnrollDeviceRemote(id, policy, AuthFlags.NONE,
(res, error) => { (res, error) => {
if (error) { if (error) {
Gio.DBusError.strip_remote_error(error);
callback(null, error); callback(null, error);
return; return;
} }
@@ -232,7 +228,7 @@ var AuthRobot = new Lang.Class({
_onEnrollDone(device, error) { _onEnrollDone(device, error) {
if (error) if (error)
this.emit('enroll-failed', device, error); this.emit('enroll-failed', error, device);
/* TODO: scan the list of devices to be authorized for children /* TODO: scan the list of devices to be authorized for children
* of this device and remove them (and their children and * of this device and remove them (and their children and

View File

@@ -24,7 +24,7 @@ const EdgeDragAction = imports.ui.edgeDragAction;
const CloseDialog = imports.ui.closeDialog; const CloseDialog = imports.ui.closeDialog;
const SwitchMonitor = imports.ui.switchMonitor; const SwitchMonitor = imports.ui.switchMonitor;
var SHELL_KEYBINDINGS_SCHEMA = 'org.gnome.shell.keybindings'; const SHELL_KEYBINDINGS_SCHEMA = 'org.gnome.shell.keybindings';
var MINIMIZE_WINDOW_ANIMATION_TIME = 0.2; var MINIMIZE_WINDOW_ANIMATION_TIME = 0.2;
var SHOW_WINDOW_ANIMATION_TIME = 0.15; var SHOW_WINDOW_ANIMATION_TIME = 0.15;
var DIALOG_SHOW_WINDOW_ANIMATION_TIME = 0.1; var DIALOG_SHOW_WINDOW_ANIMATION_TIME = 0.1;

View File

@@ -447,13 +447,12 @@ var WindowOverlay = new Lang.Class({
this.border = new St.Bin({ style_class: 'window-clone-border' }); this.border = new St.Bin({ style_class: 'window-clone-border' });
let title = new St.Label({ style_class: 'window-caption', let title = new St.Label({ style_class: 'window-caption',
text: this._getCaption() }); text: metaWindow.title });
title.clutter_text.ellipsize = Pango.EllipsizeMode.END; title.clutter_text.ellipsize = Pango.EllipsizeMode.END;
windowClone.actor.label_actor = title; windowClone.actor.label_actor = title;
this._updateCaptionId = metaWindow.connect('notify::title', w => { this._updateCaptionId = metaWindow.connect('notify::title', w => {
this.title.text = w.title; this.title.text = w.title;
this.title.text = this._getCaption();
this.relayout(false); this.relayout(false);
}); });
@@ -566,16 +565,6 @@ var WindowOverlay = new Lang.Class({
} }
}, },
_getCaption() {
let metaWindow = this._windowClone.metaWindow;
if (metaWindow.title)
return metaWindow.title;
let tracker = Shell.WindowTracker.get_default();
let app = tracker.get_window_app(metaWindow);
return app.get_name();
},
_animateOverlayActor(actor, x, y, width, height) { _animateOverlayActor(actor, x, y, width, height) {
let params = { x: x, let params = { x: x,
y: y, y: y,

View File

@@ -31,7 +31,7 @@ var WORKSPACE_CUT_SIZE = 10;
var WORKSPACE_KEEP_ALIVE_TIME = 100; var WORKSPACE_KEEP_ALIVE_TIME = 100;
var OVERRIDE_SCHEMA = 'org.gnome.shell.overrides'; const OVERRIDE_SCHEMA = 'org.gnome.shell.overrides';
/* A layout manager that requests size only for primary_actor, but then allocates /* A layout manager that requests size only for primary_actor, but then allocates
all using a fixed layout */ all using a fixed layout */
@@ -241,7 +241,7 @@ var WindowClone = new Lang.Class({
Signals.addSignalMethods(WindowClone.prototype); Signals.addSignalMethods(WindowClone.prototype);
var ThumbnailState = { const ThumbnailState = {
NEW : 0, NEW : 0,
ANIMATING_IN : 1, ANIMATING_IN : 1,
NORMAL: 2, NORMAL: 2,
@@ -884,9 +884,6 @@ var ThumbnailsBox = new Lang.Class({
}, },
_destroyThumbnails() { _destroyThumbnails() {
if (this._thumbnails.length == 0)
return;
if (this._switchWorkspaceNotifyId > 0) { if (this._switchWorkspaceNotifyId > 0) {
global.window_manager.disconnect(this._switchWorkspaceNotifyId); global.window_manager.disconnect(this._switchWorkspaceNotifyId);
this._switchWorkspaceNotifyId = 0; this._switchWorkspaceNotifyId = 0;

View File

@@ -1,5 +1,5 @@
project('gnome-shell', 'c', project('gnome-shell', 'c',
version: '3.29.2', version: '3.28.1',
meson_version: '>= 0.42.0', meson_version: '>= 0.42.0',
license: 'GPLv2+' license: 'GPLv2+'
) )
@@ -23,7 +23,7 @@ gi_req = '>= 1.49.1'
gjs_req = '>= 1.47.0' gjs_req = '>= 1.47.0'
gtk_req = '>= 3.15.0' gtk_req = '>= 3.15.0'
json_glib_req = '>= 0.13.2' json_glib_req = '>= 0.13.2'
mutter_req = '>= 3.29.2' mutter_req = '>= 3.28.0'
polkit_req = '>= 0.100' polkit_req = '>= 0.100'
schemas_req = '>= 3.21.3' schemas_req = '>= 3.21.3'
startup_req = '>= 0.11' startup_req = '>= 0.11'
@@ -31,7 +31,7 @@ ibus_req = '>= 1.5.2'
bt_req = '>= 3.9.0' bt_req = '>= 3.9.0'
gst_req = '>= 0.11.92' gst_req = '>= 0.11.92'
nm_req = '>= 1.10.4' nm_req = '>= 0.9.8'
secret_req = '>= 0.18' secret_req = '>= 0.18'
gnome = import('gnome') gnome = import('gnome')

View File

@@ -11,8 +11,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnome-shell\n" "Project-Id-Version: gnome-shell\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
"POT-Creation-Date: 2018-04-13 19:54+0000\n" "POT-Creation-Date: 2018-02-26 12:57+0000\n"
"PO-Revision-Date: 2018-04-24 17:32+0200\n" "PO-Revision-Date: 2018-02-26 17:57+0100\n"
"Last-Translator: Marek Černocký <marek@manet.cz>\n" "Last-Translator: Marek Černocký <marek@manet.cz>\n"
"Language-Team: čeština <gnome-cs-list@gnome.org>\n" "Language-Team: čeština <gnome-cs-list@gnome.org>\n"
"Language: cs\n" "Language: cs\n"
@@ -332,7 +332,7 @@ msgstr ""
"Nastala chyba při načítání dialogového okna předvoleb pro rozšíření %s:" "Nastala chyba při načítání dialogového okna předvoleb pro rozšíření %s:"
#: js/gdm/authPrompt.js:147 js/ui/audioDeviceSelection.js:71 #: js/gdm/authPrompt.js:147 js/ui/audioDeviceSelection.js:71
#: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:153 #: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:148
#: js/ui/endSessionDialog.js:482 js/ui/extensionDownloader.js:197 #: js/ui/endSessionDialog.js:482 js/ui/extensionDownloader.js:197
#: js/ui/shellMountOperation.js:343 js/ui/status/network.js:919 #: js/ui/shellMountOperation.js:343 js/ui/status/network.js:919
msgid "Cancel" msgid "Cancel"
@@ -667,12 +667,12 @@ msgstr "Přidat mezi oblíbené"
msgid "Show Details" msgid "Show Details"
msgstr "Zobrazit podrobnosti" msgstr "Zobrazit podrobnosti"
#: js/ui/appFavorites.js:140 #: js/ui/appFavorites.js:138
#, javascript-format #, javascript-format
msgid "%s has been added to your favorites." msgid "%s has been added to your favorites."
msgstr "%s byl přidán mezi oblíbené." msgstr "%s byl přidán mezi oblíbené."
#: js/ui/appFavorites.js:174 #: js/ui/appFavorites.js:172
#, javascript-format #, javascript-format
msgid "%s has been removed from your favorites." msgid "%s has been removed from your favorites."
msgstr "%s byl odstraněn z oblíbených." msgstr "%s byl odstraněn z oblíbených."
@@ -867,7 +867,7 @@ msgstr "Externí svazek odpojen"
msgid "Open with %s" msgid "Open with %s"
msgstr "Otevřít pomocí %s" msgstr "Otevřít pomocí %s"
#: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:295 #: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:284
msgid "Password:" msgid "Password:"
msgstr "Heslo:" msgstr "Heslo:"
@@ -955,15 +955,15 @@ msgstr "Pro připojení k „%s“ je vyžadováno heslo."
msgid "Network Manager" msgid "Network Manager"
msgstr "Network Manager" msgstr "Network Manager"
#: js/ui/components/polkitAgent.js:48 #: js/ui/components/polkitAgent.js:43
msgid "Authentication Required" msgid "Authentication Required"
msgstr "Je vyžadováno ověření" msgstr "Je vyžadováno ověření"
#: js/ui/components/polkitAgent.js:76 #: js/ui/components/polkitAgent.js:71
msgid "Administrator" msgid "Administrator"
msgstr "Správce" msgstr "Správce"
#: js/ui/components/polkitAgent.js:156 #: js/ui/components/polkitAgent.js:151
msgid "Authenticate" msgid "Authenticate"
msgstr "Ověřit" msgstr "Ověřit"
@@ -971,7 +971,7 @@ msgstr "Ověřit"
#. * requested authentication was not gained; this can happen #. * requested authentication was not gained; this can happen
#. * because of an authentication error (like invalid password), #. * because of an authentication error (like invalid password),
#. * for instance. #. * for instance.
#: js/ui/components/polkitAgent.js:281 js/ui/shellMountOperation.js:327 #: js/ui/components/polkitAgent.js:270 js/ui/shellMountOperation.js:327
msgid "Sorry, that didnt work. Please try again." msgid "Sorry, that didnt work. Please try again."
msgstr "Ověření bohužel nebylo úspěšné. Zkuste to prosím znovu." msgstr "Ověření bohužel nebylo úspěšné. Zkuste to prosím znovu."
@@ -1021,7 +1021,7 @@ msgstr "Přidat světový čas…"
msgid "World Clocks" msgid "World Clocks"
msgstr "Světové hodiny" msgstr "Světové hodiny"
#: js/ui/dateMenu.js:227 #: js/ui/dateMenu.js:225
msgid "Weather" msgid "Weather"
msgstr "Počasí" msgstr "Počasí"
@@ -1029,7 +1029,7 @@ msgstr "Počasí"
#. libgweather for the possible condition strings. If at all #. libgweather for the possible condition strings. If at all
#. possible, the sentence should match the grammatical case etc. of #. possible, the sentence should match the grammatical case etc. of
#. the inserted conditions. #. the inserted conditions.
#: js/ui/dateMenu.js:291 #: js/ui/dateMenu.js:289
#, javascript-format #, javascript-format
msgid "%s all day." msgid "%s all day."
msgstr "%s celý den." msgstr "%s celý den."
@@ -1038,7 +1038,7 @@ msgstr "%s celý den."
#. libgweather for the possible condition strings. If at all #. libgweather for the possible condition strings. If at all
#. possible, the sentence should match the grammatical case etc. of #. possible, the sentence should match the grammatical case etc. of
#. the inserted conditions. #. the inserted conditions.
#: js/ui/dateMenu.js:297 #: js/ui/dateMenu.js:295
#, javascript-format #, javascript-format
msgid "%s, then %s later." msgid "%s, then %s later."
msgstr "%s, později %s." msgstr "%s, později %s."
@@ -1047,30 +1047,30 @@ msgstr "%s, později %s."
#. libgweather for the possible condition strings. If at all #. libgweather for the possible condition strings. If at all
#. possible, the sentence should match the grammatical case etc. of #. possible, the sentence should match the grammatical case etc. of
#. the inserted conditions. #. the inserted conditions.
#: js/ui/dateMenu.js:303 #: js/ui/dateMenu.js:301
#, javascript-format #, javascript-format
msgid "%s, then %s, followed by %s later." msgid "%s, then %s, followed by %s later."
msgstr "%s, pak %s a později %s." msgstr "%s, pak %s a později %s."
#: js/ui/dateMenu.js:314 #: js/ui/dateMenu.js:312
msgid "Select a location…" msgid "Select a location…"
msgstr "Vybrat místo…" msgstr "Vybrat místo…"
#: js/ui/dateMenu.js:317 #: js/ui/dateMenu.js:315
msgid "Loading…" msgid "Loading…"
msgstr "Načítá se…" msgstr "Načítá se…"
#. Translators: %s is a temperature with unit, e.g. "23℃" #. Translators: %s is a temperature with unit, e.g. "23℃"
#: js/ui/dateMenu.js:323 #: js/ui/dateMenu.js:321
#, javascript-format #, javascript-format
msgid "Feels like %s." msgid "Feels like %s."
msgstr "Pocitově jako %s." msgstr "Pocitově jako %s."
#: js/ui/dateMenu.js:326 #: js/ui/dateMenu.js:324
msgid "Go online for weather information" msgid "Go online for weather information"
msgstr "Připojit se kvůli informacím o počasí" msgstr "Připojit se kvůli informacím o počasí"
#: js/ui/dateMenu.js:328 #: js/ui/dateMenu.js:326
msgid "Weather information is currently unavailable" msgid "Weather information is currently unavailable"
msgstr "Informace o počasí nejsou nyní dostupné" msgstr "Informace o počasí nejsou nyní dostupné"
@@ -1986,16 +1986,16 @@ msgstr "Uspat do paměti"
msgid "Power Off" msgid "Power Off"
msgstr "Vypnout" msgstr "Vypnout"
#: js/ui/status/thunderbolt.js:294 #: js/ui/status/thunderbolt.js:272
msgid "Thunderbolt" msgid "Thunderbolt"
msgstr "Thunderbolt" msgstr "Thunderbolt"
#. we are done #. we are done
#: js/ui/status/thunderbolt.js:350 #: js/ui/status/thunderbolt.js:328
msgid "Unknown Thunderbolt device" msgid "Unknown Thunderbolt device"
msgstr "Neznámé zařízení Thunderbolt" msgstr "Neznámé zařízení Thunderbolt"
#: js/ui/status/thunderbolt.js:351 #: js/ui/status/thunderbolt.js:329
msgid "" msgid ""
"New device has been detected while you were away. Please disconnect and " "New device has been detected while you were away. Please disconnect and "
"reconnect the device to start using it." "reconnect the device to start using it."
@@ -2003,13 +2003,13 @@ msgstr ""
"Zatímco jste byli pryč, bylo nalezeno nové zařízení. Odpojte jej prosím a " "Zatímco jste byli pryč, bylo nalezeno nové zařízení. Odpojte jej prosím a "
"znovu připojte, abyste jej mohli používat." "znovu připojte, abyste jej mohli používat."
#: js/ui/status/thunderbolt.js:356 #: js/ui/status/thunderbolt.js:334
msgid "Thunderbolt authorization error" msgid "Thunderbolt authorization error"
msgstr "Chyba ověření Thunderbolt" msgstr "Chyba ověření Thunderbolt"
#: js/ui/status/thunderbolt.js:357 #: js/ui/status/thunderbolt.js:335
#, javascript-format #, javascript-format
msgid "Could not authorize the Thunderbolt device: %s" msgid "Could not authorize the thunderbolt device: %s"
msgstr "Nezdařilo se provést ověření zařízení Thunderbolt: %s" msgstr "Nezdařilo se provést ověření zařízení Thunderbolt: %s"
#: js/ui/status/volume.js:128 #: js/ui/status/volume.js:128
@@ -2233,3 +2233,15 @@ msgstr[2] "%u vstupů"
#: subprojects/gvc/gvc-mixer-control.c:2738 #: subprojects/gvc/gvc-mixer-control.c:2738
msgid "System Sounds" msgid "System Sounds"
msgstr "Systémové zvuky" msgstr "Systémové zvuky"
#~ msgctxt "search-result"
#~ msgid "Power off"
#~ msgstr "Vypnout"
#~ msgctxt "search-result"
#~ msgid "Log out"
#~ msgstr "Odhlásit se"
#~ msgctxt "search-result"
#~ msgid "Switch user"
#~ msgstr "Přepnout uživatele"

View File

@@ -9,8 +9,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnome-shell.master\n" "Project-Id-Version: gnome-shell.master\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
"POT-Creation-Date: 2018-04-13 19:54+0000\n" "POT-Creation-Date: 2018-02-22 09:24+0000\n"
"PO-Revision-Date: 2018-04-25 12:54+0200\n" "PO-Revision-Date: 2018-02-23 08:26+0100\n"
"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n" "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
"Language-Team: es <gnome-es-list@gnome.org>\n" "Language-Team: es <gnome-es-list@gnome.org>\n"
"Language: es\n" "Language: es\n"
@@ -346,7 +346,7 @@ msgid "There was an error loading the preferences dialog for %s:"
msgstr "Hubo un error al lanzar el diálogo de preferencias para %s:" msgstr "Hubo un error al lanzar el diálogo de preferencias para %s:"
#: js/gdm/authPrompt.js:147 js/ui/audioDeviceSelection.js:71 #: js/gdm/authPrompt.js:147 js/ui/audioDeviceSelection.js:71
#: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:153 #: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:148
#: js/ui/endSessionDialog.js:482 js/ui/extensionDownloader.js:197 #: js/ui/endSessionDialog.js:482 js/ui/extensionDownloader.js:197
#: js/ui/shellMountOperation.js:343 js/ui/status/network.js:919 #: js/ui/shellMountOperation.js:343 js/ui/status/network.js:919
msgid "Cancel" msgid "Cancel"
@@ -665,12 +665,12 @@ msgstr "Añadir a los favoritos"
msgid "Show Details" msgid "Show Details"
msgstr "Mostrar detalles" msgstr "Mostrar detalles"
#: js/ui/appFavorites.js:140 #: js/ui/appFavorites.js:138
#, javascript-format #, javascript-format
msgid "%s has been added to your favorites." msgid "%s has been added to your favorites."
msgstr "Se ha añadido %s a sus favoritos." msgstr "Se ha añadido %s a sus favoritos."
#: js/ui/appFavorites.js:174 #: js/ui/appFavorites.js:172
#, javascript-format #, javascript-format
msgid "%s has been removed from your favorites." msgid "%s has been removed from your favorites."
msgstr "Se ha quitado %s de sus favoritos." msgstr "Se ha quitado %s de sus favoritos."
@@ -865,7 +865,7 @@ msgstr "Dispositivo externo desconectado"
msgid "Open with %s" msgid "Open with %s"
msgstr "Abrir con %s" msgstr "Abrir con %s"
#: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:295 #: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:284
msgid "Password:" msgid "Password:"
msgstr "Contraseña:" msgstr "Contraseña:"
@@ -953,15 +953,15 @@ msgstr "Se requiere una contraseña para conectarse a «%s»."
msgid "Network Manager" msgid "Network Manager"
msgstr "Gestor de la red" msgstr "Gestor de la red"
#: js/ui/components/polkitAgent.js:48 #: js/ui/components/polkitAgent.js:43
msgid "Authentication Required" msgid "Authentication Required"
msgstr "Se necesita autenticación" msgstr "Se necesita autenticación"
#: js/ui/components/polkitAgent.js:76 #: js/ui/components/polkitAgent.js:71
msgid "Administrator" msgid "Administrator"
msgstr "Administrador" msgstr "Administrador"
#: js/ui/components/polkitAgent.js:156 #: js/ui/components/polkitAgent.js:151
msgid "Authenticate" msgid "Authenticate"
msgstr "Autenticar" msgstr "Autenticar"
@@ -969,7 +969,7 @@ msgstr "Autenticar"
#. * requested authentication was not gained; this can happen #. * requested authentication was not gained; this can happen
#. * because of an authentication error (like invalid password), #. * because of an authentication error (like invalid password),
#. * for instance. #. * for instance.
#: js/ui/components/polkitAgent.js:281 js/ui/shellMountOperation.js:327 #: js/ui/components/polkitAgent.js:270 js/ui/shellMountOperation.js:327
msgid "Sorry, that didnt work. Please try again." msgid "Sorry, that didnt work. Please try again."
msgstr "Eso no ha funcionado. Inténtelo de nuevo." msgstr "Eso no ha funcionado. Inténtelo de nuevo."
@@ -1017,7 +1017,7 @@ msgstr "Añadir relojes del mundo…"
msgid "World Clocks" msgid "World Clocks"
msgstr "Relojes del mundo" msgstr "Relojes del mundo"
#: js/ui/dateMenu.js:227 #: js/ui/dateMenu.js:225
msgid "Weather" msgid "Weather"
msgstr "Meteorología" msgstr "Meteorología"
@@ -1025,7 +1025,7 @@ msgstr "Meteorología"
#. libgweather for the possible condition strings. If at all #. libgweather for the possible condition strings. If at all
#. possible, the sentence should match the grammatical case etc. of #. possible, the sentence should match the grammatical case etc. of
#. the inserted conditions. #. the inserted conditions.
#: js/ui/dateMenu.js:291 #: js/ui/dateMenu.js:289
#, javascript-format #, javascript-format
msgid "%s all day." msgid "%s all day."
msgstr "%s todo el día." msgstr "%s todo el día."
@@ -1034,7 +1034,7 @@ msgstr "%s todo el día."
#. libgweather for the possible condition strings. If at all #. libgweather for the possible condition strings. If at all
#. possible, the sentence should match the grammatical case etc. of #. possible, the sentence should match the grammatical case etc. of
#. the inserted conditions. #. the inserted conditions.
#: js/ui/dateMenu.js:297 #: js/ui/dateMenu.js:295
#, javascript-format #, javascript-format
msgid "%s, then %s later." msgid "%s, then %s later."
msgstr "%s, luego %s." msgstr "%s, luego %s."
@@ -1043,30 +1043,30 @@ msgstr "%s, luego %s."
#. libgweather for the possible condition strings. If at all #. libgweather for the possible condition strings. If at all
#. possible, the sentence should match the grammatical case etc. of #. possible, the sentence should match the grammatical case etc. of
#. the inserted conditions. #. the inserted conditions.
#: js/ui/dateMenu.js:303 #: js/ui/dateMenu.js:301
#, javascript-format #, javascript-format
msgid "%s, then %s, followed by %s later." msgid "%s, then %s, followed by %s later."
msgstr "%s, luego %s seguido de %s." msgstr "%s, luego %s seguido de %s."
#: js/ui/dateMenu.js:314 #: js/ui/dateMenu.js:312
msgid "Select a location…" msgid "Select a location…"
msgstr "Seleccionar ubicación…" msgstr "Seleccionar ubicación…"
#: js/ui/dateMenu.js:317 #: js/ui/dateMenu.js:315
msgid "Loading…" msgid "Loading…"
msgstr "Cargando…" msgstr "Cargando…"
#. Translators: %s is a temperature with unit, e.g. "23℃" #. Translators: %s is a temperature with unit, e.g. "23℃"
#: js/ui/dateMenu.js:323 #: js/ui/dateMenu.js:321
#, javascript-format #, javascript-format
msgid "Feels like %s." msgid "Feels like %s."
msgstr "Sensación térmica de %s." msgstr "Sensación térmica de %s."
#: js/ui/dateMenu.js:326 #: js/ui/dateMenu.js:324
msgid "Go online for weather information" msgid "Go online for weather information"
msgstr "Conectarse para obtener la información meteorológica" msgstr "Conectarse para obtener la información meteorológica"
#: js/ui/dateMenu.js:328 #: js/ui/dateMenu.js:326
msgid "Weather information is currently unavailable" msgid "Weather information is currently unavailable"
msgstr "La información meteorológica no está disponible actualmente." msgstr "La información meteorológica no está disponible actualmente."
@@ -1968,16 +1968,16 @@ msgstr "Suspender"
msgid "Power Off" msgid "Power Off"
msgstr "Apagar" msgstr "Apagar"
#: js/ui/status/thunderbolt.js:294 #: js/ui/status/thunderbolt.js:272
msgid "Thunderbolt" msgid "Thunderbolt"
msgstr "Thunderbolt" msgstr "Thunderbolt"
#. we are done #. we are done
#: js/ui/status/thunderbolt.js:350 #: js/ui/status/thunderbolt.js:328
msgid "Unknown Thunderbolt device" msgid "Unknown Thunderbolt device"
msgstr "Dispositivo Thunderbolt desconocido" msgstr "Dispositivo Thunderbolt desconocido"
#: js/ui/status/thunderbolt.js:351 #: js/ui/status/thunderbolt.js:329
msgid "" msgid ""
"New device has been detected while you were away. Please disconnect and " "New device has been detected while you were away. Please disconnect and "
"reconnect the device to start using it." "reconnect the device to start using it."
@@ -1985,14 +1985,13 @@ msgstr ""
"Se ha detectado un dispositivo nuevo mientras estaba fuera. Desconéctelo y " "Se ha detectado un dispositivo nuevo mientras estaba fuera. Desconéctelo y "
"vuélvalo a conectar para empezar a usarlo." "vuélvalo a conectar para empezar a usarlo."
#: js/ui/status/thunderbolt.js:356 #: js/ui/status/thunderbolt.js:334
msgid "Thunderbolt authorization error" msgid "Thunderbolt authorization error"
msgstr "Error de autorización de Thunderbolt" msgstr "Error de autorización de Thunderbolt"
#: js/ui/status/thunderbolt.js:357 #: js/ui/status/thunderbolt.js:335
#, javascript-format #, javascript-format
#| msgid "Could not authorize the thunderbolt device: %s" msgid "Could not authorize the thunderbolt device: %s"
msgid "Could not authorize the Thunderbolt device: %s"
msgstr "No se pudo autorizar el dispositivo Thunderbolt: %s" msgstr "No se pudo autorizar el dispositivo Thunderbolt: %s"
#: js/ui/status/volume.js:128 #: js/ui/status/volume.js:128

368
po/fur.po

File diff suppressed because it is too large Load Diff

757
po/gd.po

File diff suppressed because it is too large Load Diff

418
po/gl.po

File diff suppressed because it is too large Load Diff

368
po/id.po

File diff suppressed because it is too large Load Diff

View File

@@ -15,22 +15,22 @@
# Georges Basile Stavracas Neto <georges.stavracas@gmail.com>, 2014. # Georges Basile Stavracas Neto <georges.stavracas@gmail.com>, 2014.
# Felipe Braga <fbobraga@gmail.com>, 2015. # Felipe Braga <fbobraga@gmail.com>, 2015.
# Artur de Aquino Morais <artur.morais93@outlook.com>, 2016. # Artur de Aquino Morais <artur.morais93@outlook.com>, 2016.
# Rafael Fontenelle <rafaelff@gnome.org>, 2013-2018. # Rafael Fontenelle <rafaelff@gnome.org>, 2013-2017.
# Enrico Nicoletto <liverig@gmail.com>, 2013-2018. # Enrico Nicoletto <liverig@gmail.com>, 2013-2018.
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnome-shell\n" "Project-Id-Version: gnome-shell\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
"POT-Creation-Date: 2018-04-13 18:31+0000\n" "POT-Creation-Date: 2018-03-16 21:34+0000\n"
"PO-Revision-Date: 2018-05-02 15:45-0200\n" "PO-Revision-Date: 2018-02-09 21:52-0200\n"
"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n" "Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
"Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n" "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
"Language: pt_BR\n" "Language: pt_BR\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Virtaal 1.0.0-beta1\n" "X-Generator: Poedit 2.0.6\n"
"X-Project-Style: gnome\n" "X-Project-Style: gnome\n"
#: data/50-gnome-shell-system.xml:6 #: data/50-gnome-shell-system.xml:6
@@ -356,7 +356,7 @@ msgid "There was an error loading the preferences dialog for %s:"
msgstr "Ocorreu um erro ao carregar o dialogo de preferências para %s:" msgstr "Ocorreu um erro ao carregar o dialogo de preferências para %s:"
#: js/gdm/authPrompt.js:147 js/ui/audioDeviceSelection.js:71 #: js/gdm/authPrompt.js:147 js/ui/audioDeviceSelection.js:71
#: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:153 #: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:148
#: js/ui/endSessionDialog.js:482 js/ui/extensionDownloader.js:197 #: js/ui/endSessionDialog.js:482 js/ui/extensionDownloader.js:197
#: js/ui/shellMountOperation.js:343 js/ui/status/network.js:919 #: js/ui/shellMountOperation.js:343 js/ui/status/network.js:919
msgid "Cancel" msgid "Cancel"
@@ -642,7 +642,7 @@ msgstr "Negar acesso"
#: js/ui/accessDialog.js:64 js/ui/status/location.js:396 #: js/ui/accessDialog.js:64 js/ui/status/location.js:396
msgid "Grant Access" msgid "Grant Access"
msgstr "Conceder acesso" msgstr "Garantir acesso"
#: js/ui/appDisplay.js:793 #: js/ui/appDisplay.js:793
msgid "Frequently used applications will appear here" msgid "Frequently used applications will appear here"
@@ -676,12 +676,12 @@ msgstr "Adicionar aos favoritos"
msgid "Show Details" msgid "Show Details"
msgstr "Mostrar detalhes" msgstr "Mostrar detalhes"
#: js/ui/appFavorites.js:140 #: js/ui/appFavorites.js:138
#, javascript-format #, javascript-format
msgid "%s has been added to your favorites." msgid "%s has been added to your favorites."
msgstr "%s foi adicionado aos seus favoritos." msgstr "%s foi adicionado aos seus favoritos."
#: js/ui/appFavorites.js:174 #: js/ui/appFavorites.js:172
#, javascript-format #, javascript-format
msgid "%s has been removed from your favorites." msgid "%s has been removed from your favorites."
msgstr "%s foi removido dos seus favoritos." msgstr "%s foi removido dos seus favoritos."
@@ -876,7 +876,7 @@ msgstr "Unidade externa desconectada"
msgid "Open with %s" msgid "Open with %s"
msgstr "Abrir com %s" msgstr "Abrir com %s"
#: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:295 #: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:284
msgid "Password:" msgid "Password:"
msgstr "Senha:" msgstr "Senha:"
@@ -964,15 +964,15 @@ msgstr "Uma senha é necessária para se conectar a “%s”."
msgid "Network Manager" msgid "Network Manager"
msgstr "Gerenciador de rede" msgstr "Gerenciador de rede"
#: js/ui/components/polkitAgent.js:48 #: js/ui/components/polkitAgent.js:43
msgid "Authentication Required" msgid "Authentication Required"
msgstr "Autenticação necessária" msgstr "Autenticação necessária"
#: js/ui/components/polkitAgent.js:76 #: js/ui/components/polkitAgent.js:71
msgid "Administrator" msgid "Administrator"
msgstr "Administrador" msgstr "Administrador"
#: js/ui/components/polkitAgent.js:156 #: js/ui/components/polkitAgent.js:151
msgid "Authenticate" msgid "Authenticate"
msgstr "Autenticação" msgstr "Autenticação"
@@ -980,7 +980,7 @@ msgstr "Autenticação"
#. * requested authentication was not gained; this can happen #. * requested authentication was not gained; this can happen
#. * because of an authentication error (like invalid password), #. * because of an authentication error (like invalid password),
#. * for instance. #. * for instance.
#: js/ui/components/polkitAgent.js:281 js/ui/shellMountOperation.js:327 #: js/ui/components/polkitAgent.js:270 js/ui/shellMountOperation.js:327
msgid "Sorry, that didnt work. Please try again." msgid "Sorry, that didnt work. Please try again."
msgstr "Desculpe, isto não funcionou. Por favor, tente novamente." msgstr "Desculpe, isto não funcionou. Por favor, tente novamente."
@@ -1028,7 +1028,7 @@ msgstr "Adicionar relógios mundiais…"
msgid "World Clocks" msgid "World Clocks"
msgstr "Relógios mundiais" msgstr "Relógios mundiais"
#: js/ui/dateMenu.js:227 #: js/ui/dateMenu.js:225
msgid "Weather" msgid "Weather"
msgstr "Meteorologia" msgstr "Meteorologia"
@@ -1036,7 +1036,7 @@ msgstr "Meteorologia"
#. libgweather for the possible condition strings. If at all #. libgweather for the possible condition strings. If at all
#. possible, the sentence should match the grammatical case etc. of #. possible, the sentence should match the grammatical case etc. of
#. the inserted conditions. #. the inserted conditions.
#: js/ui/dateMenu.js:291 #: js/ui/dateMenu.js:289
#, javascript-format #, javascript-format
msgid "%s all day." msgid "%s all day."
msgstr "%s por todo o dia." msgstr "%s por todo o dia."
@@ -1045,7 +1045,7 @@ msgstr "%s por todo o dia."
#. libgweather for the possible condition strings. If at all #. libgweather for the possible condition strings. If at all
#. possible, the sentence should match the grammatical case etc. of #. possible, the sentence should match the grammatical case etc. of
#. the inserted conditions. #. the inserted conditions.
#: js/ui/dateMenu.js:297 #: js/ui/dateMenu.js:295
#, javascript-format #, javascript-format
msgid "%s, then %s later." msgid "%s, then %s later."
msgstr "%s, depois %s mais tarde." msgstr "%s, depois %s mais tarde."
@@ -1054,30 +1054,30 @@ msgstr "%s, depois %s mais tarde."
#. libgweather for the possible condition strings. If at all #. libgweather for the possible condition strings. If at all
#. possible, the sentence should match the grammatical case etc. of #. possible, the sentence should match the grammatical case etc. of
#. the inserted conditions. #. the inserted conditions.
#: js/ui/dateMenu.js:303 #: js/ui/dateMenu.js:301
#, javascript-format #, javascript-format
msgid "%s, then %s, followed by %s later." msgid "%s, then %s, followed by %s later."
msgstr "%s, depois %s, seguido de %s mais tarde." msgstr "%s, depois %s, seguido de %s mais tarde."
#: js/ui/dateMenu.js:314 #: js/ui/dateMenu.js:312
msgid "Select a location…" msgid "Select a location…"
msgstr "Selecione uma localização…" msgstr "Selecione uma localização…"
#: js/ui/dateMenu.js:317 #: js/ui/dateMenu.js:315
msgid "Loading…" msgid "Loading…"
msgstr "Carregando…" msgstr "Carregando…"
#. Translators: %s is a temperature with unit, e.g. "23℃" #. Translators: %s is a temperature with unit, e.g. "23℃"
#: js/ui/dateMenu.js:323 #: js/ui/dateMenu.js:321
#, javascript-format #, javascript-format
msgid "Feels like %s." msgid "Feels like %s."
msgstr "Sensação térmica de %s." msgstr "Sensação térmica de %s."
#: js/ui/dateMenu.js:326 #: js/ui/dateMenu.js:324
msgid "Go online for weather information" msgid "Go online for weather information"
msgstr "Conecte-se à internet para obter as informações meteorológicas" msgstr "Conecte-se à internet para obter as informações meteorológicas"
#: js/ui/dateMenu.js:328 #: js/ui/dateMenu.js:326
msgid "Weather information is currently unavailable" msgid "Weather information is currently unavailable"
msgstr "No momento as informações meteorológicas não estão disponíveis" msgstr "No momento as informações meteorológicas não estão disponíveis"

453
po/ro.po

File diff suppressed because it is too large Load Diff

View File

@@ -8,8 +8,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnome-shell master\n" "Project-Id-Version: gnome-shell master\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
"POT-Creation-Date: 2018-04-17 15:11+0000\n" "POT-Creation-Date: 2018-03-18 10:36+0000\n"
"PO-Revision-Date: 2018-04-17 18:32+0200\n" "PO-Revision-Date: 2018-03-19 21:42+0100\n"
"Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n" "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
"Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n" "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
"Language: sl\n" "Language: sl\n"
@@ -66,19 +66,19 @@ msgstr "Upravljanje oken in zaganjanje programov"
msgid "Enable internal tools useful for developers and testers from Alt-F2" msgid "Enable internal tools useful for developers and testers from Alt-F2"
msgstr "" msgstr ""
"Omogoči dostop do orodij razvijalcev in preizkuševalcev programske opreme " "Omogoči dostop do orodij razvijalcev in preizkuševalcev programske opreme "
"prek vnosnega polja Alt-F2." "preko Alt-F2 vnosnega polja."
#: data/org.gnome.shell.gschema.xml.in:9 #: data/org.gnome.shell.gschema.xml.in:9
msgid "" msgid ""
"Allows access to internal debugging and monitoring tools using the Alt-F2 " "Allows access to internal debugging and monitoring tools using the Alt-F2 "
"dialog." "dialog."
msgstr "" msgstr ""
"Dovoli dostop do razhroščevanja in drugih orodij nadzora prek vnosnega polja " "Dovoli dostop do razhroščevanja in drugih orodij nadzora preko Alt-F2 "
"Alt-F2." "vnosnega polja."
#: data/org.gnome.shell.gschema.xml.in:16 #: data/org.gnome.shell.gschema.xml.in:16
msgid "UUIDs of extensions to enable" msgid "UUIDs of extensions to enable"
msgstr "Določila razširitev UUID, ki bodo omogočene" msgstr "Določila UUID razširitev, ki bodo omogočene"
#: data/org.gnome.shell.gschema.xml.in:17 #: data/org.gnome.shell.gschema.xml.in:17
msgid "" msgid ""
@@ -87,9 +87,10 @@ msgid ""
"list. You can also manipulate this list with the EnableExtension and " "list. You can also manipulate this list with the EnableExtension and "
"DisableExtension D-Bus methods on org.gnome.Shell." "DisableExtension D-Bus methods on org.gnome.Shell."
msgstr "" msgstr ""
"Razširitve lupine GNOME imajo nastavljeno določilo UUID; ključ določa seznam " "Razširitve lupine GNOME imajo določila UUID; ključ določa seznam razširitev, "
"razširitev, ki naj bodo naložene ob zagonu. Upravljanje seznama je mogoče " "ki bodo naložene. Razširitev, ki se naj naloži, mora biti zavedena na tem "
"tudi prek vodila D-BUs na org.gnome.Shell." "seznamu. Upravljanje seznama je mogoče tudi preko vodila D-BUs na org.gnome."
"Shell."
#: data/org.gnome.shell.gschema.xml.in:26 #: data/org.gnome.shell.gschema.xml.in:26
msgid "Disable user extensions" msgid "Disable user extensions"
@@ -114,8 +115,8 @@ msgid ""
"load all extensions regardless of the versions they claim to support." "load all extensions regardless of the versions they claim to support."
msgstr "" msgstr ""
"Lupina GNOME naloži le razširitve, ki so skladne z nameščeno različico. " "Lupina GNOME naloži le razširitve, ki so skladne z nameščeno različico. "
"Izbrana možnost onemogoči preverjanje, zato so lahko naložene tudi " "Izbrana možnost onemogoči preverjanje skladnosti, zato so lahko naložene "
"razširitve, katerih skladnost ni potrjena." "tudi razširitve, katerih skladnost ni potrjena."
#: data/org.gnome.shell.gschema.xml.in:43 #: data/org.gnome.shell.gschema.xml.in:43
msgid "List of desktop file IDs for favorite applications" msgid "List of desktop file IDs for favorite applications"
@@ -126,7 +127,7 @@ msgid ""
"The applications corresponding to these identifiers will be displayed in the " "The applications corresponding to these identifiers will be displayed in the "
"favorites area." "favorites area."
msgstr "" msgstr ""
"Programi, ki ustrezajo določilom, bodo prikazani v polju priljubljenih " "Programi določeni s temi določili bodo prikazani v območju priljubljenih "
"programov" "programov"
#: data/org.gnome.shell.gschema.xml.in:51 #: data/org.gnome.shell.gschema.xml.in:51
@@ -144,18 +145,18 @@ msgstr "Zgodovina pogovornega okna ukazov (Alt-F2)"
#. Translators: looking glass is a debugger and inspector tool, see https://wiki.gnome.org/Projects/GnomeShell/LookingGlass #. Translators: looking glass is a debugger and inspector tool, see https://wiki.gnome.org/Projects/GnomeShell/LookingGlass
#: data/org.gnome.shell.gschema.xml.in:63 #: data/org.gnome.shell.gschema.xml.in:63
msgid "History for the looking glass dialog" msgid "History for the looking glass dialog"
msgstr "Zgodovina za pogovorno okno povečevala" msgstr "Zgodovina za pogovorno okno povečevalnega stekla"
#: data/org.gnome.shell.gschema.xml.in:67 #: data/org.gnome.shell.gschema.xml.in:67
msgid "Always show the “Log out” menu item in the user menu." msgid "Always show the “Log out” menu item in the user menu."
msgstr "Vedno pokaži možnost »Odjave« v uporabniškem meniju." msgstr "Vedno pokaži možnost »Odjava« v uporabniškem meniju."
#: data/org.gnome.shell.gschema.xml.in:68 #: data/org.gnome.shell.gschema.xml.in:68
msgid "" msgid ""
"This key overrides the automatic hiding of the “Log out” menu item in single-" "This key overrides the automatic hiding of the “Log out” menu item in single-"
"user, single-session situations." "user, single-session situations."
msgstr "" msgstr ""
"Izbira prepiše možnost samodejnega skrivanja gumba za »Odjavo« na sistemskem " "Izbira prepiše možnost samodejnega skrivanja predmeta »Odjava« na sistemskem "
"meniju pri eno-uporabniškem in eno-sejnem zagonu." "meniju pri eno-uporabniškem in eno-sejnem zagonu."
#: data/org.gnome.shell.gschema.xml.in:75 #: data/org.gnome.shell.gschema.xml.in:75
@@ -173,8 +174,8 @@ msgid ""
"state of the checkbox." "state of the checkbox."
msgstr "" msgstr ""
"Za priklop oddaljenega datotečnega sistema ali šifrirane naprave bo po " "Za priklop oddaljenega datotečnega sistema ali šifrirane naprave bo po "
"izbiri podana zahteva za vnos gesla. Na pogovornem oknu bo prikazana tudi " "izbiri možnosti zahtevano geslo. Na pogovornem oknu bo prikazana možnost "
"možnost »Shrani geslo«. Ta možnost določa privzeto stanje izbirnega polja." "»Shrani geslo«. Ta možnost določa privzeto stanje izbirnega polja."
#: data/org.gnome.shell.gschema.xml.in:85 #: data/org.gnome.shell.gschema.xml.in:85
msgid "" msgid ""
@@ -332,7 +333,7 @@ msgid "There was an error loading the preferences dialog for %s:"
msgstr "Prišlo je do napake med nalaganjem pogovornega okna z možnostmi za %s:" msgstr "Prišlo je do napake med nalaganjem pogovornega okna z možnostmi za %s:"
#: js/gdm/authPrompt.js:147 js/ui/audioDeviceSelection.js:71 #: js/gdm/authPrompt.js:147 js/ui/audioDeviceSelection.js:71
#: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:153 #: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:148
#: js/ui/endSessionDialog.js:482 js/ui/extensionDownloader.js:197 #: js/ui/endSessionDialog.js:482 js/ui/extensionDownloader.js:197
#: js/ui/shellMountOperation.js:343 js/ui/status/network.js:919 #: js/ui/shellMountOperation.js:343 js/ui/status/network.js:919
msgid "Cancel" msgid "Cancel"
@@ -663,12 +664,12 @@ msgstr "Dodaj med priljubljene"
msgid "Show Details" msgid "Show Details"
msgstr "Pokaži besedilo" msgstr "Pokaži besedilo"
#: js/ui/appFavorites.js:140 #: js/ui/appFavorites.js:138
#, javascript-format #, javascript-format
msgid "%s has been added to your favorites." msgid "%s has been added to your favorites."
msgstr "Program »%s« je dodan med priljubljeno." msgstr "Program »%s« je dodan med priljubljeno."
#: js/ui/appFavorites.js:174 #: js/ui/appFavorites.js:172
#, javascript-format #, javascript-format
msgid "%s has been removed from your favorites." msgid "%s has been removed from your favorites."
msgstr "Program »%s« je odstranjen iz priljubljenih." msgstr "Program »%s« je odstranjen iz priljubljenih."
@@ -839,7 +840,7 @@ msgid ""
"You may choose to wait a short while for it to continue or force the " "You may choose to wait a short while for it to continue or force the "
"application to quit entirely." "application to quit entirely."
msgstr "" msgstr ""
"Lahko počakate, če se program morda začne spet odzivati, lahko pa vsilite " "Lahko še malo počakate, če začne morda program spet delovati, ali pa vsilite "
"končanje delovanja." "končanje delovanja."
#: js/ui/closeDialog.js:61 #: js/ui/closeDialog.js:61
@@ -863,13 +864,13 @@ msgstr "Zunanji pogon je odklopljen"
msgid "Open with %s" msgid "Open with %s"
msgstr "Odpri s programom %s" msgstr "Odpri s programom %s"
#: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:295 #: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:284
msgid "Password:" msgid "Password:"
msgstr "Geslo:" msgstr "Geslo:"
#: js/ui/components/keyring.js:140 #: js/ui/components/keyring.js:140
msgid "Type again:" msgid "Type again:"
msgstr "Ponovni vpis:" msgstr "Vpišite znova:"
#: js/ui/components/networkAgent.js:112 js/ui/status/network.js:245 #: js/ui/components/networkAgent.js:112 js/ui/status/network.js:245
#: js/ui/status/network.js:336 js/ui/status/network.js:922 #: js/ui/status/network.js:336 js/ui/status/network.js:922
@@ -886,19 +887,19 @@ msgstr "Geslo:"
#. static WEP #. static WEP
#: js/ui/components/networkAgent.js:210 #: js/ui/components/networkAgent.js:210
msgid "Key: " msgid "Key: "
msgstr "Ključ: " msgstr "Ključ:"
#: js/ui/components/networkAgent.js:249 #: js/ui/components/networkAgent.js:249
msgid "Identity: " msgid "Identity: "
msgstr "_Istovetnost: " msgstr "_Istovetnost:"
#: js/ui/components/networkAgent.js:251 #: js/ui/components/networkAgent.js:251
msgid "Private key password: " msgid "Private key password: "
msgstr "Geslo zasebnega ključa: " msgstr "Geslo zasebnega ključa:"
#: js/ui/components/networkAgent.js:263 #: js/ui/components/networkAgent.js:263
msgid "Service: " msgid "Service: "
msgstr "Storitev: " msgstr "Storitev:"
#: js/ui/components/networkAgent.js:292 js/ui/components/networkAgent.js:659 #: js/ui/components/networkAgent.js:292 js/ui/components/networkAgent.js:659
msgid "Authentication required by wireless network" msgid "Authentication required by wireless network"
@@ -919,7 +920,7 @@ msgstr "Žična overitev 802.1X"
#: js/ui/components/networkAgent.js:299 #: js/ui/components/networkAgent.js:299
msgid "Network name: " msgid "Network name: "
msgstr "Naziv omrežja: " msgstr "Naziv omrežja:"
#: js/ui/components/networkAgent.js:304 js/ui/components/networkAgent.js:667 #: js/ui/components/networkAgent.js:304 js/ui/components/networkAgent.js:667
msgid "DSL authentication" msgid "DSL authentication"
@@ -951,15 +952,15 @@ msgstr "Za povezavo z omrežjem »%s« je zahtevano geslo."
msgid "Network Manager" msgid "Network Manager"
msgstr "Upravljalnik omrežij" msgstr "Upravljalnik omrežij"
#: js/ui/components/polkitAgent.js:48 #: js/ui/components/polkitAgent.js:43
msgid "Authentication Required" msgid "Authentication Required"
msgstr "Zahtevana je overitev" msgstr "Zahtevana je overitev"
#: js/ui/components/polkitAgent.js:76 #: js/ui/components/polkitAgent.js:71
msgid "Administrator" msgid "Administrator"
msgstr "Skrbnik" msgstr "Skrbnik"
#: js/ui/components/polkitAgent.js:156 #: js/ui/components/polkitAgent.js:151
msgid "Authenticate" msgid "Authenticate"
msgstr "Overi" msgstr "Overi"
@@ -967,7 +968,7 @@ msgstr "Overi"
#. * requested authentication was not gained; this can happen #. * requested authentication was not gained; this can happen
#. * because of an authentication error (like invalid password), #. * because of an authentication error (like invalid password),
#. * for instance. #. * for instance.
#: js/ui/components/polkitAgent.js:281 js/ui/shellMountOperation.js:327 #: js/ui/components/polkitAgent.js:270 js/ui/shellMountOperation.js:327
msgid "Sorry, that didnt work. Please try again." msgid "Sorry, that didnt work. Please try again."
msgstr "Overitev je spodletela.. Poskusite znova." msgstr "Overitev je spodletela.. Poskusite znova."
@@ -1015,7 +1016,7 @@ msgstr "Dodaj svetovni čas ..."
msgid "World Clocks" msgid "World Clocks"
msgstr "Svetovni časi" msgstr "Svetovni časi"
#: js/ui/dateMenu.js:227 #: js/ui/dateMenu.js:225
msgid "Weather" msgid "Weather"
msgstr "Vreme" msgstr "Vreme"
@@ -1023,7 +1024,7 @@ msgstr "Vreme"
#. libgweather for the possible condition strings. If at all #. libgweather for the possible condition strings. If at all
#. possible, the sentence should match the grammatical case etc. of #. possible, the sentence should match the grammatical case etc. of
#. the inserted conditions. #. the inserted conditions.
#: js/ui/dateMenu.js:291 #: js/ui/dateMenu.js:289
#, javascript-format #, javascript-format
msgid "%s all day." msgid "%s all day."
msgstr "%s ves dan." msgstr "%s ves dan."
@@ -1032,7 +1033,7 @@ msgstr "%s ves dan."
#. libgweather for the possible condition strings. If at all #. libgweather for the possible condition strings. If at all
#. possible, the sentence should match the grammatical case etc. of #. possible, the sentence should match the grammatical case etc. of
#. the inserted conditions. #. the inserted conditions.
#: js/ui/dateMenu.js:297 #: js/ui/dateMenu.js:295
#, javascript-format #, javascript-format
msgid "%s, then %s later." msgid "%s, then %s later."
msgstr "%s, sledi %s." msgstr "%s, sledi %s."
@@ -1041,30 +1042,30 @@ msgstr "%s, sledi %s."
#. libgweather for the possible condition strings. If at all #. libgweather for the possible condition strings. If at all
#. possible, the sentence should match the grammatical case etc. of #. possible, the sentence should match the grammatical case etc. of
#. the inserted conditions. #. the inserted conditions.
#: js/ui/dateMenu.js:303 #: js/ui/dateMenu.js:301
#, javascript-format #, javascript-format
msgid "%s, then %s, followed by %s later." msgid "%s, then %s, followed by %s later."
msgstr "%s, sledi %s, kasneje tudi %s." msgstr "%s, sledi %s, kasneje tudi %s."
#: js/ui/dateMenu.js:314 #: js/ui/dateMenu.js:312
msgid "Select a location…" msgid "Select a location…"
msgstr "Izbor mesta ..." msgstr "Izbor mesta ..."
#: js/ui/dateMenu.js:317 #: js/ui/dateMenu.js:315
msgid "Loading…" msgid "Loading…"
msgstr "Poteka nalaganje ..." msgstr "Poteka nalaganje ..."
#. Translators: %s is a temperature with unit, e.g. "23℃" #. Translators: %s is a temperature with unit, e.g. "23℃"
#: js/ui/dateMenu.js:323 #: js/ui/dateMenu.js:321
#, javascript-format #, javascript-format
msgid "Feels like %s." msgid "Feels like %s."
msgstr "Občuti se kot %s." msgstr "Občuti se kot %s."
#: js/ui/dateMenu.js:326 #: js/ui/dateMenu.js:324
msgid "Go online for weather information" msgid "Go online for weather information"
msgstr "Preglej splet za podrobnosti o vremenu." msgstr "Preglej splet za podrobnosti o vremenu."
#: js/ui/dateMenu.js:328 #: js/ui/dateMenu.js:326
msgid "Weather information is currently unavailable" msgid "Weather information is currently unavailable"
msgstr "Podatki o vremenu trenutno niso na voljo." msgstr "Podatki o vremenu trenutno niso na voljo."
@@ -2013,8 +2014,8 @@ msgstr "Napaka overitve naprave Thunderbolt"
#: js/ui/status/thunderbolt.js:357 #: js/ui/status/thunderbolt.js:357
#, javascript-format #, javascript-format
msgid "Could not authorize the Thunderbolt device: %s" msgid "Could not authorize the thunderbolt device: %s"
msgstr "Naprave Thunderbolt ni mogoče overiti: %s" msgstr "Naprave thunderbolt ni mogoče overiti: %s"
#: js/ui/status/volume.js:128 #: js/ui/status/volume.js:128
msgid "Volume changed" msgid "Volume changed"

View File

@@ -11,8 +11,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnome-shell\n" "Project-Id-Version: gnome-shell\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
"POT-Creation-Date: 2018-04-13 19:54+0000\n" "POT-Creation-Date: 2018-02-21 14:13+0000\n"
"PO-Revision-Date: 2018-05-20 19:24+0200\n" "PO-Revision-Date: 2018-02-22 15:56+0100\n"
"Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n" "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n" "Language: sv\n"
@@ -20,7 +20,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.0.7\n" "X-Generator: Poedit 2.0.6\n"
#: data/50-gnome-shell-system.xml:6 #: data/50-gnome-shell-system.xml:6
msgid "System" msgid "System"
@@ -332,7 +332,7 @@ msgid "There was an error loading the preferences dialog for %s:"
msgstr "Det uppstod ett fel vid inläsning av inställningsdialogen för %s:" msgstr "Det uppstod ett fel vid inläsning av inställningsdialogen för %s:"
#: js/gdm/authPrompt.js:147 js/ui/audioDeviceSelection.js:71 #: js/gdm/authPrompt.js:147 js/ui/audioDeviceSelection.js:71
#: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:153 #: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:148
#: js/ui/endSessionDialog.js:482 js/ui/extensionDownloader.js:197 #: js/ui/endSessionDialog.js:482 js/ui/extensionDownloader.js:197
#: js/ui/shellMountOperation.js:343 js/ui/status/network.js:919 #: js/ui/shellMountOperation.js:343 js/ui/status/network.js:919
msgid "Cancel" msgid "Cancel"
@@ -652,12 +652,12 @@ msgstr "Lägg till som favorit"
msgid "Show Details" msgid "Show Details"
msgstr "Visa detaljer" msgstr "Visa detaljer"
#: js/ui/appFavorites.js:140 #: js/ui/appFavorites.js:138
#, javascript-format #, javascript-format
msgid "%s has been added to your favorites." msgid "%s has been added to your favorites."
msgstr "%s har lagts till i dina favoriter." msgstr "%s har lagts till i dina favoriter."
#: js/ui/appFavorites.js:174 #: js/ui/appFavorites.js:172
#, javascript-format #, javascript-format
msgid "%s has been removed from your favorites." msgid "%s has been removed from your favorites."
msgstr "%s har tagits bort från dina favoriter." msgstr "%s har tagits bort från dina favoriter."
@@ -852,7 +852,7 @@ msgstr "Extern disk frånkopplad"
msgid "Open with %s" msgid "Open with %s"
msgstr "Öppna med %s" msgstr "Öppna med %s"
#: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:295 #: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:284
msgid "Password:" msgid "Password:"
msgstr "Lösenord:" msgstr "Lösenord:"
@@ -940,15 +940,15 @@ msgstr "Ett lösenord krävs för att ansluta till ”%s”."
msgid "Network Manager" msgid "Network Manager"
msgstr "Nätverkshanterare" msgstr "Nätverkshanterare"
#: js/ui/components/polkitAgent.js:48 #: js/ui/components/polkitAgent.js:43
msgid "Authentication Required" msgid "Authentication Required"
msgstr "Autentisering krävs" msgstr "Autentisering krävs"
#: js/ui/components/polkitAgent.js:76 #: js/ui/components/polkitAgent.js:71
msgid "Administrator" msgid "Administrator"
msgstr "Administratör" msgstr "Administratör"
#: js/ui/components/polkitAgent.js:156 #: js/ui/components/polkitAgent.js:151
msgid "Authenticate" msgid "Authenticate"
msgstr "Autentisera" msgstr "Autentisera"
@@ -956,7 +956,7 @@ msgstr "Autentisera"
#. * requested authentication was not gained; this can happen #. * requested authentication was not gained; this can happen
#. * because of an authentication error (like invalid password), #. * because of an authentication error (like invalid password),
#. * for instance. #. * for instance.
#: js/ui/components/polkitAgent.js:281 js/ui/shellMountOperation.js:327 #: js/ui/components/polkitAgent.js:270 js/ui/shellMountOperation.js:327
msgid "Sorry, that didnt work. Please try again." msgid "Sorry, that didnt work. Please try again."
msgstr "Tyvärr, det fungerade inte. Försök igen." msgstr "Tyvärr, det fungerade inte. Försök igen."
@@ -1004,7 +1004,7 @@ msgstr "Lägg till världsklockor…"
msgid "World Clocks" msgid "World Clocks"
msgstr "Världsklockor" msgstr "Världsklockor"
#: js/ui/dateMenu.js:227 #: js/ui/dateMenu.js:225
msgid "Weather" msgid "Weather"
msgstr "Väder" msgstr "Väder"
@@ -1012,7 +1012,7 @@ msgstr "Väder"
#. libgweather for the possible condition strings. If at all #. libgweather for the possible condition strings. If at all
#. possible, the sentence should match the grammatical case etc. of #. possible, the sentence should match the grammatical case etc. of
#. the inserted conditions. #. the inserted conditions.
#: js/ui/dateMenu.js:291 #: js/ui/dateMenu.js:289
#, javascript-format #, javascript-format
msgid "%s all day." msgid "%s all day."
msgstr "%s hela dagen." msgstr "%s hela dagen."
@@ -1021,7 +1021,7 @@ msgstr "%s hela dagen."
#. libgweather for the possible condition strings. If at all #. libgweather for the possible condition strings. If at all
#. possible, the sentence should match the grammatical case etc. of #. possible, the sentence should match the grammatical case etc. of
#. the inserted conditions. #. the inserted conditions.
#: js/ui/dateMenu.js:297 #: js/ui/dateMenu.js:295
#, javascript-format #, javascript-format
msgid "%s, then %s later." msgid "%s, then %s later."
msgstr "%s, sedan %s senare." msgstr "%s, sedan %s senare."
@@ -1030,30 +1030,30 @@ msgstr "%s, sedan %s senare."
#. libgweather for the possible condition strings. If at all #. libgweather for the possible condition strings. If at all
#. possible, the sentence should match the grammatical case etc. of #. possible, the sentence should match the grammatical case etc. of
#. the inserted conditions. #. the inserted conditions.
#: js/ui/dateMenu.js:303 #: js/ui/dateMenu.js:301
#, javascript-format #, javascript-format
msgid "%s, then %s, followed by %s later." msgid "%s, then %s, followed by %s later."
msgstr "%s, sedan %s, följt av %s senare." msgstr "%s, sedan %s, följt av %s senare."
#: js/ui/dateMenu.js:314 #: js/ui/dateMenu.js:312
msgid "Select a location…" msgid "Select a location…"
msgstr "Välj en plats…" msgstr "Välj en plats…"
#: js/ui/dateMenu.js:317 #: js/ui/dateMenu.js:315
msgid "Loading…" msgid "Loading…"
msgstr "Läser in…" msgstr "Läser in…"
#. Translators: %s is a temperature with unit, e.g. "23℃" #. Translators: %s is a temperature with unit, e.g. "23℃"
#: js/ui/dateMenu.js:323 #: js/ui/dateMenu.js:321
#, javascript-format #, javascript-format
msgid "Feels like %s." msgid "Feels like %s."
msgstr "Känns som %s." msgstr "Känns som %s."
#: js/ui/dateMenu.js:326 #: js/ui/dateMenu.js:324
msgid "Go online for weather information" msgid "Go online for weather information"
msgstr "Anslut till nätet för väderinformation" msgstr "Anslut till nätet för väderinformation"
#: js/ui/dateMenu.js:328 #: js/ui/dateMenu.js:326
msgid "Weather information is currently unavailable" msgid "Weather information is currently unavailable"
msgstr "Väderinformation är för närvarande inte tillgänglig" msgstr "Väderinformation är för närvarande inte tillgänglig"
@@ -1953,16 +1953,16 @@ msgstr "Vänteläge"
msgid "Power Off" msgid "Power Off"
msgstr "Stäng av" msgstr "Stäng av"
#: js/ui/status/thunderbolt.js:294 #: js/ui/status/thunderbolt.js:272
msgid "Thunderbolt" msgid "Thunderbolt"
msgstr "Thunderbolt" msgstr "Thunderbolt"
#. we are done #. we are done
#: js/ui/status/thunderbolt.js:350 #: js/ui/status/thunderbolt.js:328
msgid "Unknown Thunderbolt device" msgid "Unknown Thunderbolt device"
msgstr "Okänd Thunderbolt-enhet" msgstr "Okänd Thunderbolt-enhet"
#: js/ui/status/thunderbolt.js:351 #: js/ui/status/thunderbolt.js:329
msgid "" msgid ""
"New device has been detected while you were away. Please disconnect and " "New device has been detected while you were away. Please disconnect and "
"reconnect the device to start using it." "reconnect the device to start using it."
@@ -1970,13 +1970,13 @@ msgstr ""
"En ny enhet har upptäckts medan du var borta. Koppla från och anslut enheten " "En ny enhet har upptäckts medan du var borta. Koppla från och anslut enheten "
"igen för att börja använda den." "igen för att börja använda den."
#: js/ui/status/thunderbolt.js:356 #: js/ui/status/thunderbolt.js:334
msgid "Thunderbolt authorization error" msgid "Thunderbolt authorization error"
msgstr "Thunderbolt-auktoriseringsfel" msgstr "Thunderbolt-auktoriseringsfel"
#: js/ui/status/thunderbolt.js:357 #: js/ui/status/thunderbolt.js:335
#, javascript-format #, javascript-format
msgid "Could not authorize the Thunderbolt device: %s" msgid "Could not authorize the thunderbolt device: %s"
msgstr "Kunde inte auktorisera Thunderbolt-enheten: %s" msgstr "Kunde inte auktorisera Thunderbolt-enheten: %s"
#: js/ui/status/volume.js:128 #: js/ui/status/volume.js:128

View File

@@ -23,16 +23,16 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnome-shell master\n" "Project-Id-Version: gnome-shell master\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
"POT-Creation-Date: 2018-04-13 19:54+0000\n" "POT-Creation-Date: 2018-03-05 21:11+0000\n"
"PO-Revision-Date: 2018-05-10 12:11-0500\n" "PO-Revision-Date: 2018-02-15 01:42+0800\n"
"Last-Translator: Mingcong Bai <jeffbai@aosc.xyz>\n" "Last-Translator: Dingzhong Chen <wsxy162@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
"Language: zh_CN\n" "Language: zh_CN\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n" "Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Poedit 2.0.6\n" "X-Generator: Gtranslator 2.91.7\n"
#: data/50-gnome-shell-system.xml:6 #: data/50-gnome-shell-system.xml:6
msgid "System" msgid "System"
@@ -320,7 +320,7 @@ msgid "There was an error loading the preferences dialog for %s:"
msgstr "载入 %s 的首选项对话框时出错:" msgstr "载入 %s 的首选项对话框时出错:"
#: js/gdm/authPrompt.js:147 js/ui/audioDeviceSelection.js:71 #: js/gdm/authPrompt.js:147 js/ui/audioDeviceSelection.js:71
#: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:153 #: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:148
#: js/ui/endSessionDialog.js:482 js/ui/extensionDownloader.js:197 #: js/ui/endSessionDialog.js:482 js/ui/extensionDownloader.js:197
#: js/ui/shellMountOperation.js:343 js/ui/status/network.js:919 #: js/ui/shellMountOperation.js:343 js/ui/status/network.js:919
msgid "Cancel" msgid "Cancel"
@@ -631,12 +631,12 @@ msgstr "添加到收藏夹"
msgid "Show Details" msgid "Show Details"
msgstr "显示细节" msgstr "显示细节"
#: js/ui/appFavorites.js:140 #: js/ui/appFavorites.js:138
#, javascript-format #, javascript-format
msgid "%s has been added to your favorites." msgid "%s has been added to your favorites."
msgstr "%s 已经添加到了您的收藏夹。" msgstr "%s 已经添加到了您的收藏夹。"
#: js/ui/appFavorites.js:174 #: js/ui/appFavorites.js:172
#, javascript-format #, javascript-format
msgid "%s has been removed from your favorites." msgid "%s has been removed from your favorites."
msgstr "%s 已经从您的收藏夹移除。" msgstr "%s 已经从您的收藏夹移除。"
@@ -829,7 +829,7 @@ msgstr "外部驱动器已断开"
msgid "Open with %s" msgid "Open with %s"
msgstr "使用 %s 打开" msgstr "使用 %s 打开"
#: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:295 #: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:284
msgid "Password:" msgid "Password:"
msgstr "密码:" msgstr "密码:"
@@ -915,15 +915,15 @@ msgstr "连接到“%s”需要密码。"
msgid "Network Manager" msgid "Network Manager"
msgstr "网络管理器" msgstr "网络管理器"
#: js/ui/components/polkitAgent.js:48 #: js/ui/components/polkitAgent.js:43
msgid "Authentication Required" msgid "Authentication Required"
msgstr "需要认证" msgstr "需要认证"
#: js/ui/components/polkitAgent.js:76 #: js/ui/components/polkitAgent.js:71
msgid "Administrator" msgid "Administrator"
msgstr "管理员" msgstr "管理员"
#: js/ui/components/polkitAgent.js:156 #: js/ui/components/polkitAgent.js:151
msgid "Authenticate" msgid "Authenticate"
msgstr "认证" msgstr "认证"
@@ -932,7 +932,7 @@ msgstr "认证"
#. * requested authentication was not gained; this can happen #. * requested authentication was not gained; this can happen
#. * because of an authentication error (like invalid password), #. * because of an authentication error (like invalid password),
#. * for instance. #. * for instance.
#: js/ui/components/polkitAgent.js:281 js/ui/shellMountOperation.js:327 #: js/ui/components/polkitAgent.js:270 js/ui/shellMountOperation.js:327
msgid "Sorry, that didnt work. Please try again." msgid "Sorry, that didnt work. Please try again."
msgstr "抱歉,认证失败。请重试。" msgstr "抱歉,认证失败。请重试。"
@@ -980,7 +980,7 @@ msgstr "添加世界时钟…"
msgid "World Clocks" msgid "World Clocks"
msgstr "世界时钟" msgstr "世界时钟"
#: js/ui/dateMenu.js:227 #: js/ui/dateMenu.js:225
msgid "Weather" msgid "Weather"
msgstr "天气" msgstr "天气"
@@ -988,7 +988,7 @@ msgstr "天气"
#. libgweather for the possible condition strings. If at all #. libgweather for the possible condition strings. If at all
#. possible, the sentence should match the grammatical case etc. of #. possible, the sentence should match the grammatical case etc. of
#. the inserted conditions. #. the inserted conditions.
#: js/ui/dateMenu.js:291 #: js/ui/dateMenu.js:289
#, javascript-format #, javascript-format
msgid "%s all day." msgid "%s all day."
msgstr "全天%s。" msgstr "全天%s。"
@@ -997,7 +997,7 @@ msgstr "全天%s。"
#. libgweather for the possible condition strings. If at all #. libgweather for the possible condition strings. If at all
#. possible, the sentence should match the grammatical case etc. of #. possible, the sentence should match the grammatical case etc. of
#. the inserted conditions. #. the inserted conditions.
#: js/ui/dateMenu.js:297 #: js/ui/dateMenu.js:295
#, javascript-format #, javascript-format
msgid "%s, then %s later." msgid "%s, then %s later."
msgstr "%s转%s。" msgstr "%s转%s。"
@@ -1006,30 +1006,30 @@ msgstr "%s转%s。"
#. libgweather for the possible condition strings. If at all #. libgweather for the possible condition strings. If at all
#. possible, the sentence should match the grammatical case etc. of #. possible, the sentence should match the grammatical case etc. of
#. the inserted conditions. #. the inserted conditions.
#: js/ui/dateMenu.js:303 #: js/ui/dateMenu.js:301
#, javascript-format #, javascript-format
msgid "%s, then %s, followed by %s later." msgid "%s, then %s, followed by %s later."
msgstr "%s转%s随后转%s。" msgstr "%s转%s随后转%s。"
#: js/ui/dateMenu.js:314 #: js/ui/dateMenu.js:312
msgid "Select a location…" msgid "Select a location…"
msgstr "选择地点…" msgstr "选择地点…"
#: js/ui/dateMenu.js:317 #: js/ui/dateMenu.js:315
msgid "Loading…" msgid "Loading…"
msgstr "正在载入…" msgstr "正在载入…"
#. Translators: %s is a temperature with unit, e.g. "23℃" #. Translators: %s is a temperature with unit, e.g. "23℃"
#: js/ui/dateMenu.js:323 #: js/ui/dateMenu.js:321
#, javascript-format #, javascript-format
msgid "Feels like %s." msgid "Feels like %s."
msgstr "体感温度 %s。" msgstr "体感温度 %s。"
#: js/ui/dateMenu.js:326 #: js/ui/dateMenu.js:324
msgid "Go online for weather information" msgid "Go online for weather information"
msgstr "通过互联网查看天气信息" msgstr "通过互联网查看天气信息"
#: js/ui/dateMenu.js:328 #: js/ui/dateMenu.js:326
msgid "Weather information is currently unavailable" msgid "Weather information is currently unavailable"
msgstr "天气信息目前不可用" msgstr "天气信息目前不可用"
@@ -1930,7 +1930,7 @@ msgstr "Thunderbolt 授权错误"
#: js/ui/status/thunderbolt.js:357 #: js/ui/status/thunderbolt.js:357
#, javascript-format #, javascript-format
msgid "Could not authorize the Thunderbolt device: %s" msgid "Could not authorize the thunderbolt device: %s"
msgstr "无法授权 Thunderbolt 设备:%s" msgstr "无法授权 Thunderbolt 设备:%s"
#: js/ui/status/volume.js:128 #: js/ui/status/volume.js:128

View File

@@ -8,8 +8,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnome-shell 3.3.90\n" "Project-Id-Version: gnome-shell 3.3.90\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
"POT-Creation-Date: 2018-06-08 17:30+0000\n" "POT-Creation-Date: 2018-03-05 21:11+0000\n"
"PO-Revision-Date: 2018-06-09 11:17+0800\n" "PO-Revision-Date: 2018-03-10 20:30+0800\n"
"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n" "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
"Language-Team: Chinese (Taiwan) <zh-l10n@lists.linux.org.tw>\n" "Language-Team: Chinese (Taiwan) <zh-l10n@lists.linux.org.tw>\n"
"Language: zh_TW\n" "Language: zh_TW\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n" "Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Poedit 2.0.8\n" "X-Generator: Poedit 2.0.6\n"
#: data/50-gnome-shell-system.xml:6 #: data/50-gnome-shell-system.xml:6
msgid "System" msgid "System"
@@ -308,7 +308,7 @@ msgid "There was an error loading the preferences dialog for %s:"
msgstr "載入 %s 的偏好設定對話盒時發生錯誤:" msgstr "載入 %s 的偏好設定對話盒時發生錯誤:"
#: js/gdm/authPrompt.js:147 js/ui/audioDeviceSelection.js:71 #: js/gdm/authPrompt.js:147 js/ui/audioDeviceSelection.js:71
#: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:153 #: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:148
#: js/ui/endSessionDialog.js:482 js/ui/extensionDownloader.js:197 #: js/ui/endSessionDialog.js:482 js/ui/extensionDownloader.js:197
#: js/ui/shellMountOperation.js:343 js/ui/status/network.js:919 #: js/ui/shellMountOperation.js:343 js/ui/status/network.js:919
msgid "Cancel" msgid "Cancel"
@@ -328,20 +328,20 @@ msgctxt "button"
msgid "Sign In" msgid "Sign In"
msgstr "登入" msgstr "登入"
#: js/gdm/loginDialog.js:319 #: js/gdm/loginDialog.js:315
msgid "Choose Session" msgid "Choose Session"
msgstr "選擇工作階段" msgstr "選擇工作階段"
#. translators: this message is shown below the user list on the #. translators: this message is shown below the user list on the
#. login screen. It can be activated to reveal an entry for #. login screen. It can be activated to reveal an entry for
#. manually entering the username. #. manually entering the username.
#: js/gdm/loginDialog.js:462 #: js/gdm/loginDialog.js:458
msgid "Not listed?" msgid "Not listed?"
msgstr "沒有列出來?" msgstr "沒有列出來?"
#. Translators: this message is shown below the username entry field #. Translators: this message is shown below the username entry field
#. to clue the user in on how to login to the local network realm #. to clue the user in on how to login to the local network realm
#: js/gdm/loginDialog.js:891 #: js/gdm/loginDialog.js:887
#, javascript-format #, javascript-format
msgid "(e.g., user or %s)" msgid "(e.g., user or %s)"
msgstr "(例如: user 或 %s)" msgstr "(例如: user 或 %s)"
@@ -349,12 +349,12 @@ msgstr "(例如: user 或 %s)"
#. TTLS and PEAP are actually much more complicated, but this complication #. TTLS and PEAP are actually much more complicated, but this complication
#. is not visible here since we only care about phase2 authentication #. is not visible here since we only care about phase2 authentication
#. (and don't even care of which one) #. (and don't even care of which one)
#: js/gdm/loginDialog.js:896 js/ui/components/networkAgent.js:243 #: js/gdm/loginDialog.js:892 js/ui/components/networkAgent.js:243
#: js/ui/components/networkAgent.js:261 #: js/ui/components/networkAgent.js:261
msgid "Username: " msgid "Username: "
msgstr "使用者名稱:" msgstr "使用者名稱:"
#: js/gdm/loginDialog.js:1234 #: js/gdm/loginDialog.js:1228
msgid "Login Window" msgid "Login Window"
msgstr "登入視窗" msgstr "登入視窗"
@@ -601,32 +601,32 @@ msgstr "常用"
msgid "All" msgid "All"
msgstr "全部" msgstr "全部"
#: js/ui/appDisplay.js:1889 #: js/ui/appDisplay.js:1886
msgid "New Window" msgid "New Window"
msgstr "新視窗" msgstr "新視窗"
#: js/ui/appDisplay.js:1903 #: js/ui/appDisplay.js:1900
msgid "Launch using Dedicated Graphics Card" msgid "Launch using Dedicated Graphics Card"
msgstr "使用獨立顯卡啟動" msgstr "使用獨立顯卡啟動"
#: js/ui/appDisplay.js:1930 js/ui/dash.js:285 #: js/ui/appDisplay.js:1927 js/ui/dash.js:285
msgid "Remove from Favorites" msgid "Remove from Favorites"
msgstr "自喜好中移除" msgstr "自喜好中移除"
#: js/ui/appDisplay.js:1936 #: js/ui/appDisplay.js:1933
msgid "Add to Favorites" msgid "Add to Favorites"
msgstr "加入喜好" msgstr "加入喜好"
#: js/ui/appDisplay.js:1946 #: js/ui/appDisplay.js:1943
msgid "Show Details" msgid "Show Details"
msgstr "顯示詳細資訊" msgstr "顯示詳細資訊"
#: js/ui/appFavorites.js:140 #: js/ui/appFavorites.js:138
#, javascript-format #, javascript-format
msgid "%s has been added to your favorites." msgid "%s has been added to your favorites."
msgstr "%s 已加入您的喜好中。" msgstr "%s 已加入您的喜好中。"
#: js/ui/appFavorites.js:174 #: js/ui/appFavorites.js:172
#, javascript-format #, javascript-format
msgid "%s has been removed from your favorites." msgid "%s has been removed from your favorites."
msgstr "%s 已經從您的喜好中移除。" msgstr "%s 已經從您的喜好中移除。"
@@ -787,22 +787,22 @@ msgid "Clear All"
msgstr "全部清除" msgstr "全部清除"
#. Translators: %s is an application name #. Translators: %s is an application name
#: js/ui/closeDialog.js:47 #: js/ui/closeDialog.js:44
#, javascript-format #, javascript-format
msgid "“%s” is not responding." msgid "“%s” is not responding."
msgstr "「%s」沒有回應。" msgstr "「%s」沒有回應。"
#: js/ui/closeDialog.js:48 #: js/ui/closeDialog.js:45
msgid "" msgid ""
"You may choose to wait a short while for it to continue or force the " "You may choose to wait a short while for it to continue or force the "
"application to quit entirely." "application to quit entirely."
msgstr "您可以選擇再等一下讓它繼續,或是強制讓應用程式立刻退出。" msgstr "您可以選擇再等一下讓它繼續,或是強制讓應用程式立刻退出。"
#: js/ui/closeDialog.js:64 #: js/ui/closeDialog.js:61
msgid "Force Quit" msgid "Force Quit"
msgstr "強制退出" msgstr "強制退出"
#: js/ui/closeDialog.js:67 #: js/ui/closeDialog.js:64
msgid "Wait" msgid "Wait"
msgstr "等待" msgstr "等待"
@@ -819,7 +819,7 @@ msgstr "外部裝置已拔除"
msgid "Open with %s" msgid "Open with %s"
msgstr "用 %s 開啟" msgstr "用 %s 開啟"
#: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:297 #: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:284
msgid "Password:" msgid "Password:"
msgstr "密碼: " msgstr "密碼: "
@@ -856,18 +856,18 @@ msgstr "私密金鑰密碼:"
msgid "Service: " msgid "Service: "
msgstr "服務:" msgstr "服務:"
#: js/ui/components/networkAgent.js:292 js/ui/components/networkAgent.js:664 #: js/ui/components/networkAgent.js:292 js/ui/components/networkAgent.js:659
msgid "Authentication required by wireless network" msgid "Authentication required by wireless network"
msgstr "無線網路所需要的核對" msgstr "無線網路所需要的核對"
#: js/ui/components/networkAgent.js:293 js/ui/components/networkAgent.js:665 #: js/ui/components/networkAgent.js:293 js/ui/components/networkAgent.js:660
#, javascript-format #, javascript-format
msgid "" msgid ""
"Passwords or encryption keys are required to access the wireless network " "Passwords or encryption keys are required to access the wireless network "
"“%s”." "“%s”."
msgstr "需要密碼或是加密金鑰來存取無線網路「%s」。" msgstr "需要密碼或是加密金鑰來存取無線網路「%s」。"
#: js/ui/components/networkAgent.js:297 js/ui/components/networkAgent.js:668 #: js/ui/components/networkAgent.js:297 js/ui/components/networkAgent.js:663
msgid "Wired 802.1X authentication" msgid "Wired 802.1X authentication"
msgstr "有線網路 802.1X 核對" msgstr "有線網路 802.1X 核對"
@@ -875,15 +875,15 @@ msgstr "有線網路 802.1X 核對"
msgid "Network name: " msgid "Network name: "
msgstr "網路名稱:" msgstr "網路名稱:"
#: js/ui/components/networkAgent.js:304 js/ui/components/networkAgent.js:672 #: js/ui/components/networkAgent.js:304 js/ui/components/networkAgent.js:667
msgid "DSL authentication" msgid "DSL authentication"
msgstr "DSL 核對" msgstr "DSL 核對"
#: js/ui/components/networkAgent.js:311 js/ui/components/networkAgent.js:678 #: js/ui/components/networkAgent.js:311 js/ui/components/networkAgent.js:673
msgid "PIN code required" msgid "PIN code required"
msgstr "需要 PIN 碼" msgstr "需要 PIN 碼"
#: js/ui/components/networkAgent.js:312 js/ui/components/networkAgent.js:679 #: js/ui/components/networkAgent.js:312 js/ui/components/networkAgent.js:674
msgid "PIN code is needed for the mobile broadband device" msgid "PIN code is needed for the mobile broadband device"
msgstr "這個行動寬頻裝置需要 PIN 碼" msgstr "這個行動寬頻裝置需要 PIN 碼"
@@ -891,29 +891,29 @@ msgstr "這個行動寬頻裝置需要 PIN 碼"
msgid "PIN: " msgid "PIN: "
msgstr "PIN " msgstr "PIN "
#: js/ui/components/networkAgent.js:320 js/ui/components/networkAgent.js:685 #: js/ui/components/networkAgent.js:320 js/ui/components/networkAgent.js:680
msgid "Mobile broadband network password" msgid "Mobile broadband network password"
msgstr "行動寬頻網路密碼" msgstr "行動寬頻網路密碼"
#: js/ui/components/networkAgent.js:321 js/ui/components/networkAgent.js:669 #: js/ui/components/networkAgent.js:321 js/ui/components/networkAgent.js:664
#: js/ui/components/networkAgent.js:673 js/ui/components/networkAgent.js:686 #: js/ui/components/networkAgent.js:668 js/ui/components/networkAgent.js:681
#, javascript-format #, javascript-format
msgid "A password is required to connect to “%s”." msgid "A password is required to connect to “%s”."
msgstr "連線至「%s」需要密碼。" msgstr "連線至「%s」需要密碼。"
#: js/ui/components/networkAgent.js:653 js/ui/status/network.js:1704 #: js/ui/components/networkAgent.js:648 js/ui/status/network.js:1691
msgid "Network Manager" msgid "Network Manager"
msgstr "網路管理員" msgstr "網路管理員"
#: js/ui/components/polkitAgent.js:48 #: js/ui/components/polkitAgent.js:43
msgid "Authentication Required" msgid "Authentication Required"
msgstr "要求核對" msgstr "要求核對"
#: js/ui/components/polkitAgent.js:76 #: js/ui/components/polkitAgent.js:71
msgid "Administrator" msgid "Administrator"
msgstr "管理員" msgstr "管理員"
#: js/ui/components/polkitAgent.js:156 #: js/ui/components/polkitAgent.js:151
msgid "Authenticate" msgid "Authenticate"
msgstr "核對" msgstr "核對"
@@ -921,7 +921,7 @@ msgstr "核對"
#. * requested authentication was not gained; this can happen #. * requested authentication was not gained; this can happen
#. * because of an authentication error (like invalid password), #. * because of an authentication error (like invalid password),
#. * for instance. #. * for instance.
#: js/ui/components/polkitAgent.js:283 js/ui/shellMountOperation.js:327 #: js/ui/components/polkitAgent.js:270 js/ui/shellMountOperation.js:327
msgid "Sorry, that didnt work. Please try again." msgid "Sorry, that didnt work. Please try again."
msgstr "抱歉,那沒有作用。請再試一次。" msgstr "抱歉,那沒有作用。請再試一次。"
@@ -969,7 +969,7 @@ msgstr "加入世界時鐘…"
msgid "World Clocks" msgid "World Clocks"
msgstr "世界時鐘" msgstr "世界時鐘"
#: js/ui/dateMenu.js:227 #: js/ui/dateMenu.js:225
msgid "Weather" msgid "Weather"
msgstr "天氣" msgstr "天氣"
@@ -977,7 +977,7 @@ msgstr "天氣"
#. libgweather for the possible condition strings. If at all #. libgweather for the possible condition strings. If at all
#. possible, the sentence should match the grammatical case etc. of #. possible, the sentence should match the grammatical case etc. of
#. the inserted conditions. #. the inserted conditions.
#: js/ui/dateMenu.js:291 #: js/ui/dateMenu.js:289
#, javascript-format #, javascript-format
msgid "%s all day." msgid "%s all day."
msgstr "全天%s。" msgstr "全天%s。"
@@ -986,7 +986,7 @@ msgstr "全天%s。"
#. libgweather for the possible condition strings. If at all #. libgweather for the possible condition strings. If at all
#. possible, the sentence should match the grammatical case etc. of #. possible, the sentence should match the grammatical case etc. of
#. the inserted conditions. #. the inserted conditions.
#: js/ui/dateMenu.js:297 #: js/ui/dateMenu.js:295
#, javascript-format #, javascript-format
msgid "%s, then %s later." msgid "%s, then %s later."
msgstr "%s較晚%s。" msgstr "%s較晚%s。"
@@ -995,30 +995,30 @@ msgstr "%s較晚%s。"
#. libgweather for the possible condition strings. If at all #. libgweather for the possible condition strings. If at all
#. possible, the sentence should match the grammatical case etc. of #. possible, the sentence should match the grammatical case etc. of
#. the inserted conditions. #. the inserted conditions.
#: js/ui/dateMenu.js:303 #: js/ui/dateMenu.js:301
#, javascript-format #, javascript-format
msgid "%s, then %s, followed by %s later." msgid "%s, then %s, followed by %s later."
msgstr "%s然後%s接著較晚%s。" msgstr "%s然後%s接著較晚%s。"
#: js/ui/dateMenu.js:314 #: js/ui/dateMenu.js:312
msgid "Select a location…" msgid "Select a location…"
msgstr "選擇位置…" msgstr "選擇位置…"
#: js/ui/dateMenu.js:317 #: js/ui/dateMenu.js:315
msgid "Loading…" msgid "Loading…"
msgstr "載入中…" msgstr "載入中…"
#. Translators: %s is a temperature with unit, e.g. "23℃" #. Translators: %s is a temperature with unit, e.g. "23℃"
#: js/ui/dateMenu.js:323 #: js/ui/dateMenu.js:321
#, javascript-format #, javascript-format
msgid "Feels like %s." msgid "Feels like %s."
msgstr "體感溫度 %s。" msgstr "體感溫度 %s。"
#: js/ui/dateMenu.js:326 #: js/ui/dateMenu.js:324
msgid "Go online for weather information" msgid "Go online for weather information"
msgstr "上線以取得天氣資訊" msgstr "上線以取得天氣資訊"
#: js/ui/dateMenu.js:328 #: js/ui/dateMenu.js:326
msgid "Weather information is currently unavailable" msgid "Weather information is currently unavailable"
msgstr "天氣資訊目前不可使用" msgstr "天氣資訊目前不可使用"
@@ -1239,13 +1239,13 @@ msgid "Leave On"
msgstr "離開" msgstr "離開"
#: js/ui/kbdA11yDialog.js:59 js/ui/status/bluetooth.js:143 #: js/ui/kbdA11yDialog.js:59 js/ui/status/bluetooth.js:143
#: js/ui/status/network.js:1294 #: js/ui/status/network.js:1281
msgid "Turn On" msgid "Turn On"
msgstr "開啟" msgstr "開啟"
#: js/ui/kbdA11yDialog.js:67 js/ui/status/bluetooth.js:143 #: js/ui/kbdA11yDialog.js:67 js/ui/status/bluetooth.js:143
#: js/ui/status/network.js:154 js/ui/status/network.js:337 #: js/ui/status/network.js:154 js/ui/status/network.js:337
#: js/ui/status/network.js:1294 js/ui/status/network.js:1409 #: js/ui/status/network.js:1281 js/ui/status/network.js:1396
#: js/ui/status/nightLight.js:47 js/ui/status/rfkill.js:90 #: js/ui/status/nightLight.js:47 js/ui/status/rfkill.js:90
#: js/ui/status/rfkill.js:117 #: js/ui/status/rfkill.js:117
msgid "Turn Off" msgid "Turn Off"
@@ -1307,7 +1307,7 @@ msgstr "檢示來源"
msgid "Web Page" msgid "Web Page"
msgstr "網頁" msgstr "網頁"
#: js/ui/messageTray.js:1495 #: js/ui/messageTray.js:1493
msgid "System Information" msgid "System Information"
msgstr "系統資訊" msgstr "系統資訊"
@@ -1622,7 +1622,7 @@ msgid "<unknown>"
msgstr "<不明>" msgstr "<不明>"
#. Translators: %s is a network identifier #. Translators: %s is a network identifier
#: js/ui/status/network.js:441 js/ui/status/network.js:1323 #: js/ui/status/network.js:441 js/ui/status/network.js:1310
#, javascript-format #, javascript-format
msgid "%s Off" msgid "%s Off"
msgstr "%s 關閉" msgstr "%s 關閉"
@@ -1648,7 +1648,7 @@ msgid "%s Disconnecting"
msgstr "%s 正在斷線" msgstr "%s 正在斷線"
#. Translators: %s is a network identifier #. Translators: %s is a network identifier
#: js/ui/status/network.js:459 js/ui/status/network.js:1315 #: js/ui/status/network.js:459 js/ui/status/network.js:1302
#, javascript-format #, javascript-format
msgid "%s Connecting" msgid "%s Connecting"
msgstr "正連線到 %s" msgstr "正連線到 %s"
@@ -1688,7 +1688,7 @@ msgid "Mobile Broadband Settings"
msgstr "行動寬頻設定值" msgstr "行動寬頻設定值"
#. Translators: %s is a network identifier #. Translators: %s is a network identifier
#: js/ui/status/network.js:578 js/ui/status/network.js:1320 #: js/ui/status/network.js:578 js/ui/status/network.js:1307
#, javascript-format #, javascript-format
msgid "%s Hardware Disabled" msgid "%s Hardware Disabled"
msgstr "%s 硬體已停用" msgstr "%s 硬體已停用"
@@ -1744,78 +1744,78 @@ msgstr "沒有網路"
msgid "Use hardware switch to turn off" msgid "Use hardware switch to turn off"
msgstr "使用硬體開關來關閉" msgstr "使用硬體開關來關閉"
#: js/ui/status/network.js:1186 #: js/ui/status/network.js:1173
msgid "Select Network" msgid "Select Network"
msgstr "選擇網路" msgstr "選擇網路"
#: js/ui/status/network.js:1192 #: js/ui/status/network.js:1179
msgid "Wi-Fi Settings" msgid "Wi-Fi Settings"
msgstr "Wi-Fi 設定值" msgstr "Wi-Fi 設定值"
#. Translators: %s is a network identifier #. Translators: %s is a network identifier
#: js/ui/status/network.js:1311 #: js/ui/status/network.js:1298
#, javascript-format #, javascript-format
msgid "%s Hotspot Active" msgid "%s Hotspot Active"
msgstr "%s 熱點有效" msgstr "%s 熱點有效"
#. Translators: %s is a network identifier #. Translators: %s is a network identifier
#: js/ui/status/network.js:1326 #: js/ui/status/network.js:1313
#, javascript-format #, javascript-format
msgid "%s Not Connected" msgid "%s Not Connected"
msgstr "%s 未連線" msgstr "%s 未連線"
#: js/ui/status/network.js:1426 #: js/ui/status/network.js:1413
msgid "connecting…" msgid "connecting…"
msgstr "連線中…" msgstr "連線中…"
#. Translators: this is for network connections that require some kind of key or password #. Translators: this is for network connections that require some kind of key or password
#: js/ui/status/network.js:1429 #: js/ui/status/network.js:1416
msgid "authentication required" msgid "authentication required"
msgstr "要求核對" msgstr "要求核對"
#: js/ui/status/network.js:1431 #: js/ui/status/network.js:1418
msgid "connection failed" msgid "connection failed"
msgstr "連線失敗" msgstr "連線失敗"
#: js/ui/status/network.js:1485 #: js/ui/status/network.js:1472
msgid "VPN Settings" msgid "VPN Settings"
msgstr "VPN 設定值" msgstr "VPN 設定值"
#: js/ui/status/network.js:1498 #: js/ui/status/network.js:1485
msgid "VPN" msgid "VPN"
msgstr "VPN" msgstr "VPN"
#: js/ui/status/network.js:1508 #: js/ui/status/network.js:1495
msgid "VPN Off" msgid "VPN Off"
msgstr "VPN 關閉" msgstr "VPN 關閉"
#: js/ui/status/network.js:1572 js/ui/status/rfkill.js:93 #: js/ui/status/network.js:1559 js/ui/status/rfkill.js:93
msgid "Network Settings" msgid "Network Settings"
msgstr "網路設定值" msgstr "網路設定值"
#: js/ui/status/network.js:1601 #: js/ui/status/network.js:1588
#, javascript-format #, javascript-format
msgid "%s Wired Connection" msgid "%s Wired Connection"
msgid_plural "%s Wired Connections" msgid_plural "%s Wired Connections"
msgstr[0] "%s 個有線網路連線" msgstr[0] "%s 個有線網路連線"
#: js/ui/status/network.js:1605 #: js/ui/status/network.js:1592
#, javascript-format #, javascript-format
msgid "%s Wi-Fi Connection" msgid "%s Wi-Fi Connection"
msgid_plural "%s Wi-Fi Connections" msgid_plural "%s Wi-Fi Connections"
msgstr[0] "%s 個 Wi-Fi 連線" msgstr[0] "%s 個 Wi-Fi 連線"
#: js/ui/status/network.js:1609 #: js/ui/status/network.js:1596
#, javascript-format #, javascript-format
msgid "%s Modem Connection" msgid "%s Modem Connection"
msgid_plural "%s Modem Connections" msgid_plural "%s Modem Connections"
msgstr[0] "%s 個數據機連線" msgstr[0] "%s 個數據機連線"
#: js/ui/status/network.js:1741 #: js/ui/status/network.js:1728
msgid "Connection failed" msgid "Connection failed"
msgstr "連線失敗" msgstr "連線失敗"
#: js/ui/status/network.js:1742 #: js/ui/status/network.js:1729
msgid "Activation of network connection failed" msgid "Activation of network connection failed"
msgstr "啟動網路連線失敗" msgstr "啟動網路連線失敗"
@@ -1918,7 +1918,7 @@ msgstr "Thunderbolt 授權錯誤"
#: js/ui/status/thunderbolt.js:357 #: js/ui/status/thunderbolt.js:357
#, javascript-format #, javascript-format
msgid "Could not authorize the Thunderbolt device: %s" msgid "Could not authorize the thunderbolt device: %s"
msgstr "無法授權該 Thunderbolt 裝置:%s" msgstr "無法授權該 Thunderbolt 裝置:%s"
#: js/ui/status/volume.js:128 #: js/ui/status/volume.js:128

View File

@@ -590,11 +590,6 @@ app_load_events (App *app)
g_list_free (app->live_views); g_list_free (app->live_views);
app->live_views = NULL; app->live_views = NULL;
if (!app->since || !app->until)
{
print_debug ("Skipping load of events, no time interval set yet");
return;
}
/* timezone could have changed */ /* timezone could have changed */
app_update_timezone (app); app_update_timezone (app);

View File

@@ -347,10 +347,10 @@ if options.perf == None:
options.perf = 'core' options.perf = 'core'
if options.extra_filter is None: if options.extra_filter is None:
options.extra_filter = [] if options.hwtest:
options.extra_filter = ['Gedit']
if options.perf == 'hwtest': else:
options.extra_filter.append('Gedit') options.extra_filter = []
if args: if args:
parser.print_usage() parser.print_usage()

View File

@@ -31,8 +31,6 @@ struct _ShellScreenshotPrivate
char *filename; char *filename;
char *filename_used; char *filename_used;
GDateTime *datetime;
cairo_surface_t *image; cairo_surface_t *image;
cairo_rectangle_int_t screenshot_area; cairo_rectangle_int_t screenshot_area;
@@ -74,7 +72,6 @@ on_screenshot_written (GObject *source,
g_clear_pointer (&priv->image, cairo_surface_destroy); g_clear_pointer (&priv->image, cairo_surface_destroy);
g_clear_pointer (&priv->filename, g_free); g_clear_pointer (&priv->filename, g_free);
g_clear_pointer (&priv->filename_used, g_free); g_clear_pointer (&priv->filename_used, g_free);
g_clear_pointer (&priv->datetime, g_date_time_unref);
meta_enable_unredirect_for_screen (shell_global_get_screen (priv->global)); meta_enable_unredirect_for_screen (shell_global_get_screen (priv->global));
} }
@@ -178,7 +175,6 @@ write_screenshot_thread (GTask *result,
GOutputStream *stream; GOutputStream *stream;
ShellScreenshot *screenshot = SHELL_SCREENSHOT (object); ShellScreenshot *screenshot = SHELL_SCREENSHOT (object);
ShellScreenshotPrivate *priv; ShellScreenshotPrivate *priv;
char *creation_time;
g_assert (screenshot != NULL); g_assert (screenshot != NULL);
@@ -197,18 +193,14 @@ write_screenshot_thread (GTask *result,
0, 0, 0, 0,
cairo_image_surface_get_width (priv->image), cairo_image_surface_get_width (priv->image),
cairo_image_surface_get_height (priv->image)); cairo_image_surface_get_height (priv->image));
creation_time = g_date_time_format (priv->datetime, "%c");
if (gdk_pixbuf_save_to_stream (pixbuf, stream, "png", NULL, NULL, if (gdk_pixbuf_save_to_stream (pixbuf, stream, "png", NULL, NULL,
"tEXt::Software", "gnome-screenshot", "tEXt::Software", "gnome-screenshot", NULL))
"tEXt::Creation Time", creation_time,
NULL))
status = CAIRO_STATUS_SUCCESS; status = CAIRO_STATUS_SUCCESS;
else else
status = CAIRO_STATUS_WRITE_ERROR; status = CAIRO_STATUS_WRITE_ERROR;
g_object_unref (pixbuf); g_object_unref (pixbuf);
g_free (creation_time);
} }
@@ -249,7 +241,6 @@ do_grab_screenshot (ShellScreenshot *screenshot,
n_captures, n_captures,
x, y, x, y,
width, height); width, height);
priv->datetime = g_date_time_new_now_local ();
for (i = 0; i < n_captures; i++) for (i = 0; i < n_captures; i++)
cairo_surface_destroy (captures[i].image); cairo_surface_destroy (captures[i].image);
@@ -441,7 +432,6 @@ grab_window_screenshot (ClutterActor *stage,
stex = META_SHAPED_TEXTURE (meta_window_actor_get_texture (META_WINDOW_ACTOR (window_actor))); stex = META_SHAPED_TEXTURE (meta_window_actor_get_texture (META_WINDOW_ACTOR (window_actor)));
priv->image = meta_shaped_texture_get_image (stex, &clip); priv->image = meta_shaped_texture_get_image (stex, &clip);
priv->datetime = g_date_time_new_now_local ();
settings = g_settings_new (A11Y_APPS_SCHEMA); settings = g_settings_new (A11Y_APPS_SCHEMA);
if (priv->include_cursor && !g_settings_get_boolean (settings, MAGNIFIER_ACTIVE_KEY)) if (priv->include_cursor && !g_settings_get_boolean (settings, MAGNIFIER_ACTIVE_KEY))

View File

@@ -395,13 +395,6 @@ get_app_for_window (ShellWindowTracker *tracker,
if (meta_window_is_remote (window)) if (meta_window_is_remote (window))
return _shell_app_new_for_window (window); return _shell_app_new_for_window (window);
/* Check if the window was opened from within a sandbox; if this
* is the case, a corresponding .desktop file is guaranteed to match;
*/
result = get_app_from_sandboxed_app_id (window);
if (result != NULL)
return result;
/* Check if the window has a GApplication ID attached; this is /* Check if the window has a GApplication ID attached; this is
* canonical if it does * canonical if it does
*/ */
@@ -416,6 +409,15 @@ get_app_for_window (ShellWindowTracker *tracker,
if (result != NULL) if (result != NULL)
return result; return result;
/* Check if the window was opened from within a sandbox; if this
* is the case, a corresponding .desktop file is guaranteed to match;
* Do this after having checked by WM_CLASS so that sandboxed apps
* installing multiple .desktop files can properly match their windows.
*/
result = get_app_from_sandboxed_app_id (window);
if (result != NULL)
return result;
result = get_app_from_window_pid (tracker, window); result = get_app_from_window_pid (tracker, window);
if (result != NULL) if (result != NULL)
return result; return result;

View File

@@ -142,7 +142,7 @@ libst_gir = gnome.generate_gir(libst,
sources: st_gir_sources, sources: st_gir_sources,
nsversion: '1.0', nsversion: '1.0',
namespace: 'St', namespace: 'St',
includes: ['Clutter-' + mutter_api_version, 'Cally-' + mutter_api_version, 'Gtk-3.0'], includes: ['Clutter-' + mutter_api_version, 'Gtk-3.0'],
dependencies: [mutter_dep], dependencies: [mutter_dep],
include_directories: include_directories('..'), include_directories: include_directories('..'),
extra_args: ['-DST_COMPILATION', '--quiet'], extra_args: ['-DST_COMPILATION', '--quiet'],

View File

@@ -180,7 +180,6 @@ st_label_dispose (GObject *object)
{ {
StLabelPrivate *priv = ST_LABEL (object)->priv; StLabelPrivate *priv = ST_LABEL (object)->priv;
priv->label = NULL;
g_clear_pointer (&priv->text_shadow_pipeline, cogl_object_unref); g_clear_pointer (&priv->text_shadow_pipeline, cogl_object_unref);
G_OBJECT_CLASS (st_label_parent_class)->dispose (object); G_OBJECT_CLASS (st_label_parent_class)->dispose (object);

View File

@@ -117,7 +117,6 @@ _st_set_text_from_style (ClutterText *text,
const PangoFontDescription *font; const PangoFontDescription *font;
StTextAlign align; StTextAlign align;
gdouble spacing; gdouble spacing;
gchar *font_features;
st_theme_node_get_foreground_color (theme_node, &color); st_theme_node_get_foreground_color (theme_node, &color);
clutter_text_set_color (text, &color); clutter_text_set_color (text, &color);
@@ -152,13 +151,6 @@ _st_set_text_from_style (ClutterText *text,
pango_attr_list_insert (attribs, letter_spacing); pango_attr_list_insert (attribs, letter_spacing);
} }
font_features = st_theme_node_get_font_features (theme_node);
if (font_features)
{
pango_attr_list_insert (attribs, pango_attr_font_features_new (font_features));
g_free (font_features);
}
clutter_text_set_attributes (text, attribs); clutter_text_set_attributes (text, attribs);
if (attribs) if (attribs)

View File

@@ -37,7 +37,6 @@ struct _StTextureCachePrivate
/* Things that were loaded with a cache policy != NONE */ /* Things that were loaded with a cache policy != NONE */
GHashTable *keyed_cache; /* char * -> CoglTexture* */ GHashTable *keyed_cache; /* char * -> CoglTexture* */
GHashTable *keyed_surface_cache; /* char * -> cairo_surface_t* */
/* Presently this is used to de-duplicate requests for GIcons and async URIs. */ /* Presently this is used to de-duplicate requests for GIcons and async URIs. */
GHashTable *outstanding_requests; /* char * -> AsyncTextureLoadData * */ GHashTable *outstanding_requests; /* char * -> AsyncTextureLoadData * */
@@ -146,10 +145,6 @@ st_texture_cache_init (StTextureCache *self)
self->priv->keyed_cache = g_hash_table_new_full (g_str_hash, g_str_equal, self->priv->keyed_cache = g_hash_table_new_full (g_str_hash, g_str_equal,
g_free, cogl_object_unref); g_free, cogl_object_unref);
self->priv->keyed_surface_cache = g_hash_table_new_full (g_str_hash,
g_str_equal,
g_free,
(GDestroyNotify) cairo_surface_destroy);
self->priv->outstanding_requests = g_hash_table_new_full (g_str_hash, g_str_equal, self->priv->outstanding_requests = g_hash_table_new_full (g_str_hash, g_str_equal,
g_free, NULL); g_free, NULL);
self->priv->file_monitors = g_hash_table_new_full (g_file_hash, (GEqualFunc) g_file_equal, self->priv->file_monitors = g_hash_table_new_full (g_file_hash, (GEqualFunc) g_file_equal,
@@ -171,7 +166,6 @@ st_texture_cache_dispose (GObject *object)
} }
g_clear_pointer (&self->priv->keyed_cache, g_hash_table_destroy); g_clear_pointer (&self->priv->keyed_cache, g_hash_table_destroy);
g_clear_pointer (&self->priv->keyed_surface_cache, g_hash_table_destroy);
g_clear_pointer (&self->priv->outstanding_requests, g_hash_table_destroy); g_clear_pointer (&self->priv->outstanding_requests, g_hash_table_destroy);
g_clear_pointer (&self->priv->file_monitors, g_hash_table_destroy); g_clear_pointer (&self->priv->file_monitors, g_hash_table_destroy);
@@ -526,8 +520,6 @@ finish_texture_load (AsyncTextureLoadData *data,
goto out; goto out;
texdata = pixbuf_to_cogl_texture (pixbuf); texdata = pixbuf_to_cogl_texture (pixbuf);
if (!texdata)
goto out;
if (data->policy != ST_TEXTURE_CACHE_POLICY_NONE) if (data->policy != ST_TEXTURE_CACHE_POLICY_NONE)
{ {
@@ -994,7 +986,7 @@ file_changed_cb (GFileMonitor *monitor,
g_free (key); g_free (key);
key = g_strdup_printf (CACHE_PREFIX_FILE_FOR_CAIRO "%u", file_hash); key = g_strdup_printf (CACHE_PREFIX_FILE_FOR_CAIRO "%u", file_hash);
g_hash_table_remove (cache->priv->keyed_surface_cache, key); g_hash_table_remove (cache->priv->keyed_cache, key);
g_free (key); g_free (key);
g_signal_emit (cache, signals[TEXTURE_FILE_CHANGED], 0, file); g_signal_emit (cache, signals[TEXTURE_FILE_CHANGED], 0, file);
@@ -1281,9 +1273,6 @@ st_texture_cache_load_file_sync_to_cogl_texture (StTextureCache *cache,
texdata = pixbuf_to_cogl_texture (pixbuf); texdata = pixbuf_to_cogl_texture (pixbuf);
g_object_unref (pixbuf); g_object_unref (pixbuf);
if (!texdata)
goto out;
if (policy == ST_TEXTURE_CACHE_POLICY_FOREVER) if (policy == ST_TEXTURE_CACHE_POLICY_FOREVER)
{ {
cogl_object_ref (texdata); cogl_object_ref (texdata);
@@ -1315,7 +1304,7 @@ st_texture_cache_load_file_sync_to_cairo_surface (StTextureCache *cache,
key = g_strdup_printf (CACHE_PREFIX_FILE_FOR_CAIRO "%u", g_file_hash (file)); key = g_strdup_printf (CACHE_PREFIX_FILE_FOR_CAIRO "%u", g_file_hash (file));
surface = g_hash_table_lookup (cache->priv->keyed_surface_cache, key); surface = g_hash_table_lookup (cache->priv->keyed_cache, key);
if (surface == NULL) if (surface == NULL)
{ {
@@ -1329,8 +1318,7 @@ st_texture_cache_load_file_sync_to_cairo_surface (StTextureCache *cache,
if (policy == ST_TEXTURE_CACHE_POLICY_FOREVER) if (policy == ST_TEXTURE_CACHE_POLICY_FOREVER)
{ {
cairo_surface_reference (surface); cairo_surface_reference (surface);
g_hash_table_insert (cache->priv->keyed_surface_cache, g_hash_table_insert (cache->priv->keyed_cache, g_strdup (key), surface);
g_strdup (key), surface);
} }
} }
else else

View File

@@ -3019,39 +3019,6 @@ st_theme_node_get_font (StThemeNode *node)
return node->font_desc; return node->font_desc;
} }
gchar *
st_theme_node_get_font_features (StThemeNode *node)
{
int i;
ensure_properties (node);
for (i = node->n_properties - 1; i >= 0; i--)
{
CRDeclaration *decl = node->properties[i];
if (strcmp (decl->property->stryng->str, "font-feature-settings") == 0)
{
CRTerm *term = decl->value;
if (!term->next && term->type == TERM_IDENT)
{
gchar *ident = term->content.str->stryng->str;
if (strcmp (ident, "inherit") == 0)
break;
if (strcmp (ident, "normal") == 0)
return NULL;
}
return (gchar *)cr_term_to_string (term);
}
}
return node->parent_node ? st_theme_node_get_font_features (node->parent_node) : NULL;
}
/** /**
* st_theme_node_get_border_image: * st_theme_node_get_border_image:
* @node: a #StThemeNode * @node: a #StThemeNode

View File

@@ -232,8 +232,6 @@ double st_theme_node_get_letter_spacing (StThemeNode *node);
*/ */
const PangoFontDescription *st_theme_node_get_font (StThemeNode *node); const PangoFontDescription *st_theme_node_get_font (StThemeNode *node);
gchar *st_theme_node_get_font_features (StThemeNode *node);
StBorderImage *st_theme_node_get_border_image (StThemeNode *node); StBorderImage *st_theme_node_get_border_image (StThemeNode *node);
StShadow *st_theme_node_get_box_shadow (StThemeNode *node); StShadow *st_theme_node_get_box_shadow (StThemeNode *node);
StShadow *st_theme_node_get_text_shadow (StThemeNode *node); StShadow *st_theme_node_get_text_shadow (StThemeNode *node);

View File

@@ -59,24 +59,6 @@ assert_font (StThemeNode *node,
g_free (value); g_free (value);
} }
static void
assert_font_features (StThemeNode *node,
const char *node_description,
const char *expected)
{
char *value = st_theme_node_get_font_features (node);
if (g_strcmp0 (expected, value) != 0)
{
g_print ("%s: %s.font-feature-settings: expected: %s, got: %s\n",
test, node_description, expected, value);
fail = TRUE;
}
if (value)
g_free (value);
}
static char * static char *
text_decoration_to_string (StTextDecoration decoration) text_decoration_to_string (StTextDecoration decoration)
{ {
@@ -414,7 +396,7 @@ test_background (void)
/* text1 inherits the background image but not the color */ /* text1 inherits the background image but not the color */
assert_background_color (text1, "text1", 0x00000000); assert_background_color (text1, "text1", 0x00000000);
assert_background_image (text1, "text1", "st/some-background.png"); assert_background_image (text1, "text1", "st/some-background.png");
/* text2 inherits both, but then background: none overrides both */ /* text1 inherits inherits both, but then background: none overrides both */
assert_background_color (text2, "text2", 0x00000000); assert_background_color (text2, "text2", 0x00000000);
assert_background_image (text2, "text2", NULL); assert_background_image (text2, "text2", NULL);
/* background-image property */ /* background-image property */
@@ -431,22 +413,6 @@ test_font (void)
assert_font (text3, "text3", "serif Bold Oblique Small-Caps 24px"); assert_font (text3, "text3", "serif Bold Oblique Small-Caps 24px");
} }
static void
test_font_features (void)
{
test = "font_features";
/* group1 has font-feature-settings: "tnum" */
assert_font_features (group1, "group1", "\"tnum\"");
/* text2 should inherit from group1 */
assert_font_features (text2, "text2", "\"tnum\"");
/* group2 has font-feature-settings: "tnum", "zero" */
assert_font_features (group2, "group2", "\"tnum\", \"zero\"");
/* text3 should inherit from group2 using the inherit keyword */
assert_font_features (text3, "text3", "\"tnum\", \"zero\"");
/* text4 has font-feature-settings: normal */
assert_font_features (text4, "text4", NULL);
}
static void static void
test_pseudo_class (void) test_pseudo_class (void)
{ {
@@ -588,7 +554,6 @@ main (int argc, char **argv)
test_border (); test_border ();
test_background (); test_background ();
test_font (); test_font ();
test_font_features ();
test_pseudo_class (); test_pseudo_class ();
test_inline_style (); test_inline_style ();

View File

@@ -13,8 +13,6 @@ stage {
margin-left: 1in; margin-left: 1in;
background: #ff0000 url('some-background.png'); background: #ff0000 url('some-background.png');
font-feature-settings: "tnum";
} }
#text1 { #text1 {
@@ -37,7 +35,6 @@ ClutterTexture.special-text {
#group2 { #group2 {
font: italic 12px serif; font: italic 12px serif;
font-feature-settings: "tnum", "zero";
} }
#text3 { #text3 {
@@ -45,11 +42,6 @@ ClutterTexture.special-text {
font-weight: bold; font-weight: bold;
font-style: oblique; font-style: oblique;
font-size: 200%; font-size: 200%;
font-feature-settings: "pnum";
}
#text4 {
font-feature-settings: normal;
} }
ClutterTexture { ClutterTexture {
@@ -68,10 +60,6 @@ stage > #text2 {
color: #ff0000; color: #ff0000;
} }
#group2 > #text3 {
font-feature-settings: inherit;
}
#group2 { #group2 {
background-image: url('other-background.png'); background-image: url('other-background.png');
padding: 1px 2px 3px 4px; padding: 1px 2px 3px 4px;