Skip to content

Commit d66fced

Browse files
author
queenkjuul
committed
Cleanup, settings integrations, bugfixes, translation
1 parent d3c3230 commit d66fced

File tree

7 files changed

+216
-134
lines changed

7 files changed

+216
-134
lines changed

cinnamon-screensaver.pot

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,61 +8,61 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2022-12-02 21:29+0000\n"
11+
"POT-Creation-Date: 2024-11-21 10:28-0600\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
1515
"Language: \n"
1616
"MIME-Version: 1.0\n"
17-
"Content-Type: text/plain; charset=CHARSET\n"
17+
"Content-Type: text/plain; charset=UTF-8\n"
1818
"Content-Transfer-Encoding: 8bit\n"
1919
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
2020

21-
#: src/cinnamon-screensaver-command.py:41
21+
#: src/cinnamon-screensaver-command.py:43
2222
msgid "Causes the screensaver to exit gracefully"
2323
msgstr ""
2424

25-
#: src/cinnamon-screensaver-command.py:43
25+
#: src/cinnamon-screensaver-command.py:45
2626
msgid "Query the state of the screensaver"
2727
msgstr ""
2828

29-
#: src/cinnamon-screensaver-command.py:45
29+
#: src/cinnamon-screensaver-command.py:47
3030
msgid "Query the length of time the screensaver has been active"
3131
msgstr ""
3232

33-
#: src/cinnamon-screensaver-command.py:47
33+
#: src/cinnamon-screensaver-command.py:49
3434
msgid "Tells the running screensaver process to lock the screen immediately"
3535
msgstr ""
3636

37-
#: src/cinnamon-screensaver-command.py:49
37+
#: src/cinnamon-screensaver-command.py:51
3838
msgid "Turn the screensaver on (blank the screen)"
3939
msgstr ""
4040

41-
#: src/cinnamon-screensaver-command.py:51
41+
#: src/cinnamon-screensaver-command.py:53
4242
msgid "If the screensaver is active then deactivate it (un-blank the screen)"
4343
msgstr ""
4444

45-
#: src/cinnamon-screensaver-command.py:53
45+
#: src/cinnamon-screensaver-command.py:55
4646
msgid "Version of this application"
4747
msgstr ""
4848

49-
#: src/cinnamon-screensaver-command.py:55
49+
#: src/cinnamon-screensaver-command.py:57
5050
msgid "Message to be displayed in lock screen"
5151
msgstr ""
5252

53-
#: src/cinnamon-screensaver-command.py:105
53+
#: src/cinnamon-screensaver-command.py:106
5454
msgid "The screensaver is active\n"
5555
msgstr ""
5656

57-
#: src/cinnamon-screensaver-command.py:107
57+
#: src/cinnamon-screensaver-command.py:108
5858
msgid "The screensaver is inactive\n"
5959
msgstr ""
6060

61-
#: src/cinnamon-screensaver-command.py:111
61+
#: src/cinnamon-screensaver-command.py:112
6262
msgid "The screensaver is not currently active.\n"
6363
msgstr ""
6464

65-
#: src/cinnamon-screensaver-command.py:113
65+
#: src/cinnamon-screensaver-command.py:114
6666
#, python-format
6767
msgid "The screensaver has been active for %d second.\n"
6868
msgid_plural "The screensaver has been active for %d seconds.\n"
@@ -80,7 +80,7 @@ msgid ""
8080
"prior to this occurring."
8181
msgstr ""
8282

83-
#: src/passwordEntry.py:23 src/unlock.py:216
83+
#: src/passwordEntry.py:23 src/unlock.py:215
8484
msgid "Please enter your password..."
8585
msgstr ""
8686

@@ -92,52 +92,52 @@ msgstr ""
9292
msgid "Switch User"
9393
msgstr ""
9494

95-
#: src/unlock.py:189
95+
#: src/unlock.py:188
9696
msgid "Incorrect password"
9797
msgstr ""
9898

99-
#: src/unlock.py:206
99+
#: src/unlock.py:205
100100
msgid "Checking..."
101101
msgstr ""
102102

103-
#: src/unlock.py:250
103+
#: src/unlock.py:249
104104
msgid "You have the Caps Lock key on."
105105
msgstr ""
106106

107107
#. This is the first line of text for the backup-locker, explaining how to switch to tty
108108
#. and run 'cinnamon-unlock-desktop' command. This appears if the screensaver crashes.
109-
#: backup-locker/cs-backup-locker.c:255
109+
#: backup-locker/cs-backup-locker.c:306
110110
msgid "Something went wrong with the screensaver."
111111
msgstr ""
112112

113113
#. (continued) This is a subtitle
114-
#: backup-locker/cs-backup-locker.c:265
114+
#: backup-locker/cs-backup-locker.c:316
115115
msgid "We'll help you get your desktop back"
116116
msgstr ""
117117

118118
#. (new section) Bulleted list of steps to take to unlock the desktop;
119-
#: backup-locker/cs-backup-locker.c:276
119+
#: backup-locker/cs-backup-locker.c:327
120120
#, c-format
121121
msgid "Switch to a console using <Control-Alt-F%u>."
122122
msgstr ""
123123

124124
#. (list continued)
125-
#: backup-locker/cs-backup-locker.c:278
125+
#: backup-locker/cs-backup-locker.c:329
126126
msgid "Log in by typing your user name followed by your password."
127127
msgstr ""
128128

129129
#. (list continued)
130-
#: backup-locker/cs-backup-locker.c:280
130+
#: backup-locker/cs-backup-locker.c:331
131131
msgid "At the prompt, type 'cinnamon-unlock-desktop' and press Enter."
132132
msgstr ""
133133

134134
#. (list continued)
135-
#: backup-locker/cs-backup-locker.c:282
135+
#: backup-locker/cs-backup-locker.c:333
136136
#, c-format
137137
msgid "Switch back to your unlocked desktop using <Control-Alt-F%u>."
138138
msgstr ""
139139

140140
#. (end section) Final words after the list of steps
141-
#: backup-locker/cs-backup-locker.c:287
141+
#: backup-locker/cs-backup-locker.c:338
142142
msgid "If you can reproduce this behavior, please file a report here:"
143143
msgstr ""

src/util/location.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
from abc import ABC, abstractmethod, abstractstaticmethod
1+
from abc import ABC, abstractmethod
22
from dataclasses import dataclass
33
from typing import Optional
44

5+
56
@dataclass
67
class LocationData:
78
lat: float
@@ -11,6 +12,7 @@ class LocationData:
1112
timeZone: Optional[str] = None
1213
entryText: Optional[str] = None
1314

15+
1416
class LocationProvider(ABC):
1517
@abstractmethod
1618
def GetLocation(self) -> LocationData:

0 commit comments

Comments
 (0)