summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md8
-rw-r--r--configure.ac2
-rw-r--r--data/lightdm-gtk-greeter.conf4
-rw-r--r--data/lightdm-gtk-greeter.desktop4
-rw-r--r--lightdm-gtk-greeter.doap2
-rw-r--r--po/bg.po29
-rw-r--r--po/es.po10
-rw-r--r--src/lightdm-gtk-greeter.c14
8 files changed, 41 insertions, 32 deletions
diff --git a/README.md b/README.md
index c91886f..5de4fd8 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-# LightDM GTK+ Greeter
-**LightDM GTK+ Greeter** is a greeter that has moderate requirements (GTK+).
+# LightDM GTK Greeter
+**LightDM GTK Greeter** is a greeter that has moderate requirements (GTK).
This project is one of many greeters for [LightDM](https://github.com/canonical/lightdm).
@@ -31,7 +31,7 @@ LightDM configuration is provided by the following files:
/etc/lightdm/lightdm.conf
```
-**LightDM GTK+ Greeter uses `lightdm-gtk-greeter.conf` for it's configuration.**
+**LightDM GTK Greeter uses `lightdm-gtk-greeter.conf` for it's configuration.**
System provided configuration should be stored in `/usr/share/lightdm/lightdm.conf.d/`. System administrators can override this configuration by adding files to `/etc/lightdm/lightdm.conf.d/` and `/etc/lightdm/lightdm.conf`. Files are read in the above order and combined together to make the LightDM configuration.
@@ -46,7 +46,7 @@ Configuration is in keyfile format. For most installations you will want to chan
## Questions
-Questions about LightDM and LightDM GTK+ Greeter should be asked on the [mailing list](http://lists.freedesktop.org/mailman/listinfo/lightdm). All questions are welcome.
+Questions about LightDM and LightDM GTK Greeter should be asked on the [mailing list](http://lists.freedesktop.org/mailman/listinfo/lightdm). All questions are welcome.
[Stack Overflow](http://stackoverflow.com/search?q=lightdm) and [Ask Ubuntu](http://askubuntu.com/search?q=lightdm) are good sites for frequently asked questions.
diff --git a/configure.ac b/configure.ac
index 2f5c83f..42ac01e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -266,7 +266,7 @@ AS_IF([test "x$have_libindicator" = "xyes"], [
echo "
------------------------------------------------------
- LightDM GTK+ Greeter $VERSION
+ LightDM GTK Greeter $VERSION
====================================
Installation:
diff --git a/data/lightdm-gtk-greeter.conf b/data/lightdm-gtk-greeter.conf
index df961a8..cad484b 100644
--- a/data/lightdm-gtk-greeter.conf
+++ b/data/lightdm-gtk-greeter.conf
@@ -1,11 +1,11 @@
-# LightDM GTK+ Configuration
+# LightDM GTK Configuration
# Available configuration options listed below.
# Please list the configuration options that you want to use after [greeter] without the # for example:
# [greeter]
# example-option=example-value
#
# Appearance:
-# theme-name = GTK+ theme to use
+# theme-name = GTK theme to use
# icon-theme-name = Icon theme to use
# cursor-theme-name = Cursor theme to use
# cursor-theme-size = Cursor size to use
diff --git a/data/lightdm-gtk-greeter.desktop b/data/lightdm-gtk-greeter.desktop
index 84345a6..aa7eb3d 100644
--- a/data/lightdm-gtk-greeter.desktop
+++ b/data/lightdm-gtk-greeter.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
-Name=LightDM GTK+ Greeter
-Comment=This runs the GTK+ greeter, it should only be run from LightDM
+Name=LightDM GTK Greeter
+Comment=This runs the GTK greeter, it should only be run from LightDM
Exec=lightdm-gtk-greeter
Type=Application
X-Ubuntu-Gettext-Domain=lightdm
diff --git a/lightdm-gtk-greeter.doap b/lightdm-gtk-greeter.doap
index ca0e0fa..3f72a29 100644
--- a/lightdm-gtk-greeter.doap
+++ b/lightdm-gtk-greeter.doap
@@ -5,7 +5,7 @@
xmlns="http://usefulinc.com/ns/doap#">
<name xml:lang="en">lightdm-gtk-greeter</name>
- <shortdesc xml:lang="en">LightDM GTK+ Greeter</shortdesc>
+ <shortdesc xml:lang="en">LightDM GTK Greeter</shortdesc>
<homepage rdf:resource="https://github.com/xubuntu/lightdm-gtk-greeter" />
<download-page rdf:resource="https://github.com/xubuntu/lightdm-gtk-greeter/releases" />
<bug-database rdf:resource="https://github.com/xubuntu/lightdm-gtk-greeter/issues" />
diff --git a/po/bg.po b/po/bg.po
index 4898101..2b53187 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,23 +1,24 @@
-# Bulgarian translation for lightdm
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the lightdm package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
+#
+# Translators:
+# Sean Davis <bluesabre@ubuntu.com>, 2020
+# Ivan Latunov <xswordsx@gmail.com>, 2021
+#
+#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: lightdm\n"
+"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-07 14:28+0000\n"
-"PO-Revision-Date: 2019-11-15 23:31+0000\n"
-"Last-Translator: Sean Davis <Unknown>\n"
-"Language-Team: Bulgarian <bg@li.org>\n"
+"PO-Revision-Date: 2020-06-12 00:06+0000\n"
+"Last-Translator: Ivan Latunov <xswordsx@gmail.com>, 2021\n"
+"Language-Team: Bulgarian (https://www.transifex.com/xubuntu/teams/110148/bg/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2020-06-11 23:00+0000\n"
-"X-Generator: Launchpad (build b190cebbf563f89e480a8b57f641753c8196bda0)\n"
"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Launchpad (build b190cebbf563f89e480a8b57f641753c8196bda0)\n"
+"X-Launchpad-Export-Date: 2020-06-11 23:00+0000\n"
#: ../src/lightdm-gtk-greeter.c:525
#, c-format
@@ -69,7 +70,7 @@ msgstr "Сесия \"Гост\""
#: ../src/lightdm-gtk-greeter.c:2500
msgid "Your password is incorrect. Please try again."
-msgstr ""
+msgstr "Паролата е грешна. Моля опитайте отново."
#: ../src/lightdm-gtk-greeter.c:2507
msgid "Failed to authenticate"
@@ -97,7 +98,7 @@ msgstr "Изключване..."
#: ../src/lightdm-gtk-greeter.glade.h:5
msgid "Large Text"
-msgstr ""
+msgstr "Голям текст"
#: ../src/lightdm-gtk-greeter.glade.h:6
msgid "High Contrast"
diff --git a/po/es.po b/po/es.po
index 9523b5e..16c28fe 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,9 +1,8 @@
#
# Translators:
# Sean Davis <bluesabre@ubuntu.com>, 2020
-# Ignacio Poggi <ignaciop.3@gmail.com>, 2020
-# Adolfo Jayme-Barrientos, 2021
# Toni Estévez <toni.estevez@gmail.com>, 2021
+# Ignacio Poggi <ignaciop.3@gmail.com>, 2021
#
#, fuzzy
msgid ""
@@ -12,7 +11,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-07 14:28+0000\n"
"PO-Revision-Date: 2020-06-12 00:06+0000\n"
-"Last-Translator: Toni Estévez <toni.estevez@gmail.com>, 2021\n"
+"Last-Translator: Ignacio Poggi <ignaciop.3@gmail.com>, 2021\n"
"Language-Team: Spanish (https://www.transifex.com/xubuntu/teams/110148/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -36,7 +35,7 @@ msgstr "Reiniciar"
#: ../src/lightdm-gtk-greeter.c:1925
msgid "Are you sure you want to close all programs and restart the computer?"
msgstr ""
-"¿Confirma que quiere cerrar todos los programas y reiniciar el equipo?"
+"¿Está seguro que quiere cerrar todos los programas y reiniciar el equipo?"
#: ../src/lightdm-gtk-greeter.c:1933
msgid "Shut Down"
@@ -45,7 +44,8 @@ msgstr "Apagar"
#: ../src/lightdm-gtk-greeter.c:1934
msgid ""
"Are you sure you want to close all programs and shut down the computer?"
-msgstr "¿Confirma que quiere cerrar todos los programas y apagar el equipo?"
+msgstr ""
+"¿Está seguro que quiere cerrar todos los programas y apagar el equipo?"
#: ../src/lightdm-gtk-greeter.c:1948
msgid "Unlock"
diff --git a/src/lightdm-gtk-greeter.c b/src/lightdm-gtk-greeter.c
index 75d13f7..0e594d1 100644
--- a/src/lightdm-gtk-greeter.c
+++ b/src/lightdm-gtk-greeter.c
@@ -2295,6 +2295,14 @@ G_MODULE_EXPORT
gboolean
username_focus_out_cb (GtkWidget *widget, GdkEvent *event, gpointer user_data)
{
+ const gchar *username = gtk_entry_get_text (username_entry);
+ gchar *stripped_username = g_strdup (username);
+
+ g_strstrip (stripped_username);
+ if (g_strcmp0 (username, stripped_username) != 0)
+ gtk_entry_set_text (username_entry, stripped_username);
+ g_free (stripped_username);
+
if (!g_strcmp0(gtk_entry_get_text (username_entry), "") == 0)
start_authentication (gtk_entry_get_text (username_entry));
return FALSE;
@@ -2969,16 +2977,16 @@ main (int argc, char **argv)
ScreenSaverActive, DefaultExposures);
}
- /* Set GTK+ settings */
+ /* Set GTK settings */
value = config_get_string (NULL, CONFIG_KEY_THEME, NULL);
if (value)
{
- g_debug ("[Configuration] Changing GTK+ theme to '%s'", value);
+ g_debug ("[Configuration] Changing GTK theme to '%s'", value);
g_object_set (gtk_settings_get_default (), "gtk-theme-name", value, NULL);
g_free (value);
}
g_object_get (gtk_settings_get_default (), "gtk-theme-name", &default_theme_name, NULL);
- g_debug ("[Configuration] GTK+ theme: '%s'", default_theme_name);
+ g_debug ("[Configuration] GTK theme: '%s'", default_theme_name);
value = config_get_string (NULL, CONFIG_KEY_ICON_THEME, NULL);
if (value)
View Lorry Controller Status