Commit 3e8c6810 authored by Simon McVittie's avatar Simon McVittie

New upstream version 0~git20180918

parents 63221d33 71b6392c
commit 71b6392c53e063563602c3d919c0ec6a4c5c9733
Author: Jean-Philippe Braun <eon@patapon.info>
Date: 2018-09-18 10:43:48 +0200
Fix typo
Closes #127
commit 31722f05a575e835d3c7ec194d73c9c93ece9405
Author: Jean-Philippe Braun <eon@patapon.info>
Date: 2018-09-18 09:20:35 +0200
Add support for 3.30
commit 5059ef685573c1b1767423d5a87b47a738b63110
Merge: dfa164c 0fd2995
Author: Jean-Philippe Braun <eon@patapon.info>
Date: 2018-09-18 09:17:18 +0200
Merge pull request #126 from bulletmark/master
GNOME 3.30 elimates global.screen
commit 0fd29958ff5b6b2cb0bf63e549ea414882369ab4
Author: Mark Blakeney <mark.blakeney@bullet-systems.net>
Date: 2018-09-18 08:32:51 +1000
GNOME 3.30 elimates global.screen
Fixes bug https://github.com/eonpatapon/gnome-shell-extension-caffeine/issues/123.
I suggest this as a neater and more efficient version of
pull request https://github.com/eonpatapon/gnome-shell-extension-caffeine/pull/124.
commit dfa164c29af62f708488ece826b8bfe63b0ab85c
Merge: f32ab65 ab01975
Author: Jean-Philippe Braun <eon@patapon.info>
Date: 2018-06-23 14:25:23 +0200
Merge pull request #122 from lacosz/patch-1
The Hungarian translation is completed.
commit ab01975f2de88d5688ecce46e8c9337274162be9
Author: Kardos László <842504+lacosz@users.noreply.github.com>
Date: 2018-06-22 21:25:03 +0200
The Hungarian translation is completed.
commit f32ab65f1e0b3d50fde04101ddff5613de2a4251
Merge: cb198a6 237ae5e
Author: Jean-Philippe Braun <eon@patapon.info>
Date: 2018-06-21 09:53:31 +0200
Merge pull request #116 from smarquez1/patch-2
Update missing Spanish translations
commit cb198a6735337395b4ce94bae6aaf6989f2d946c
Merge: d7bc1ab 60d71b7
Author: Jean-Philippe Braun <eon@patapon.info>
Date: 2018-06-21 09:53:20 +0200
Merge pull request #118 from MorganAntonsson/swedish
Add Swedish translation
commit 60d71b75cb7fa3821db491fd4e5ba19120ef50ce
Author: Morgan Antonsson <morgan.antonsson@gmail.com>
Date: 2018-04-04 20:32:25 +0200
Add Swedish translation
commit 237ae5e747777abc24b7e03bd60f48c6fe9a18ef
Author: Sergio Márquez <marquez.sergio.d@gmail.com>
Date: 2018-01-12 20:15:06 -0300
Update missing Spanish translations
commit d7bc1ab3c4db85034aa3aef14f6ef7e3127c6798
Merge: 7102e73 01dec94
Author: Jean-Philippe Braun <eon@patapon.info>
......
......@@ -114,9 +114,18 @@ const Caffeine = new Lang.Class({
// From auto-move-windows@gnome-shell-extensions.gcampax.github.com
this._windowTracker = Shell.WindowTracker.get_default();
let display = global.screen.get_display();
if (global.screen) {
this._screen = global.screen;
this._display = this._screen.get_display();
}
else {
this._screen = global.display;
this._display = this._screen;
}
// Connect after so the handler from ShellWindowTracker has already run
this._windowCreatedId = display.connect_after('window-created', Lang.bind(this, this._mayInhibit));
this._windowCreatedId = this._display.connect_after('window-created', Lang.bind(this, this._mayInhibit));
let shellwm = global.window_manager;
this._windowDestroyedId = shellwm.connect('destroy', Lang.bind(this, this._mayUninhibit));
......@@ -143,7 +152,7 @@ const Caffeine = new Lang.Class({
}
// Enable caffeine when fullscreen app is running
if (this._settings.get_boolean(FULLSCREEN_KEY)) {
this._inFullscreenId = global.screen.connect('in-fullscreen-changed', Lang.bind(this, this.toggleFullscreen));
this._inFullscreenId = this._screen.connect('in-fullscreen-changed', Lang.bind(this, this.toggleFullscreen));
this.toggleFullscreen();
}
// List current windows to check if we need to inhibit
......@@ -153,10 +162,10 @@ const Caffeine = new Lang.Class({
},
get inFullscreen() {
let nb_monitors = global.screen.get_n_monitors();
let nb_monitors = this._screen.get_n_monitors();
let inFullscreen = false;
for (let i=0; i<nb_monitors; i++) {
if (global.screen.get_monitor_in_fullscreen(i)) {
if (this._screen.get_monitor_in_fullscreen(i)) {
inFullscreen = true;
break;
}
......@@ -282,7 +291,7 @@ const Caffeine = new Lang.Class({
}));
// disconnect from signals
if (this._settings.get_boolean(FULLSCREEN_KEY))
global.screen.disconnect(this._inFullscreenId);
this._screen.disconnect(this._inFullscreenId);
if (this._inhibitorAddedId) {
this._sessionManager.disconnectSignal(this._inhibitorAddedId);
this._inhibitorAddedId = 0;
......@@ -292,7 +301,7 @@ const Caffeine = new Lang.Class({
this._inhibitorRemovedId = 0;
}
if (this._windowCreatedId) {
global.screen.get_display().disconnect(this._windowCreatedId);
this._display.disconnect(this._windowCreatedId);
this._windowCreatedId = 0;
}
if (this._windowDestroyedId) {
......
......@@ -4,7 +4,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-02-08 21:38+0800\n"
"PO-Revision-Date: 2015-11-28 21:06-0300\n"
"Last-Translator: Cristian Beroiza <cberoiza@gmail.com>\n"
"Last-Translator: Sergio D. Márquez <marquez.sergio.d@gmail.com>\n"
"Language-Team: Spanish\n"
"Language: es\n"
"MIME-Version: 1.0\n"
......@@ -19,11 +19,11 @@ msgstr ""
#: extension.js:220
msgid "Auto suspend and screensaver disabled"
msgstr "Deshabilitar auto suspensión y salvapantallas"
msgstr "Auto suspensión y salvapantallas deshabilitados"
#: extension.js:239
msgid "Auto suspend and screensaver enabled"
msgstr "Habilitar auto suspensión y salvapantallas"
msgstr "Auto suspensión y salvapantallas habilitados"
#: prefs.js:46
msgid "Show Caffeine in top panel"
......@@ -36,7 +36,7 @@ msgstr "Activar cuando una aplicación a pantalla completa esté en ejecución"
#: prefs.js:80
msgid "Restore state across reboots"
msgstr ""
msgstr "Restablecer estado despues de reiniciar"
#: prefs.js:96
msgid "Enable notifications"
......@@ -64,21 +64,20 @@ msgid "Application list"
msgstr "Agregar aplicación"
#: schemas/org.gnome.shell.extensions.caffeine.gschema.xml:7
msgid ""
"A list of strings, each containing an application id (desktop file name)"
msgstr ""
msgid "A list of strings, each containing an application id (desktop file name)"
msgstr "Una lista de cadenas de texto, cada una conteninedo un id de aplicación (nombre de archivo desktop)"
#: schemas/org.gnome.shell.extensions.caffeine.gschema.xml:11
msgid "Store caffeine user state"
msgstr ""
msgstr "Guardar estado de usuario de Caffeine"
#: schemas/org.gnome.shell.extensions.caffeine.gschema.xml:16
msgid "Restore caffeine state"
msgstr ""
msgstr "Restablecer estado de Caffeine"
#: schemas/org.gnome.shell.extensions.caffeine.gschema.xml:21
msgid "Show indicator"
msgstr ""
msgstr "Mostrar indicador"
#: schemas/org.gnome.shell.extensions.caffeine.gschema.xml:22
#, fuzzy
......@@ -92,7 +91,7 @@ msgstr "Activar las notificaciones"
#: schemas/org.gnome.shell.extensions.caffeine.gschema.xml:27
msgid "Show notifications when enabled/disabled"
msgstr ""
msgstr "Mostrar notificaciones de habilitado/deshabilitado"
#~ msgid "Caffeine enabled"
#~ msgstr "Caffeine activado"
......
msgid ""
msgstr ""
"Project-Id-Version: gnome-shell-extension-caffeine\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-02-22 21:11+0200\n"
"PO-Revision-Date: 2018-06-22 21:22+0200\n"
"Last-Translator: Kardos László <lacesz@NOSPAM@ox dot io>\n"
"Language-Team: \n"
"Language: hu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.0.6\n"
#: extension.js:224
msgid "Auto suspend and screensaver disabled"
msgstr "Az automatikus felfüggesztés és a képernyővédő letiltva"
#: extension.js:245
msgid "Auto suspend and screensaver enabled"
msgstr "Az automatikus felfüggesztés és a képernyővédő engedélyezve"
#: prefs.js:46
msgid "Show Caffeine in top panel"
msgstr "Caffeine mutatása a felső panelen"
#: prefs.js:63 schemas/org.gnome.shell.extensions.caffeine.gschema.xml:31
#: schemas/org.gnome.shell.extensions.caffeine.gschema.xml:32
msgid "Enable when a fullscreen application is running"
msgstr "Engedélyezés, ha teljes képernyős alkalmazás fut"
#: prefs.js:80
msgid "Restore state across reboots"
msgstr "Állapot visszaállítása újraindítás közben"
#: prefs.js:96
msgid "Enable notifications"
msgstr "Értesítések engedélyezése"
#: prefs.js:117
msgid "Applications which enable Caffeine automatically"
msgstr "Alkalmazások, amelyek lehetővé teszik a Caffeine automatikus működését"
#: prefs.js:133
msgid "Add application"
msgstr "Alkalmazás hozzáadás"
#: prefs.js:147
msgid "Create new matching rule"
msgstr "Új egyezési szabály létrehozása"
#: prefs.js:151
msgid "Add"
msgstr "Hozzáadás\t"
#: schemas/org.gnome.shell.extensions.caffeine.gschema.xml:6
msgid "Application list"
msgstr "Alkalmazáslista"
#: schemas/org.gnome.shell.extensions.caffeine.gschema.xml:7
msgid "A list of strings, each containing an application id (desktop file name)"
msgstr "A karakterláncok listája, amelyek mindegyike tartalmaz egy alkalmazásazonosítót (asztali fájlnév)"
#: schemas/org.gnome.shell.extensions.caffeine.gschema.xml:11
msgid "Store caffeine user state"
msgstr "Caffeine felhasználói állapot tárolása"
#: schemas/org.gnome.shell.extensions.caffeine.gschema.xml:16
msgid "Restore caffeine state"
msgstr "Caffeine állapot visszaállítása"
#: schemas/org.gnome.shell.extensions.caffeine.gschema.xml:21
msgid "Show indicator"
msgstr "Megjenelnítés az indikátoron"
#: schemas/org.gnome.shell.extensions.caffeine.gschema.xml:22
msgid "Show the indicator on the top panel"
msgstr "Indikátor megjelenítése a panelen"
#: schemas/org.gnome.shell.extensions.caffeine.gschema.xml:26
msgid "Show notifications"
msgstr "Értesítések mutatása"
#: schemas/org.gnome.shell.extensions.caffeine.gschema.xml:27
msgid "Show notifications when enabled/disabled"
msgstr "Értesítések mutatásának engedélyezése/tiltása"
msgid ""
msgstr ""
"Project-Id-Version: gnome-shell-extension-caffeine\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-04 19:34+0200\n"
"PO-Revision-Date: 2018-04-04 20:35+0200\n"
"Last-Translator: Morgan Antonsson <morgan.antonsson@gmail.com>\n"
"Language-Team: \n"
"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: extension.js:224
msgid "Auto suspend and screensaver disabled"
msgstr "Automatiskt vänteläge och skärmsläckare inaktiverade"
#: extension.js:245
msgid "Auto suspend and screensaver enabled"
msgstr "Automatiskt vänteläge och skärmsläckare aktiverade"
#: prefs.js:46
msgid "Show Caffeine in top panel"
msgstr "Visa Caffeine i panelen"
#: prefs.js:63 schemas/org.gnome.shell.extensions.caffeine.gschema.xml:31
#: schemas/org.gnome.shell.extensions.caffeine.gschema.xml:32
msgid "Enable when a fullscreen application is running"
msgstr "Aktivera när ett program använder helskärmsläget"
#: prefs.js:80
msgid "Restore state across reboots"
msgstr "Återställ tillstånd efter omstart"
#: prefs.js:96
msgid "Enable notifications"
msgstr "Aktivera notifieringar"
#: prefs.js:117
msgid "Applications which enable Caffeine automatically"
msgstr "Program som automatiskt aktiverar Caffeine"
#: prefs.js:133
msgid "Add application"
msgstr "Lägg till program"
#: prefs.js:147
msgid "Create new matching rule"
msgstr "Skapa ny matchande regel"
#: prefs.js:151
msgid "Add"
msgstr "Lägg till"
#: schemas/org.gnome.shell.extensions.caffeine.gschema.xml:6
msgid "Application list"
msgstr "Programlista"
#: schemas/org.gnome.shell.extensions.caffeine.gschema.xml:7
msgid ""
"A list of strings, each containing an application id (desktop file name)"
msgstr "En lista av strängar med program-ID:n (skrivbordets filnamn)"
#: schemas/org.gnome.shell.extensions.caffeine.gschema.xml:11
msgid "Store caffeine user state"
msgstr "Spara caffeines användarstatus"
#: schemas/org.gnome.shell.extensions.caffeine.gschema.xml:16
msgid "Restore caffeine state"
msgstr "Återställ caffeine-status"
#: schemas/org.gnome.shell.extensions.caffeine.gschema.xml:21
msgid "Show indicator"
msgstr "Visa indikator"
#: schemas/org.gnome.shell.extensions.caffeine.gschema.xml:22
msgid "Show the indicator on the top panel"
msgstr "Visa indikator i panelen"
#: schemas/org.gnome.shell.extensions.caffeine.gschema.xml:26
msgid "Show notifications"
msgstr "Visa notifieringar"
#: schemas/org.gnome.shell.extensions.caffeine.gschema.xml:27
msgid "Show notifications when enabled/disabled"
msgstr "Visa notifieringar vid aktivering/inaktivering"
......@@ -10,7 +10,9 @@
"3.20",
"3.22",
"3.24",
"3.26"
"3.26",
"3.28",
"3.30"
],
"uuid": "caffeine@patapon.info",
"name": "Caffeine",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment