[Xfce4-commits] xfce4-settings:xfce-4.8 Remove unused code to get the last value of a radio group.
Updating branch refs/heads/xfce-4.8
to 6fbd1d29fcefb288ec49da1704c72ae86b06b271 (commit)
from e6eac6689458bce4253d1445d1af514df5b2515d (commit)
commit 6fbd1d29fcefb288ec49da1704c72ae86b06b271
Author: Jérôme Guelfucci jero...@xfce.org
Date: Fri Apr 22 12:22:29 2011 +0200
Remove unused code to get the last value of a radio group.
This fixes build with --enable-debug=full and gcc 4.6.
(cherry picked from commit 41d9cd32cb86edaea37fa3259eeb84258b37724a)
dialogs/display-settings/main.c |5 -
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 1706964..f4f3b2a 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -935,11 +935,9 @@ display_settings_minimal_dialog_response (GtkDialog
*dialog,
{
GObject*first_screen_radio;
GObject*second_screen_radio;
-GObject*both_radio;
XfceRRMode *mode1, *mode2;
gbooleanuse_first_screen;
gbooleanuse_second_screen;
-gbooleanuse_both;
guint first, second;
gintm, n, found;
@@ -951,14 +949,11 @@ display_settings_minimal_dialog_response (GtkDialog
*dialog,
first_screen_radio = gtk_builder_get_object (builder, radiobutton1);
second_screen_radio = gtk_builder_get_object (builder, radiobutton2);
-both_radio = gtk_builder_get_object (builder, radiobutton3);
use_first_screen =
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
(first_screen_radio));
use_second_screen =
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
(second_screen_radio));
-use_both =
-gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (both_radio));
if (use_first_screen)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:xfce-4.8 Remove unused set variable.
Updating branch refs/heads/xfce-4.8
to 645ad96fbf0dfa92928eb32fcec29824747e3677 (commit)
from 6fbd1d29fcefb288ec49da1704c72ae86b06b271 (commit)
commit 645ad96fbf0dfa92928eb32fcec29824747e3677
Author: Jérôme Guelfucci jero...@xfce.org
Date: Fri Apr 22 12:23:28 2011 +0200
Remove unused set variable.
This fixes build with --enable-debug=full and gcc 4.6.
(cherry picked from commit c0f9d7b42974ea0c6642b99e079d45e1cd43d01e)
xfce4-settings-editor/main_window.c |2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/xfce4-settings-editor/main_window.c
b/xfce4-settings-editor/main_window.c
index 5d659c7..d80f14c 100644
--- a/xfce4-settings-editor/main_window.c
+++ b/xfce4-settings-editor/main_window.c
@@ -326,7 +326,6 @@ load_properties (XfconfChannel *channel, GtkTreeStore
*store, GtkTreeView *treev
{
gint i = 0;
gchar *key;
-GValue *value;
GList *keys, *_keys;
GtkTreeIter parent_iter;
GtkTreeIter child_iter;
@@ -349,7 +348,6 @@ load_properties (XfconfChannel *channel, GtkTreeStore
*store, GtkTreeView *treev
{
key = _keys-data;
TRACE (Key: %s, key);
-value = g_hash_table_lookup (hash_table, key);
components = g_strsplit (key, /, 0);
/* components[0] will be empty because properties start with '/'*/
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:xfce-4.8 Remove unused variable.
Updating branch refs/heads/xfce-4.8
to 8359af4bf58080ad5f35d8adbc7dda2766d0544a (commit)
from 7d26aec0500ceac93bb9dbf150381375554a5a17 (commit)
commit 8359af4bf58080ad5f35d8adbc7dda2766d0544a
Author: Nick Schermer n...@xfce.org
Date: Tue May 17 20:40:05 2011 +0200
Remove unused variable.
xfsettingsd/registry.c |2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/xfsettingsd/registry.c b/xfsettingsd/registry.c
index e2f58e9..f617698 100644
--- a/xfsettingsd/registry.c
+++ b/xfsettingsd/registry.c
@@ -344,13 +344,11 @@ static void
remove_property (GString *props, const gchar *key)
{
gchar *needle;
-gsize needle_len;
gchar *found = NULL;
gchar *end;
/* search for the property */
needle = g_strconcat (key, :, NULL);
-needle_len = strlen (needle);
if (g_str_has_prefix (props-str, needle))
found = props-str;
else
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:xfce-4.8 Fix segfault if pointer has no feedback states and free memory.
Updating branch refs/heads/xfce-4.8
to 7d26aec0500ceac93bb9dbf150381375554a5a17 (commit)
from 645ad96fbf0dfa92928eb32fcec29824747e3677 (commit)
commit 7d26aec0500ceac93bb9dbf150381375554a5a17
Author: Nick Schermer n...@xfce.org
Date: Sat May 7 09:18:29 2011 +0200
Fix segfault if pointer has no feedback states and free memory.
(cherry picked from commit 1badff8a32e9d931ca266f37acf3eed48db90e46)
dialogs/mouse-settings/main.c | 33 -
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/dialogs/mouse-settings/main.c b/dialogs/mouse-settings/main.c
index 306a954..b3d0d9c 100644
--- a/dialogs/mouse-settings/main.c
+++ b/dialogs/mouse-settings/main.c
@@ -572,7 +572,7 @@ mouse_settings_device_selection_changed (GtkTreeSelection
*selection,
gint nbuttons;
Display *xdisplay;
XDevice *device;
-XFeedbackState*states;
+XFeedbackState*states, *pt;
gint nstates;
XPtrFeedbackState *state;
gint i;
@@ -634,28 +634,27 @@ mouse_settings_device_selection_changed (GtkTreeSelection
*selection,
/* get the feedback states for this device */
states = XGetFeedbackControl (xdisplay, device, nstates);
-
-/* intial values */
-acceleration = threshold = -1;
-
-/* get the pointer feedback class */
-for (i = 0; i nstates; i++)
+if (states != NULL)
{
-if (states-class == PtrFeedbackClass)
+/* get the pointer feedback class */
+for (pt = states, i = 0; i nstates; i++)
{
-/* get the state */
-state = (XPtrFeedbackState *) states;
+if (pt-class == PtrFeedbackClass)
+{
+/* get the state */
+state = (XPtrFeedbackState *) pt;
+acceleration = (gdouble) state-accelNum / (gdouble)
state-accelDenom;
+threshold = state-threshold;
-/* set values */
-acceleration = (gdouble) state-accelNum / (gdouble)
state-accelDenom;
-threshold = state-threshold;
+/* done */
+break;
+}
-/* done */
-break;
+/* advance the offset */
+pt = (XFeedbackState *) ((gchar *) pt + pt-length);
}
-/* advance the offset */
-states = (XFeedbackState *) ((gchar *) states +
states-length);
+XFreeFeedbackList (states);
}
/* close the device */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] exo:nick/icon-model-without-dups Deleting branch nick/icon-model-without-dups
Deleting branch refs/heads/nick/icon-model-without-dups ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:jannis/ui-improvements Deleting branch jannis/ui-improvements
Deleting branch refs/heads/jannis/ui-improvements ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master Improve the UI according to bugs #7496 and #7497.
Updating branch refs/heads/master
to a6650a997c975d09a7c881329564cdfe5626e1b6 (commit)
from 298752609159f96a99669a98909f19b2a3e61313 (commit)
commit a6650a997c975d09a7c881329564cdfe5626e1b6
Author: Jannis Pohlmann jan...@xfce.org
Date: Fri Apr 15 14:07:52 2011 +0200
Improve the UI according to bugs #7496 and #7497.
NEWS |1 +
thunar/thunar-statusbar.c | 37 +
thunar/thunar-window.c| 12 ++--
3 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/NEWS b/NEWS
index d037059..d8881ce 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@
Reported and solved by Ambroz Bizjak.
- Use portable abicheck.sh from xfconf.
- Avoid segfaults due to interpreting display names as format strings.
+- Improve the UI according to bugs #7496 and #7497.
1.3.0
=
diff --git a/thunar/thunar-statusbar.c b/thunar/thunar-statusbar.c
index 5222eaf..3b8533b 100644
--- a/thunar/thunar-statusbar.c
+++ b/thunar/thunar-statusbar.c
@@ -1,20 +1,22 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
/*-
* Copyright (c) 2005-2006 Benedikt Meurer be...@xfce.org
+ * Copyright (c) 2011 Jannis Pohlmann jan...@xfce.org
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
@@ -64,6 +66,8 @@ G_DEFINE_TYPE (ThunarStatusbar, thunar_statusbar,
GTK_TYPE_STATUSBAR)
static void
thunar_statusbar_class_init (ThunarStatusbarClass *klass)
{
+ static gboolean style_initialized = FALSE;
+
GObjectClass *gobject_class;
gobject_class = G_OBJECT_CLASS (klass);
@@ -82,6 +86,15 @@ thunar_statusbar_class_init (ThunarStatusbarClass *klass)
text,
NULL,
EXO_PARAM_WRITABLE));
+
+ if (!style_initialized)
+{
+ gtk_rc_parse_string (style \thunar-statusbar-internal\ {\n
+ GtkStatusbar::shadow-type = GTK_SHADOW_NONE\n
+ }\n
+ class \ThunarStatusbar\
+ style \thunar-statusbar-internal\\n);
+}
}
diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
index 4735b3b..d258d8f 100644
--- a/thunar/thunar-window.c
+++ b/thunar/thunar-window.c
@@ -1,7 +1,7 @@
/* vi:set et ai sw=2 sts=2 ts=2: */
/*-
* Copyright (c) 2005-2007 Benedikt Meurer be...@xfce.org
- * Copyright (c) 2009-2010 Jannis Pohlmann jan...@xfce.org
+ * Copyright (c) 2009-2011 Jannis Pohlmann jan...@xfce.org
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@ -821,7 +821,7 @@ thunar_window_init (ThunarWindow *window)
}
window-paned = gtk_hpaned_new ();
- gtk_container_set_border_width (GTK_CONTAINER (window-paned), 6);
+ gtk_container_set_border_width (GTK_CONTAINER (window-paned), 0);
gtk_table_attach (GTK_TABLE (window-table), window-paned, 0, 1, 4, 5,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_widget_show (window-paned);
@@ -832,7 +832,7 @@ thunar_window_init (ThunarWindow *window)
/* always remember the last separator position for newly opened windows */
exo_binding_new (G_OBJECT (window-paned), position, G_OBJECT
(window-preferences), last-separator-position);
- window-view_box = gtk_vbox_new (FALSE, 6);
+ window-view_box = gtk_table_new (3, 1, FALSE);
gtk_paned_pack2 (GTK_PANED (window-paned), window-view_box, TRUE, FALSE);
gtk_widget_show
[Xfce4-commits] midori:master Don't mixup window title and app name
Updating branch refs/heads/master
to 83194abe8f7c53588549f83c95b518b966f7a00d (commit)
from 951885c1f5d36d282e59f4fdc601f0fa4f96590d (commit)
commit 83194abe8f7c53588549f83c95b518b966f7a00d
Author: Christian Dywan christ...@twotoasts.de
Date: Tue May 17 22:15:11 2011 +0200
Don't mixup window title and app name
Fixes: https://bugs.launchpad.net/midori/+bug/778402
midori/main.c |1 -
midori/midori-browser.c |4 +---
2 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/midori/main.c b/midori/main.c
index b6d501f..007b03f 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -1994,7 +1994,6 @@ main (intargc,
/* Private browsing, window title, default config folder */
if (private)
{
-g_set_application_name (_(Private Browsing));
if (!config !webapp)
config = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME,
NULL);
/* Mask the timezone, which can be read by Javascript */
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index fe15920..9bc80aa 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -579,8 +579,7 @@ midori_browser_set_title (MidoriBrowser* browser,
#if WEBKIT_CHECK_VERSION (1, 1, 2)
if (katze_object_get_boolean (browser-settings,
enable-private-browsing))
{
-gchar* window_title = g_strconcat (title, - ,
- g_get_application_name (), NULL);
+gchar* window_title = g_strdup_printf (_(%s (Private Browsing)),
title);
gtk_window_set_title (GTK_WINDOW (browser), window_title);
g_free (window_title);
}
@@ -5785,7 +5784,6 @@ midori_browser_init (MidoriBrowser* browser)
G_CALLBACK (midori_browser_destroy_cb), NULL);
gtk_window_set_role (GTK_WINDOW (browser), browser);
gtk_window_set_icon_name (GTK_WINDOW (browser), web-browser);
-gtk_window_set_title (GTK_WINDOW (browser), g_get_application_name ());
vbox = gtk_vbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (browser), vbox);
gtk_widget_show (vbox);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Rename the Quicklist menu item for private browsing
Updating branch refs/heads/master to 01ca9d432e9c59faacbc1c82eded6391faa2e41b (commit) from 83194abe8f7c53588549f83c95b518b966f7a00d (commit) commit 01ca9d432e9c59faacbc1c82eded6391faa2e41b Author: Christian Dywan christ...@twotoasts.de Date: Tue May 17 22:16:51 2011 +0200 Rename the Quicklist menu item for private browsing data/midori.desktop.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/data/midori.desktop.in b/data/midori.desktop.in index cc847fd..67294b0 100644 --- a/data/midori.desktop.in +++ b/data/midori.desktop.in @@ -15,7 +15,7 @@ X-Osso-Service=midori X-Ayatana-Desktop-Shortcuts=Private [Private Shortcut Group] -Name=P_rivate Browsing +Name=New P_rivate Browsing Window Exec=midori --private TargetEnvironment=Unity ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master l10n: Updated Ukrainian (uk) translation to 100%
Updating branch refs/heads/master to 52c9a45aa3a83e864c5ad5b35bcb9f7ab0487346 (commit) from fa79aec85251c236a3c9167b0d3f0ec33a176713 (commit) commit 52c9a45aa3a83e864c5ad5b35bcb9f7ab0487346 Author: Yarema aka Knedlyk yupad...@gmail.com Date: Tue May 17 22:31:22 2011 +0200 l10n: Updated Ukrainian (uk) translation to 100% New status: 347 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/uk.po | 242 -- 1 files changed, 125 insertions(+), 117 deletions(-) diff --git a/po/uk.po b/po/uk.po index d66e79e..4bed1f3 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8,7 +8,7 @@ msgid msgstr Project-Id-Version: xfce4-panel 4.7.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-02-11 17:10+\n +POT-Creation-Date: 2011-05-17 16:11+\n PO-Revision-Date: 2009-01-26 15:54+0200\n Last-Translator: Dmitry Nikitin luckas...@mail.ru\n Language-Team: Ukrainian xfce4-...@xfce.org\n @@ -32,61 +32,61 @@ msgid Customize the panel msgstr Упорядкувати панель #: ../panel-preferences.desktop.in.h:2 -#: ../panel/panel-preferences-dialog.glade.h:24 ../panel/panel-window.c:2247 -#: ../migrate/main.c:84 +#: ../panel/panel-preferences-dialog.glade.h:25 ../panel/panel-window.c:2263 +#: ../migrate/main.c:100 msgid Panel msgstr Панель -#: ../common/panel-utils.c:155 +#: ../common/panel-utils.c:157 msgid _Read Online msgstr Переглянути інтера_ктивно -#: ../common/panel-utils.c:156 +#: ../common/panel-utils.c:158 msgid You can read the user manual online. This manual may however not exactly match your panel version. msgstr Ви можете переглянути посібник інтерактивно. Версія цього посібника іноді не відповідатиме версії вашої панелі. -#: ../common/panel-utils.c:158 +#: ../common/panel-utils.c:160 msgid The user manual is not installed on your computer msgstr Посібник користувача не встановлено на Вашому комп'ютері #. display an error message to the user -#: ../common/panel-utils.c:171 +#: ../common/panel-utils.c:175 msgid Failed to open the documentation browser msgstr Не вдалось відкрити переглядач документації #. I18N: %s is the name of the plugin -#: ../libxfce4panel/xfce-panel-plugin.c:889 -#: ../panel/panel-preferences-dialog.c:1048 +#: ../libxfce4panel/xfce-panel-plugin.c:919 +#: ../panel/panel-preferences-dialog.c:1049 #, c-format msgid Are you sure that you want to remove \%s\? msgstr Дійсно бажаєте видалити \%s\? -#: ../libxfce4panel/xfce-panel-plugin.c:894 -#: ../panel/panel-preferences-dialog.c:1051 +#: ../libxfce4panel/xfce-panel-plugin.c:924 +#: ../panel/panel-preferences-dialog.c:1052 msgid If you remove the item from the panel, it is permanently lost. msgstr Якщо Ви видалите цей елемент з панелі, він буде повністю втрачений. #. move item -#: ../libxfce4panel/xfce-panel-plugin.c:1054 +#: ../libxfce4panel/xfce-panel-plugin.c:1084 msgid _Move msgstr Пере_містити -#: ../libxfce4panel/xfce-panel-plugin.c:1088 +#: ../libxfce4panel/xfce-panel-plugin.c:1118 msgid Pane_l msgstr Пане_ль #. add new items -#: ../libxfce4panel/xfce-panel-plugin.c:1096 ../panel/panel-window.c:2259 +#: ../libxfce4panel/xfce-panel-plugin.c:1126 ../panel/panel-window.c:2275 msgid Add _New Items... msgstr Дода_ти нові елементи... #. customize panel -#: ../libxfce4panel/xfce-panel-plugin.c:1107 ../panel/panel-window.c:2270 +#: ../libxfce4panel/xfce-panel-plugin.c:1137 ../panel/panel-window.c:2286 msgid Panel Pr_eferences... msgstr Налашт_ування панелі... #. logout item -#: ../libxfce4panel/xfce-panel-plugin.c:1124 ../panel/panel-window.c:2286 +#: ../libxfce4panel/xfce-panel-plugin.c:1154 ../panel/panel-window.c:2302 msgid Log _Out msgstr Вийти з _сеансу @@ -130,66 +130,66 @@ msgid Print version information and exit msgstr Надрукувати інформацію про версію і вийти #. parse context options -#: ../panel/main.c:240 +#: ../panel/main.c:248 msgid [ARGUMENTS...] msgstr [АРГУМЕНТИ...] -#: ../panel/main.c:247 +#: ../panel/main.c:255 #, c-format msgid Type \%s --help\ for usage. msgstr Наберіть \%s --help\ для використання. -#: ../panel/main.c:266 +#: ../panel/main.c:274 msgid The Xfce development team. All rights reserved. msgstr Команда розробки Xfce. Всі права захищені. -#: ../panel/main.c:267 +#: ../panel/main.c:275 #, c-format msgid Please report bugs to %s. msgstr Сповістіть про помилку на %s. -#: ../panel/main.c:318 +#: ../panel/main.c:326 msgid There is already a running instance msgstr Вже існує запущений екземпляр #. spawn ourselfs again -#: ../panel/main.c:367 +#: ../panel/main.c:375 msgid Restarting... msgstr Перезапустити... -#: ../panel/main.c:382 +#: ../panel/main.c:390 msgid Failed to show the preferences dialog msgstr Не вдалось відобразити діалог налаштування -#: ../panel/main.c:384 +#: ../panel/main.c:392 msgid Failed to show the add new items dialog msgstr Не вдалось відобразити діалог
[Xfce4-commits] xfce4-notifyd:master l10n: Updated Ukrainian (uk) translation to 100%
Updating branch refs/heads/master to f3d574a8f18dd7b48746e2a36e2042797fbfe807 (commit) from 3ff0932375b2a79c4050b9b508f436664ed3213c (commit) commit f3d574a8f18dd7b48746e2a36e2042797fbfe807 Author: Yarema aka Knedlyk yupad...@gmail.com Date: Tue May 17 22:32:33 2011 +0200 l10n: Updated Ukrainian (uk) translation to 100% New status: 27 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/uk.po | 69 + 1 files changed, 33 insertions(+), 36 deletions(-) diff --git a/po/uk.po b/po/uk.po index 0259965..b6308f9 100644 --- a/po/uk.po +++ b/po/uk.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: xfce4-notify\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-12-21 05:05+\n +POT-Creation-Date: 2011-05-17 16:04+\n PO-Revision-Date: 2010-05-24 00:21+0100\n Last-Translator: Yarema aka Knedlyk yupad...@gmail.com\n Language-Team: UKRAINIAN transl...@linux.org.ua\n @@ -22,7 +22,7 @@ msgstr X-Generator: Pootle 1.1.0\n #: ../xfce4-notifyd/main.c:50 ../xfce4-notifyd/main.c:60 -#: ../xfce4-notifyd-config/main.c:257 +#: ../xfce4-notifyd-config/main.c:260 msgid Xfce Notify Daemon msgstr Демон повідомлень Xfce @@ -45,49 +45,45 @@ msgstr Не можу з’єднатися до буфера сесії D-Bus msgid Another notification xndaemon is already running msgstr Інший демон повідомлень xndaemon вже працює -#: ../xfce4-notifyd/xfce-notify-window.c:809 +#: ../xfce4-notifyd/xfce-notify-window.c:817 msgid image: msgstr малюнок: -#: ../xfce4-notifyd-config/main.c:196 -msgid Theme -msgstr Тема - -#: ../xfce4-notifyd-config/main.c:223 +#: ../xfce4-notifyd-config/main.c:120 ../xfce4-notifyd-config/main.c:227 msgid notify-send \Notification Preview\ \This is how notifications will look like\ msgstr notify-send \Попередній перегляд повідомлення\ \Так будуть виглядати повідомлення\ -#: ../xfce4-notifyd-config/main.c:227 +#: ../xfce4-notifyd-config/main.c:124 ../xfce4-notifyd-config/main.c:231 msgid Notification preview failed msgstr Попередній перегляд повідомлення не вдався -#: ../xfce4-notifyd-config/main.c:259 +#: ../xfce4-notifyd-config/main.c:262 msgid Settings daemon is unavailable msgstr Демон налаштувань не доступний -#: ../xfce4-notifyd-config/main.c:314 +#: ../xfce4-notifyd-config/main.c:312 msgid Display version information msgstr Показати інформацію про версію -#: ../xfce4-notifyd-config/main.c:315 +#: ../xfce4-notifyd-config/main.c:313 msgid Settings manager socket msgstr Сокет менеджера налаштувань -#: ../xfce4-notifyd-config/main.c:315 +#: ../xfce4-notifyd-config/main.c:313 msgid SOCKET_ID msgstr SOCKET_ID -#: ../xfce4-notifyd-config/main.c:325 +#: ../xfce4-notifyd-config/main.c:323 #, c-format msgid Type '%s --help' for usage. msgstr Напишіть '%s --help' для допомоги по використанню. -#: ../xfce4-notifyd-config/main.c:338 +#: ../xfce4-notifyd-config/main.c:336 #, c-format msgid Released under the terms of the GNU General Public License, version 2\n msgstr Розроблено згідно умов GNU General Public License, 2-га версія\n -#: ../xfce4-notifyd-config/main.c:339 +#: ../xfce4-notifyd-config/main.c:337 #, c-format msgid Please report bugs to %s.\n msgstr Будь-ласка, повідомте про помилку до %s.\n @@ -101,51 +97,52 @@ msgid Bottom right msgstr Внизу зправа #: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:3 -#: ../xfce4-notifyd-config/xfce4-notifyd-config.desktop.in.h:1 -msgid Customize how notifications appear on your screen -msgstr Налаштуйте показ повідомлень на Вашому екрані - -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:4 msgid Default _position: msgstr Типова _позиція: -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:5 +#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:4 #: ../xfce4-notifyd-config/xfce4-notifyd-config.desktop.in.h:2 msgid Notifications msgstr Повідомлення -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:6 +#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:5 msgid Top left msgstr Зверху зліва -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:7 +#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:6 msgid Top right msgstr Зверху зправа -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:8 +#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:7 msgid _Disappear after: msgstr _Зникати після: -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:9 -msgid _Effect: -msgstr _Ефект: - -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:10 -msgid _Fade to transparent -msgstr _Стати прозорим - -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:11 +#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:8 msgid _Opacity: msgstr _Непрозорість: -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:12 +#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:9 msgid _Preview msgstr _Перегляд -#:
[Xfce4-commits] xfce4-sensors-plugin:master l10n: Updated Ukrainian (uk) translation to 100%
Updating branch refs/heads/master
to f6f191072026393cd05cbcba6247ab3e0dc3f229 (commit)
from 4bbc681f0b3620c791b4abbc3e3a2e4a707b3e6e (commit)
commit f6f191072026393cd05cbcba6247ab3e0dc3f229
Author: Yarema aka Knedlyk yupad...@gmail.com
Date: Tue May 17 22:32:03 2011 +0200
l10n: Updated Ukrainian (uk) translation to 100%
New status: 72 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
po/uk.po | 55 ---
1 files changed, 20 insertions(+), 35 deletions(-)
diff --git a/po/uk.po b/po/uk.po
index 0794e8e..97d80fa 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,7 +1,7 @@
# Ukrainian translation of xfce4-sensors-plugin.
# Copyright (C) 2008 Dmitry Nikitin
# This file is distributed under the same license as the xfce4-sensors-plugin
package.
-#
+#
# Dmitry Nikitin luckas...@mail.ru, 2008.
msgid
msgstr
@@ -11,10 +11,10 @@ msgstr
PO-Revision-Date: 2008-11-17 13:48+0200\n
Last-Translator: Dmitry Nikitin luckas...@mail.ru\n
Language-Team: Ukrainian xfce4-...@xfce.org\n
-Language: uk\n
MIME-Version: 1.0\n
Content-Type: text/plain; charset=UTF-8\n
Content-Transfer-Encoding: 8bit\n
+Language: uk\n
X-Generator: KBabel 1.11.4\n
#: ../panel-plugin/sensors-plugin.c:293 ../panel-plugin/sensors-plugin.c:390
@@ -75,7 +75,8 @@ msgstr Кількіс_ть тектових стрічок:
msgid F_ont size:
msgstr Розмір _шрифту:
-#. gtk_widget_set_sensitive(myFontBox,
!sd-sensors-display_values_graphically);
+#. gtk_widget_set_sensitive(myFontBox,
+#. !sd-sensors-display_values_graphically);
#: ../panel-plugin/sensors-plugin.c:1892
msgid x-small
msgstr найменші
@@ -131,14 +132,8 @@ msgstr Плагін сенсорів
#. #if GTK_VERSION 2.11
#: ../panel-plugin/sensors-plugin.c:
-msgid
-You can change a feature's properties such as name, colours, min/max value
-by double-clicking the entry, editing the content, and pressing \Return\
-or selecting a different field.
-msgstr
-Ви можете вибрати опції властивостей такі як назва, кольори, мін/макс
-значення через подвійне клацання на елементі, редагування змісту і натиснути
-\Ввід\ aбо вибрати різні поля.
+msgid You can change a feature's properties such as name, colours, min/max
value by double-clicking the entry, editing the content, and pressing
\Return\ or selecting a different field.
+msgstr Ви можете вибрати опції властивостей такі як назва, кольори, мін/макс
значення через подвійне клацання на елементі, редагування змісту і
натиснути\Ввід\ aбо вибрати різні поля.
#. only use this if no hddtemp sensor
#. or do only use this , if it is an lmsensors device. whatever.
@@ -154,7 +149,8 @@ msgid ACPI
msgstr Інтерфейс ACPI
#. to be displayed
-#. chip-description = g_strdup(_(Advanced Configuration and Power
Interface));
+#. chip-description = g_strdup(_(Advanced Configuration and Power
+#. Interface));
#: ../lib/acpi.c:523
#, c-format
msgid ACPI v%s zones
@@ -168,14 +164,15 @@ msgstr Невідомо
#: ../lib/nvidia.c:60
msgid NVidia GPU core temperature
-msgstr
+msgstr Температура NVidia GPU
#: ../lib/nvidia.c:61
msgid nvidia
-msgstr
+msgstr nvidia
#. if (scale == FAHRENHEIT) {
-#. cf-formatted_value = g_strdup_printf(_(%.1f °F), (float) (value * 9/5 +
32) );
+#. cf-formatted_value = g_strdup_printf(_(%.1f °F), (float) (value * 9/5 +
+#. 32) );
#. } else { // Celsius
#. Celsius
#: ../lib/nvidia.c:126 ../lib/hddtemp.c:711
@@ -191,23 +188,17 @@ msgstr Температура жорстких дисків із S.M.A.R.T.
#: ../lib/hddtemp.c:596
#, c-format
msgid
-\hddtemp\ was not executed correctly, although it is executable. This is
-most probably due to the disks requiring root privileges to read their
-temperatures, and \hddtemp\ not being setuid root.\n
+\hddtemp\ was not executed correctly, although it is executable. This is
most probably due to the disks requiring root privileges to read their
temperatures, and \hddtemp\ not being setuid root.\n
\n
-An easy but dirty solution is to run \chmod u+s %s\ as root user and
-restart this plugin or its panel.\n
+An easy but dirty solution is to run \chmod u+s %s\ as root user and
restart this plugin or its panel.\n
\n
Calling \%s\ gave the following error:\n
%s\n
with a return value of %d.\n
msgstr
-\hddtemp\ не було коректно виконано, хоча він виконуваний. Можливо це
-потребує прав адміністратора для перегляду інформації про температуру
-дисків але \hddtemp\ не має адміністративних прав.\n
+\hddtemp\ не було коректно виконано, хоча він виконуваний. Можливо це
потребує прав адміністратора для перегляду інформації про температуру дисків
але \hddtemp\ не має адміністративних прав.\n
\n
-Простіше але брудне рішення запустити \chmod u+s %s\ як root і
-перезапустити цей плагін або панель.\n
+Простіше але брудне рішення запустити \chmod u+s %s\ як root і
перезапустити цей плагін або панель.\n
\n
Виклик \%s\ дає наступну помилку:\n
%s\n
@@ -336,22
[Xfce4-commits] postler:master Closing 'sender or author' dialogue should cancel
Updating branch refs/heads/master
to 42d29df3e4c8b3f8e6511858631bf509a7870a7a (commit)
from fdca25e73454cab6d656cc70edbd6fed02f29c4e (commit)
commit 42d29df3e4c8b3f8e6511858631bf509a7870a7a
Author: Christian Dywan christ...@twotoasts.de
Date: Tue May 17 22:32:19 2011 +0200
Closing 'sender or author' dialogue should cancel
postler/postler-bureau.vala |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/postler/postler-bureau.vala b/postler/postler-bureau.vala
index caf47b3..9890ac3 100644
--- a/postler/postler-bureau.vala
+++ b/postler/postler-bureau.vala
@@ -174,7 +174,7 @@ public class Postler.Bureau : Gtk.Window {
if (response == Gtk.ResponseType.OK)
return content.list_post;
-else if (response == Gtk.ResponseType.NONE)
+else if (response == Gtk.ResponseType.DELETE_EVENT)
return null;
return reply_to;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Add colons to labels in Search Properties
Updating branch refs/heads/master
to 3718a930e25182f119e1cf5729bd0001c72d3b01 (commit)
from 42d29df3e4c8b3f8e6511858631bf509a7870a7a (commit)
commit 3718a930e25182f119e1cf5729bd0001c72d3b01
Author: Christian Dywan christ...@twotoasts.de
Date: Tue May 17 22:38:19 2011 +0200
Add colons to labels in Search Properties
Fixes: https://bugs.launchpad.net/bugs/782681
postler/postler-accountsetup.vala |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/postler/postler-accountsetup.vala
b/postler/postler-accountsetup.vala
index 680c60e..a64d86a 100644
--- a/postler/postler-accountsetup.vala
+++ b/postler/postler-accountsetup.vala
@@ -61,10 +61,10 @@ public class Postler.AccountWidget : Gtk.VBox {
header = new Elementary.Entry ();
header.set_text (parts[0]);
-add_label_entry (_(_Header), header);
+add_label_entry (_(_Header:), header);
filter = new Elementary.Entry ();
filter.set_text (parts[1]);
-add_label_entry (_(_Keywords), filter);
+add_label_entry (_(_Keywords:), filter);
content_area.show_all ();
pack_end (content_area, true, true, 0);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] postler:master Remove size and attachment columns
Updating branch refs/heads/master
to fdca25e73454cab6d656cc70edbd6fed02f29c4e (commit)
from 2121ba996121147f0845aa045f0e7a478a8242db (commit)
commit fdca25e73454cab6d656cc70edbd6fed02f29c4e
Author: Christian Dywan christ...@twotoasts.de
Date: Tue May 17 22:22:57 2011 +0200
Remove size and attachment columns
postler/postler-messages.vala | 64
1 files changed, 13 insertions(+), 51 deletions(-)
diff --git a/postler/postler-messages.vala b/postler/postler-messages.vala
index 6f03615..4ee1433 100644
--- a/postler/postler-messages.vala
+++ b/postler/postler-messages.vala
@@ -19,7 +19,6 @@ public class Postler.Messages : Gtk.TreeView {
public Postler.Content content { get; set; }
public bool hide_read { get; set; }
public bool rich_rows { get; set; default = true; }
-public bool show_attachments { get; set; default = false; }
public string? location { get; private set; }
public AccountInfo account_info { get; private set; }
@@ -34,11 +33,9 @@ public class Postler.Messages : Gtk.TreeView {
enum Columns {
FLAGGED,
STATUS,
-ATTACHMENT,
SUBJECT,
WEIGHT,
FROM,
-SIZE,
LOCATION,
TIMESTAMP
}
@@ -191,19 +188,6 @@ public class Postler.Messages : Gtk.TreeView {
}
}
-void render_size (Gtk.TreeViewColumn column, Gtk.CellRenderer cell,
-Gtk.TreeModel model, Gtk.TreeIter iter) {
-var renderer = cell as Gtk.CellRendererText;
-
-if (rich_rows)
-renderer.text = ;
-else {
-int64 size;
-model.get (iter, Columns.SIZE, out size);
-renderer.text = format_size_for_display (size);
-}
-}
-
void renderer_flag_toggled (Gtk.CellRendererToggle renderer,
string path) {
Gtk.TreeIter sort_iter = Gtk.TreeIter ();
@@ -250,9 +234,9 @@ public class Postler.Messages : Gtk.TreeView {
drag_data_get.connect (on_drag_data_get);
this.accounts = accounts;
-store = new Gtk.TreeStore (9, typeof (bool), typeof (string),
-typeof (string), typeof (string), typeof (int), typeof (string),
-typeof (int64), typeof (string), typeof (int64));
+store = new Gtk.TreeStore (7, typeof (bool), typeof (string),
+typeof (string), typeof (int), typeof (string),
+typeof (string), typeof (int64));
sort = new Gtk.TreeModelSort.with_model (store);
set_model (sort);
set_search_equal_func (search_inline);
@@ -275,21 +259,15 @@ public class Postler.Messages : Gtk.TreeView {
var renderer_text = new Gtk.CellRendererText ();
column.pack_start (renderer_text, true);
column.set_cell_data_func (renderer_text, render_subject);
-var renderer_icon = new Gtk.CellRendererPixbuf ();
-column.pack_start (renderer_icon, false);
-column.add_attribute (renderer_icon, stock-id, Columns.ATTACHMENT);
insert_column (column, -1);
insert_column_with_data_func (-1, _(From),
new Gtk.CellRendererText (), render_from);
insert_column_with_data_func (-1, _(Date),
new Gtk.CellRendererText (), render_date);
-insert_column_with_data_func (-1, _(Size),
-new Gtk.CellRendererText (), render_size);
if (rich_rows) {
get_column (3).visible = false;
get_column (4).visible = false;
-get_column (5).visible = false;
}
unowned Gtk.BindingSet binding_set = Gtk.BindingSet.by_class
(get_class ());
@@ -514,19 +492,11 @@ public class Postler.Messages : Gtk.TreeView {
private struct Message {
string location;
string subject;
-public string get_subject () {
-return subject != null ? subject : _(No subject);
-}
string status;
int font_weight;
bool flagged;
string from;
-public string get_from () {
-return from != null ? from : _(Unknown);
-}
int64 timestamp;
-int64 size;
-string attachment;
}
private Message? read_message (File contents, bool folder_new) {
@@ -555,7 +525,7 @@ public class Postler.Messages : Gtk.TreeView {
message.from = null;
message.timestamp = 0;
-string content_type = show_attachments ? null : ;
+string content_type = ;
try {
var stream = new DataInputStream (contents.read (null));
string line;
@@ -623,16 +593,15 @@ public class Postler.Messages : Gtk.TreeView {
if (skip)
return null;
}
+if (message.subject == null)
+message.subject = _(No subject);
+if (message.from == null)
+message.from = _(Unknown);
} catch
