[Xfce4-commits] xfce4-embed-plugin:master Fixed compatibility with GTK+ 2.20
Updating branch refs/heads/master
to f0198aa074f1023653dc016dea741714f9b0d844 (commit)
from 3b5936b38cf20fd8fd8b2b56244741c7ff443e01 (commit)
commit f0198aa074f1023653dc016dea741714f9b0d844
Author: David Schneider dnschn...@gmail.com
Date: Mon Jan 23 01:59:22 2012 -0800
Fixed compatibility with GTK+ 2.20
autogen.sh |2 +-
panel-plugin/embed-dialogs.c |9 +
panel-plugin/embed.c | 20 ++--
panel-plugin/ewmh.c |3 ++-
4 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index b099848..c49d180 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -29,5 +29,5 @@ EOF
exit 1
}
-XDT_AUTOGEN_REQUIRED_VERSION=4.7.3 \
+XDT_AUTOGEN_REQUIRED_VERSION=4.7.2 \
exec xdt-autogen $@
diff --git a/panel-plugin/embed-dialogs.c b/panel-plugin/embed-dialogs.c
index abec1ee..1d9de71 100644
--- a/panel-plugin/embed-dialogs.c
+++ b/panel-plugin/embed-dialogs.c
@@ -23,6 +23,7 @@
#include string.h
#include gtk/gtk.h
+#include X11/Xlib.h
#include libxfce4ui/libxfce4ui.h
#include libxfce4panel/xfce-panel-plugin.h
@@ -93,15 +94,15 @@ static void
embed_entry_set_good (GtkEntry *edit, gboolean good)
{
if (good) {
-gtk_entry_set_icon_tooltip_text (edit, GTK_ENTRY_ICON_SECONDARY,
- _(Input is valid));
gtk_entry_set_icon_from_stock (edit, GTK_ENTRY_ICON_SECONDARY,
GTK_STOCK_YES);
- } else {
gtk_entry_set_icon_tooltip_text (edit, GTK_ENTRY_ICON_SECONDARY,
- _(Input is invalid));
+ _(Input is valid));
+ } else {
gtk_entry_set_icon_from_stock (edit, GTK_ENTRY_ICON_SECONDARY,
GTK_STOCK_NO);
+gtk_entry_set_icon_tooltip_text (edit, GTK_ENTRY_ICON_SECONDARY,
+ _(Input is invalid));
}
}
diff --git a/panel-plugin/embed.c b/panel-plugin/embed.c
index b92bfc5..de812d0 100644
--- a/panel-plugin/embed.c
+++ b/panel-plugin/embed.c
@@ -25,6 +25,7 @@
#endif
#include gtk/gtk.h
+#include X11/Xlib.h
#include libxfce4util/libxfce4util.h
#include libxfce4panel/xfce-panel-plugin.h
#include libxfce4panel/xfce-hvbox.h
@@ -33,6 +34,12 @@
#include embed.h
#include embed-dialogs.h
+/* GTK 2.24 compatibility */
+#if !GTK_CHECK_VERSION(2,24,0)
+#define gdk_x11_window_foreign_new_for_display \
+ gdk_window_foreign_new_for_display
+#endif
+
/* default settings */
#define DEFAULT_PROC_NAMENULL
#define DEFAULT_WINDOW_REGEX NULL
@@ -506,7 +513,7 @@ embed_launch_command (EmbedPlugin *embed)
* with the actual socket id. */
socketpos = g_strdup_printf (%.*s%lu%s,
(gint)(socketpos - embed-launch_cmd), embed-launch_cmd,
- (intptr_t)gtk_socket_get_id (GTK_SOCKET (embed-socket)),
+ (gulong)gtk_socket_get_id (GTK_SOCKET (embed-socket)),
socketpos + strlen (EMBED_LAUNCH_CMD_SOCKET));
if (!g_spawn_command_line_async (socketpos, NULL)) {
DBG (launch failed);
@@ -658,8 +665,12 @@ embed_plug_added (GtkWidget *socket, EmbedPlugin *embed)
} else {
/* Grab the GtkPlug's window. */
embed-plug_window = gtk_socket_get_plug_window (GTK_SOCKET
(embed-socket));
-if (embed-plug_window)
+if (embed-plug_window) {
embed-plug = gdk_x11_drawable_get_xid (GDK_DRAWABLE
(embed-plug_window));
+} else {
+ DBG (failed to get plug X11 window);
+ embed-plug = 0;
+}
}
if (embed-plug_window embed-plug) {
/* Monitor for unmap/destroy events if it is not a standard GtkPlug. If the
@@ -716,6 +727,11 @@ embed_plug_removed (GtkWidget *socket, EmbedPlugin *embed)
gtk_widget_show (embed-embed_menu);
embed-has_plug = FALSE;
+ /* If this was a GtkPlug, the plug has been destroyed and embed-plug is
+ * now an invalid window. */
+ if (embed-plug_is_gtkplug)
+embed-plug = 0;
+
/* Assume the socket will be destroyed after this returns, so get rid of our
* reference. */
embed-socket = NULL;
diff --git a/panel-plugin/ewmh.c b/panel-plugin/ewmh.c
index f8dd093..549cad3 100644
--- a/panel-plugin/ewmh.c
+++ b/panel-plugin/ewmh.c
@@ -24,8 +24,9 @@
#include string.h
#endif
-#include X11/Xatom.h
#include gtk/gtk.h
+#include X11/Xlib.h
+#include X11/Xatom.h
#include libxfce4util/libxfce4util.h
#include libxfce4panel/xfce-panel-plugin.h
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-systemload-plugin:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to 23cb4ed5744ad7af85553ffdc50504f67914cbe0 (commit) from 3e23af0568f3a647c7d479bcf26d3d97f25024c0 (commit) commit 23cb4ed5744ad7af85553ffdc50504f67914cbe0 Author: Chipong Luo chipon...@yahoo.com Date: Mon Jan 23 11:35:52 2012 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 20 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 56 1 files changed, 32 insertions(+), 24 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 7ca6fcb..eab83ad 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3,13 +3,13 @@ # This file is distributed under the same license as # the xfce4-systemload-plugin package. # Hunt Xu hun...@live.cn, 2009. -# Chipong Luo chipon...@yahoo.com, 2011. +# Chipong Luo chipon...@yahoo.com, 2011, 2012. # msgid msgstr Project-Id-Version: xfce4-systemload-plugin\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-10-09 04:09+\n +POT-Creation-Date: 2012-01-23 08:33+\n PO-Revision-Date: 2009-05-09 13:56+0800\n Last-Translator: Chipong Luo chipon...@yahoo.com\n Language-Team: Chinese (Simplified) xfce-i...@xfce.org\n @@ -22,74 +22,82 @@ msgstr msgid File /proc/stat not found! msgstr 文件 /proc/stat 未找到！ -#: ../panel-plugin/systemload.c:160 +#: ../panel-plugin/systemload.c:155 #, c-format msgid System Load: %ld%% msgstr 系统负载：%ld%% -#: ../panel-plugin/systemload.c:167 +#: ../panel-plugin/systemload.c:162 #, c-format msgid Memory: %ldMB of %ldMB used msgstr 内存：已用 %ldMB，总共 %ldMB -#: ../panel-plugin/systemload.c:175 +#: ../panel-plugin/systemload.c:170 #, c-format msgid Swap: %ldMB of %ldMB used msgstr 交换分区：已用 %ldMB，总共 %ldMB -#: ../panel-plugin/systemload.c:178 +#: ../panel-plugin/systemload.c:173 #, c-format msgid No swap msgstr 无交换分区 -#: ../panel-plugin/systemload.c:188 +#: ../panel-plugin/systemload.c:183 #, c-format msgid %d day msgid_plural %d days msgstr[0] %d 天 msgstr[1] %d 天 -#: ../panel-plugin/systemload.c:196 +#: ../panel-plugin/systemload.c:191 #, c-format msgid Uptime: %d day %d:%02d msgid_plural Uptime: %d days %d:%02d -msgstr[0] 运行时间：%d 天 %d:%02d -msgstr[1] 运行时间：%d 天 %d:%02d +msgstr[0] 运行时间：%d 天 %d：%02d +msgstr[1] 运行时间：%d 天 %d：%02d -#: ../panel-plugin/systemload.c:724 -msgid Select color -msgstr 选择颜色 - -#: ../panel-plugin/systemload.c:788 +#: ../panel-plugin/systemload.c:814 msgid CPU monitor msgstr CPU 监视器 -#: ../panel-plugin/systemload.c:789 +#: ../panel-plugin/systemload.c:815 msgid Memory monitor msgstr 内存监视器 -#: ../panel-plugin/systemload.c:790 +#: ../panel-plugin/systemload.c:816 msgid Swap monitor msgstr 交换分区监视器 -#: ../panel-plugin/systemload.c:791 +#: ../panel-plugin/systemload.c:817 msgid Uptime monitor msgstr 运行时间监视器 -#: ../panel-plugin/systemload.c:796 +#: ../panel-plugin/systemload.c:822 #: ../panel-plugin/systemload.desktop.in.in.h:2 msgid System Load Monitor msgstr 系统负载监视器 -#: ../panel-plugin/systemload.c:823 ../panel-plugin/systemload.c:904 -msgid Show monitor -msgstr 显示监视器 +#: ../panel-plugin/systemload.c:837 +msgid General +msgstr 一般 + +#: ../panel-plugin/systemload.c:839 +msgid Update interval: +msgstr 更新间隔： + +#: ../panel-plugin/systemload.c:839 ../panel-plugin/systemload.c:844 +msgid s +msgstr S + +#: ../panel-plugin/systemload.c:844 +msgid Power-saving interval: +msgstr 节能间隔： -#: ../panel-plugin/systemload.c:833 +#: ../panel-plugin/systemload.c:858 msgid Text to display: msgstr 要显示的文本： -#: ../panel-plugin/systemload.c:865 +#: ../panel-plugin/systemload.c:862 msgid Bar color: msgstr 监视条颜色： ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to 4828e19aed783df55e65e802ed73b84f9c8918da (commit) from f46026018d9c617e5c6294e8e97aad4db388aadb (commit) commit 4828e19aed783df55e65e802ed73b84f9c8918da Author: Chipong Luo chipon...@yahoo.com Date: Mon Jan 23 12:03:27 2012 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 325 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 177 +-- 1 files changed, 148 insertions(+), 29 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 68eb28b..570bc3b 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,20 +5,20 @@ # Chris K. Zhang plut...@gmail.com, 2009. # Aron Xu aronmala...@163.com, 2009. # Hunt Xu hun...@live.cn, 2009, 2010. -# Chipong Luo chipon...@yahoo.com, 2011. -# +# Chipong Luo chipon...@yahoo.com, 2011, 2012. +# msgid msgstr Project-Id-Version: xfce4-settings\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-01-17 08:21+\n +POT-Creation-Date: 2012-01-23 08:18+\n PO-Revision-Date: 2010-11-27 21:48+0800\n Last-Translator: Chipong Luo chipon...@yahoo.com\n Language-Team: Chinese (Simplified) xfce-i...@xfce.org\n +Language: zh_CN\n MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n -Language: zh_CN\n #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:1 msgid Acceleration _profile: @@ -226,16 +226,16 @@ msgstr 套接字 ID #: ../dialogs/accessibility-settings/main.c:44 #: ../dialogs/appearance-settings/main.c:95 #: ../dialogs/display-settings/main.c:103 -#: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:98 -#: ../xfce4-settings-editor/main.c:43 ../xfsettingsd/main.c:77 -#: ../xfce4-settings-manager/main.c:39 +#: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mime-settings/main.c:40 +#: ../dialogs/mouse-settings/main.c:98 ../xfce4-settings-editor/main.c:43 +#: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:39 msgid Version information msgstr 版本信息 #: ../dialogs/accessibility-settings/main.c:192 #: ../dialogs/appearance-settings/main.c:966 #: ../dialogs/display-settings/main.c:1043 -#: ../dialogs/keyboard-settings/main.c:76 +#: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62 #: ../dialogs/mouse-settings/main.c:1515 ../xfce4-settings-editor/main.c:63 #: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:57 #, c-format @@ -245,7 +245,7 @@ msgstr 输入 ‘%s --help’ 获取用法。 #: ../dialogs/accessibility-settings/main.c:211 #: ../dialogs/appearance-settings/main.c:985 #: ../dialogs/display-settings/main.c:1062 -#: ../dialogs/keyboard-settings/main.c:92 +#: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81 #: ../dialogs/mouse-settings/main.c:1534 ../xfce4-settings-editor/main.c:82 #: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:70 msgid The Xfce development team. All rights reserved. @@ -254,7 +254,7 @@ msgstr Xfce 开发团队。保留所有权利。 #: ../dialogs/accessibility-settings/main.c:212 #: ../dialogs/appearance-settings/main.c:986 #: ../dialogs/display-settings/main.c:1063 -#: ../dialogs/keyboard-settings/main.c:93 +#: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82 #: ../dialogs/mouse-settings/main.c:1535 ../xfce4-settings-editor/main.c:83 #: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:71 #, c-format @@ -687,26 +687,32 @@ msgid Select command msgstr 选择命令 #: ../dialogs/keyboard-settings/command-dialog.c:235 +#: ../dialogs/mime-settings/xfce-mime-chooser.c:386 msgid All Files msgstr 所有文件 #: ../dialogs/keyboard-settings/command-dialog.c:240 +#: ../dialogs/mime-settings/xfce-mime-chooser.c:391 msgid Executable Files msgstr 可执行文件 #: ../dialogs/keyboard-settings/command-dialog.c:255 +#: ../dialogs/mime-settings/xfce-mime-chooser.c:406 msgid Perl Scripts msgstr Perl 脚本 #: ../dialogs/keyboard-settings/command-dialog.c:261 +#: ../dialogs/mime-settings/xfce-mime-chooser.c:412 msgid Python Scripts msgstr Python 脚本 #: ../dialogs/keyboard-settings/command-dialog.c:267 +#: ../dialogs/mime-settings/xfce-mime-chooser.c:418 msgid Ruby Scripts msgstr Ruby 脚本 #: ../dialogs/keyboard-settings/command-dialog.c:273 +#: ../dialogs/mime-settings/xfce-mime-chooser.c:424 msgid Shell Scripts msgstr Shell 脚本 @@ -881,6 +887,134 @@ msgstr 在您下次登录时将恢复系统默认 msgid Warning msgstr 警告 +#: ../dialogs/mime-settings/xfce-mime-chooser.c:128 +msgid Select Application +msgstr 选择应用程序 + +#: ../dialogs/mime-settings/xfce-mime-chooser.c:204 +msgid Use a c_ustom command: +msgstr 选择自定义命令(_U)： + +#: ../dialogs/mime-settings/xfce-mime-chooser.c:205 +msgid +Use a custom command for an application that is not available from the above +application list. +msgstr +为以上应用程序列表中没有的应用程序使用自定义命令。 + +#: ../dialogs/mime-settings/xfce-mime-chooser.c:223 +msgid _Browse...
[Xfce4-commits] xfce4-systemload-plugin:master l10n: Updated Dutch (Flemish) (nl) translation to 100%
Updating branch refs/heads/master to a74e178005d82e109217c80ea25c787e78cb (commit) from 23cb4ed5744ad7af85553ffdc50504f67914cbe0 (commit) commit a74e178005d82e109217c80ea25c787e78cb Author: Pjotr Anon pliniusmi...@gmail.com Date: Mon Jan 23 12:16:26 2012 +0100 l10n: Updated Dutch (Flemish) (nl) translation to 100% New status: 20 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nl.po | 58 -- 1 files changed, 36 insertions(+), 22 deletions(-) diff --git a/po/nl.po b/po/nl.po index c52c163..7370d08 100644 --- a/po/nl.po +++ b/po/nl.po @@ -3,12 +3,12 @@ # This file is distributed under the same license as the xfce4-systemload-plugin package. # Jasper Huijsmans jas...@xfce.org, 2005. # Pjotr, 2011. -# +# msgid msgstr Project-Id-Version: xfce4-systemload-plugin\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-06-16 10:17+\n +POT-Creation-Date: 2012-01-23 08:33+\n PO-Revision-Date: 2011-06-15 14:22+0200\n Last-Translator: Pjotr\n Language-Team: Dutch (Flemish)\n @@ -22,74 +22,82 @@ msgstr msgid File /proc/stat not found! msgstr Bestand /proc/stat niet gevonden! -#: ../panel-plugin/systemload.c:160 +#: ../panel-plugin/systemload.c:155 #, c-format msgid System Load: %ld%% msgstr Systeembelasting: %ld%% -#: ../panel-plugin/systemload.c:167 +#: ../panel-plugin/systemload.c:162 #, c-format msgid Memory: %ldMB of %ldMB used msgstr Geheugen: %ldMB van %ldMB in gebruik -#: ../panel-plugin/systemload.c:175 +#: ../panel-plugin/systemload.c:170 #, c-format msgid Swap: %ldMB of %ldMB used msgstr Wisselgeheugen: %ldMB van %ldMB in gebruik -#: ../panel-plugin/systemload.c:178 +#: ../panel-plugin/systemload.c:173 #, c-format msgid No swap msgstr Geen wisselgeheugen -#: ../panel-plugin/systemload.c:188 +#: ../panel-plugin/systemload.c:183 #, c-format msgid %d day msgid_plural %d days msgstr[0] %d dag msgstr[1] %d dagen -#: ../panel-plugin/systemload.c:196 +#: ../panel-plugin/systemload.c:191 #, c-format msgid Uptime: %d day %d:%02d msgid_plural Uptime: %d days %d:%02d msgstr[0] Draaiperiode: %d dag %d:%02d msgstr[1] Draaiperiode: %d dagen %d:%02d -#: ../panel-plugin/systemload.c:724 -msgid Select color -msgstr Kleur kiezen - -#: ../panel-plugin/systemload.c:788 +#: ../panel-plugin/systemload.c:814 msgid CPU monitor msgstr CPU-monitor -#: ../panel-plugin/systemload.c:789 +#: ../panel-plugin/systemload.c:815 msgid Memory monitor msgstr Geheugenmonitor -#: ../panel-plugin/systemload.c:790 +#: ../panel-plugin/systemload.c:816 msgid Swap monitor msgstr Wisselgeheugenmonitor -#: ../panel-plugin/systemload.c:791 +#: ../panel-plugin/systemload.c:817 msgid Uptime monitor msgstr Draaiperiode-monitor -#: ../panel-plugin/systemload.c:796 +#: ../panel-plugin/systemload.c:822 #: ../panel-plugin/systemload.desktop.in.in.h:2 msgid System Load Monitor msgstr Systeemmonitor -#: ../panel-plugin/systemload.c:823 ../panel-plugin/systemload.c:904 -msgid Show monitor -msgstr Monitor tonen +#: ../panel-plugin/systemload.c:837 +msgid General +msgstr Algemeen + +#: ../panel-plugin/systemload.c:839 +msgid Update interval: +msgstr Tijd tussen bijwerktijdstippen: + +#: ../panel-plugin/systemload.c:839 ../panel-plugin/systemload.c:844 +msgid s +msgstr s -#: ../panel-plugin/systemload.c:833 +#: ../panel-plugin/systemload.c:844 +msgid Power-saving interval: +msgstr Tijd tot inwerkingtreding energiebesparing: + +#: ../panel-plugin/systemload.c:858 msgid Text to display: msgstr Tekst om weer te geven: -#: ../panel-plugin/systemload.c:865 +#: ../panel-plugin/systemload.c:862 msgid Bar color: msgstr Balkkleur: @@ -101,6 +109,12 @@ msgstr Bestand /proc/uptime niet gevonden! msgid Monitor CPU load, swap usage and memory footprint msgstr Toon CPU-belasting, wisselgeheugen- en geheugengebruik +#~ msgid Select color +#~ msgstr Kleur kiezen + +#~ msgid Show monitor +#~ msgstr Monitor tonen + #~ msgid Uptime: #~ msgstr Draaiperiode: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-battery-plugin:master l10n: Added Lithuanian language
Updating branch refs/heads/master
to 0f47f22876ea27bcbcabeaa32e7cfdeffafe4ad2 (commit)
from 3745d2bbc60152f5aab96a228dbf52f2ce4c8190 (commit)
commit 0f47f22876ea27bcbcabeaa32e7cfdeffafe4ad2
Author: Algimantas Margevičius gy...@mail.ru
Date: Mon Jan 23 13:40:35 2012 +0100
l10n: Added Lithuanian language
New status: 32 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
po/{is.po = lt.po} | 84 ++
1 files changed, 44 insertions(+), 40 deletions(-)
diff --git a/po/is.po b/po/lt.po
similarity index 61%
copy from po/is.po
copy to po/lt.po
index 22770ac..1a6c8b8 100644
--- a/po/is.po
+++ b/po/lt.po
@@ -1,157 +1,161 @@
-# translation of xfce4-battery-plugin.master.untitled.po to Icelandic
+# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR EMAIL@ADDRESS, YEAR.
+# Algimantas Margevičius margevicius.algiman...@gmail.com, 2012.
#
-# Sveinn í Felli svei...@nett.is, 2011.
msgid
msgstr
-Project-Id-Version: xfce4-battery-plugin.master.untitled\n
+Project-Id-Version: batery\n
Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2011-12-08 17:30+\n
-PO-Revision-Date: 2011-12-08 22:22+\n
-Last-Translator: Sveinn í Felli svei...@nett.is\n
-Language-Team: Icelandic translation-team...@lists.sourceforge.net\n
+POT-Creation-Date: 2012-01-23 12:18+\n
+PO-Revision-Date: 2012-01-23 14:39+0200\n
+Last-Translator: Algimantas Margevičius margevicius.algiman...@gmail.com\n
+Language-Team: Lietuvių \n
Language: \n
MIME-Version: 1.0\n
Content-Type: text/plain; charset=UTF-8\n
Content-Transfer-Encoding: 8bit\n
-X-Generator: KBabel 1.11.4\n
-Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n
+Plural-Forms: nplurals=3; plural=(n%10==1 n%100!=11 ? 0 : n%10=2 (n
+%10010 || n%100=20) ? 1 : 2)\n
#: ../panel-plugin/battery.c:500
msgid (No battery, AC on-line)
-msgstr
+msgstr (Baterijos nėra, naudojama tinklo energija)
#: ../panel-plugin/battery.c:502
msgid (Charging from AC)
-msgstr
+msgstr (Įkraunama iš tinklo)
#: ../panel-plugin/battery.c:502
msgid (AC on-line)
-msgstr
+msgstr (įjungta į tinklą)
#: ../panel-plugin/battery.c:512
#, c-format
msgid %d%% (%02d:%02d) remaining
-msgstr %d%% (%02d:%02d) eftir
+msgstr %d%% (%02d:%02d) liko
#: ../panel-plugin/battery.c:514
#, c-format
msgid %02d:%02d remaining
-msgstr %02d:%02d eftir
+msgstr %02d:%02d liko
#: ../panel-plugin/battery.c:516
#, c-format
msgid %d%% remaining
-msgstr %d%% eftir
+msgstr %d%% liko
#: ../panel-plugin/battery.c:518
#, c-format
msgid AC off-line
-msgstr
+msgstr AC atjungta
#: ../panel-plugin/battery.c:584
msgid
WARNING: Your battery has reached critical status. You should plug in or
shutdown your computer now to avoid possible data loss.
msgstr
+ĮSPĖJIMAS: Jūsų baterija pasiekė kritinį lygį. Jūs turėtumėte prijungti
+kompiuterį pakrovimui arba išjungti jį, nes kitaip galite prarasti duomenis.
#: ../panel-plugin/battery.c:602
msgid
WARNING: Your battery is running low. You should consider plugging in or
shutting down your computer soon to avoid possible data loss.
msgstr
+ĮSPĖJIMAS: Jūsų baterijoje liko nedaug energijos. Jūs turėtumėte prijungti
+kompiuterį pakrovimui arba išjungti jį, nes kitaip galite prarasti duomenis.
#: ../panel-plugin/battery.c:689
msgid Battery
-msgstr Rafhlaða
+msgstr Akumuliatorius
#: ../panel-plugin/battery.c:1116
msgid Select file
-msgstr Veldu skrá
+msgstr Pasirinkite failą
#: ../panel-plugin/battery.c:1157
msgid Select command
-msgstr Veldu skipun
+msgstr Pasirinkti komandą
#: ../panel-plugin/battery.c:1176
#, c-format
msgid Unable to open the following url: %s
-msgstr Get ekki opnað eftirfarandi slóð: %s
+msgstr Nepavyko atverti šio url: %s
#: ../panel-plugin/battery.c:1200 ../panel-plugin/battmon.desktop.in.in.h:1
msgid Battery Monitor
-msgstr Rafhlöðueftirlit
+msgstr Baterijos stebėtojas
#: ../panel-plugin/battery.c:1229
msgid Low percentage:
-msgstr
+msgstr Žemas lygis:
#: ../panel-plugin/battery.c:1240
msgid Critical percentage:
-msgstr
+msgstr Kritinis lygis:
#: ../panel-plugin/battery.c:1253
msgid Low battery action:
-msgstr
+msgstr Kai baterijoje mažai energijos:
#: ../panel-plugin/battery.c:1259 ../panel-plugin/battery.c:1300
msgid Do nothing
-msgstr Gera ekkert
+msgstr Nieko nedaryti
#: ../panel-plugin/battery.c:1261 ../panel-plugin/battery.c:1302
msgid Display a warning message
-msgstr Birta aðvörun
+msgstr Parodyti perspėjimo pranešimą
#: ../panel-plugin/battery.c:1263 ../panel-plugin/battery.c:1304
msgid Run command
-msgstr Keyra skipun
+msgstr Vykdyti komandą
#: ../panel-plugin/battery.c:1265 ../panel-plugin/battery.c:1306
msgid Run command in terminal
-msgstr Keyra skipun í skjáhermi
+msgstr Vykdyti komandą terminale
#:
[Xfce4-commits] xfce4-systemload-plugin:master l10n: Updated Ukrainian (uk) translation to 100%
Updating branch refs/heads/master to 2c1f3c6494f96311db8fcfc1e74a43f7c9018318 (commit) from a74e178005d82e109217c80ea25c787e78cb (commit) commit 2c1f3c6494f96311db8fcfc1e74a43f7c9018318 Author: Yarema aka Knedlyk yupad...@gmail.com Date: Mon Jan 23 21:48:59 2012 +0100 l10n: Updated Ukrainian (uk) translation to 100% New status: 20 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/uk.po | 64 ++--- 1 files changed, 40 insertions(+), 24 deletions(-) diff --git a/po/uk.po b/po/uk.po index c230287..3b1b61b 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8,7 +8,7 @@ msgid msgstr Project-Id-Version: uk\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-11-13 01:24+0900\n +POT-Creation-Date: 2012-01-23 20:09+\n PO-Revision-Date: 2007-03-14 16:42+0200\n Last-Translator: Dmitry Nikitin luckas...@mail.ru\n Language-Team: Ukrainian xfce-i...@xfce.org\n @@ -19,31 +19,31 @@ msgstr Plural-Forms: nplurals=3; plural=(n%10==1 n%100!=11 ? 0 : n%10=2 n%10=4 (n%10010 || n%100=20) ? 1 : 2);\n X-Generator: KBabel 1.11.4\n -#: ../panel-plugin/cpu.c:62 +#: ../panel-plugin/cpu.c:63 msgid File /proc/stat not found! msgstr Файл /proc/stat не знайдено! -#: ../panel-plugin/systemload.c:159 +#: ../panel-plugin/systemload.c:155 #, c-format msgid System Load: %ld%% msgstr Навантаження системи: %ld%% -#: ../panel-plugin/systemload.c:166 +#: ../panel-plugin/systemload.c:162 #, c-format msgid Memory: %ldMB of %ldMB used msgstr Пам'ять: %ldМб з %ldМб використано -#: ../panel-plugin/systemload.c:174 +#: ../panel-plugin/systemload.c:170 #, c-format msgid Swap: %ldMB of %ldMB used msgstr Файл підкачки: %ldМб з %ldMB використано -#: ../panel-plugin/systemload.c:177 +#: ../panel-plugin/systemload.c:173 #, c-format msgid No swap msgstr Без підкачки -#: ../panel-plugin/systemload.c:187 +#: ../panel-plugin/systemload.c:183 #, c-format msgid %d day msgid_plural %d days @@ -51,7 +51,7 @@ msgstr[0] %d день msgstr[1] %d днів msgstr[2] %d днів -#: ../panel-plugin/systemload.c:195 +#: ../panel-plugin/systemload.c:191 #, c-format msgid Uptime: %d day %d:%02d msgid_plural Uptime: %d days %d:%02d @@ -59,50 +59,66 @@ msgstr[0] Час роботи: %d день %d:%02d msgstr[1] Час роботи: %d днів %d:%02d msgstr[2] Час роботи: %d днів %d:%02d -#: ../panel-plugin/systemload.c:722 -msgid Select color -msgstr Вибрати колір - -#: ../panel-plugin/systemload.c:786 +#: ../panel-plugin/systemload.c:814 msgid CPU monitor msgstr Стеження за процесором -#: ../panel-plugin/systemload.c:787 +#: ../panel-plugin/systemload.c:815 msgid Memory monitor msgstr Стеження за пам'яттю -#: ../panel-plugin/systemload.c:788 +#: ../panel-plugin/systemload.c:816 msgid Swap monitor msgstr Стеження за файлом підкачки -#: ../panel-plugin/systemload.c:789 +#: ../panel-plugin/systemload.c:817 msgid Uptime monitor msgstr Стеження за часом роботи -#: ../panel-plugin/systemload.c:794 +#: ../panel-plugin/systemload.c:822 #: ../panel-plugin/systemload.desktop.in.in.h:2 msgid System Load Monitor msgstr Стеження за навантаженням системи -#: ../panel-plugin/systemload.c:821 ../panel-plugin/systemload.c:902 -msgid Show monitor -msgstr Відображати стеження +#: ../panel-plugin/systemload.c:837 +msgid General +msgstr Загальне + +#: ../panel-plugin/systemload.c:839 +msgid Update interval: +msgstr Інтервал оновлення: + +#: ../panel-plugin/systemload.c:839 ../panel-plugin/systemload.c:844 +msgid s +msgstr с + +#: ../panel-plugin/systemload.c:844 +msgid Power-saving interval: +msgstr Інтервал збереження енергії: -#: ../panel-plugin/systemload.c:831 +#: ../panel-plugin/systemload.c:858 msgid Text to display: msgstr Відображуваний текст: -#: ../panel-plugin/systemload.c:863 +#: ../panel-plugin/systemload.c:862 msgid Bar color: msgstr Колір індикатора: -#: ../panel-plugin/uptime.c:52 +#: ../panel-plugin/uptime.c:53 msgid File /proc/uptime not found! msgstr Файл /proc/uptime не знайдено! #: ../panel-plugin/systemload.desktop.in.in.h:1 msgid Monitor CPU load, swap usage and memory footprint -msgstr Стежити за навантаженням процесора, використанням файлу підкачки і основною пам'яттю +msgstr +Стежити за навантаженням процесора, використанням файлу підкачки і основною +пам'яттю + +#~ msgid Select color +#~ msgstr Вибрати колір + +#~ msgid Show monitor +#~ msgstr Відображати стеження #~ msgid Uptime: #~ msgstr Час роботи: ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar-volman:master l10n: Updated Ukrainian (uk) translation to 100%
Updating branch refs/heads/master to f51e2143eec8d47dc9cd0bb69228fc350fd130f1 (commit) from 6257c43747360fc6df696f7026207b5290f5b550 (commit) commit f51e2143eec8d47dc9cd0bb69228fc350fd130f1 Author: Yarema aka Knedlyk yupad...@gmail.com Date: Mon Jan 23 21:50:09 2012 +0100 l10n: Updated Ukrainian (uk) translation to 100% New status: 113 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/uk.po | 52 +++- 1 files changed, 27 insertions(+), 25 deletions(-) diff --git a/po/uk.po b/po/uk.po index 5f66926..fe3fb10 100644 --- a/po/uk.po +++ b/po/uk.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: thunar-volman 0.2.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-11-07 14:39+0100\n +POT-Creation-Date: 2012-01-23 17:36+\n PO-Revision-Date: 2007-11-10 20:23+0200\n Last-Translator: Dmitry Nikitin luckas...@mail.ru\n Language-Team: Ukrainian xfce-i...@xfce.org\n @@ -33,25 +33,25 @@ msgid Print version information and exit msgstr Показати інформацію про версію і вийти #. setup application name -#: ../thunar-volman/main.c:96 +#: ../thunar-volman/main.c:93 msgid Thunar Volume Manager msgstr Thunar Керівник Томів -#: ../thunar-volman/main.c:135 +#: ../thunar-volman/main.c:119 msgid All rights reserved. msgstr Всі права застережено. -#: ../thunar-volman/main.c:136 +#: ../thunar-volman/main.c:120 #, c-format msgid Please report bugs to %s. msgstr Будь-ласка, звітуйте про помилки для %s. -#: ../thunar-volman/main.c:190 +#: ../thunar-volman/main.c:174 #, c-format msgid There is no device with the sysfs path \%s\ msgstr Немає пристрою з шляхом sysfs \%s\ -#: ../thunar-volman/main.c:202 +#: ../thunar-volman/main.c:186 #, c-format msgid Must specify the sysfs path of new devices with --device-added msgstr Ви повинні вказати шлях sysfs для нових пристроїв з --device-added @@ -98,7 +98,9 @@ msgid A photo card has been detected msgstr Виявлена фото-картка #: ../thunar-volman/tvm-block-device.c:275 -msgid There are photos on the card. Would you like to add these photos to your album? +msgid +There are photos on the card. Would you like to add these photos to your +album? msgstr На картці є фотографії. Хочете додати ці фото до Вашого альбому? #. prompt the user to execute the file @@ -217,10 +219,6 @@ msgstr Невідомий тип блок-пристрою msgid Device type not supported msgstr Тип пристрою не підтримується -#: ../thunar-volman/tvm-input-device.c:74 -msgid input-keyboard -msgstr клавіатура - #: ../thunar-volman/tvm-input-device.c:75 msgid Keyboard detected msgstr Виявлено клавіатуру @@ -229,11 +227,6 @@ msgstr Виявлено клавіатуру msgid A keyboard was detected msgstr Було виявлено клавіатуру -#: ../thunar-volman/tvm-input-device.c:86 -#: ../thunar-volman/tvm-input-device.c:100 -msgid input-tablet -msgstr таблет - #: ../thunar-volman/tvm-input-device.c:87 #: ../thunar-volman/tvm-input-device.c:101 msgid Tablet detected @@ -244,10 +237,6 @@ msgstr Виявлено таблет msgid A graphics tablet was detected msgstr Виявлено графічний таблет -#: ../thunar-volman/tvm-input-device.c:110 -msgid input-mouse -msgstr мишка - #: ../thunar-volman/tvm-input-device.c:111 msgid Mouse detected msgstr Виявлено мишку @@ -516,7 +505,7 @@ msgid Keyboards msgstr Клавіатури #: ../thunar-volman-settings/tvm-preferences-dialog.c:593 -msgid Automatically run a program when an USB _keyboard is connected +msgid Automatically run a program when a USB _keyboard is connected msgstr Автоматично запустити програму при під'єднанні USB _клавіатури #: ../thunar-volman-settings/tvm-preferences-dialog.c:615 @@ -524,7 +513,7 @@ msgid Mice msgstr Миша #: ../thunar-volman-settings/tvm-preferences-dialog.c:632 -msgid Automatically run a program when an USB _mouse is connected +msgid Automatically run a program when a USB _mouse is connected msgstr Автоматично запускати програму при під'єднанні USB _миші #: ../thunar-volman-settings/tvm-preferences-dialog.c:654 @@ -543,6 +532,15 @@ msgstr Ко_манда: msgid Failed to open the documentation browser msgstr невдача при відкритті переглядача документації +#~ msgid input-keyboard +#~ msgstr клавіатура + +#~ msgid input-tablet +#~ msgstr таблет + +#~ msgid input-mouse +#~ msgstr мишка + #~ msgid Failed to open display #~ msgstr Невдача при спробі відкити дисплей @@ -558,8 +556,11 @@ msgstr невдача при відкритті переглядача доку #~ msgid Encrypted volume #~ msgstr Зашифрований том -#~ msgid span weight=\bold\ size=\larger\Mounting encrypted volume.../span -#~ msgstr span weight=\bold\ size=\larger\Монтування зашифрованого тому.../span +#~ msgid +#~ span weight=\bold\ size=\larger\Mounting encrypted volume.../span +#~ msgstr +#~ span weight=\bold\ size=\larger\Монтування зашифрованого тому.../ +#~ span #~ msgid Setting up the crypto layer... #~ msgstr Налаштувати криптографічний шар...
[Xfce4-commits] xfce4-settings:master l10n: Updated Ukrainian (uk) translation to 100%
Updating branch refs/heads/master to 7f17dc0d8422f58d943a3c1f1c77477784365791 (commit) from 5785e87190e0a1e3cd0d73ef12c504d4ffccb983 (commit) commit 7f17dc0d8422f58d943a3c1f1c77477784365791 Author: Yarema aka Knedlyk yupad...@gmail.com Date: Mon Jan 23 22:04:01 2012 +0100 l10n: Updated Ukrainian (uk) translation to 100% New status: 325 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/uk.po | 260 ++ 1 files changed, 194 insertions(+), 66 deletions(-) diff --git a/po/uk.po b/po/uk.po index 1238cbe..b3241db 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6,7 +6,7 @@ msgid msgstr Project-Id-Version: xfce4-settings\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-01-09 12:18+\n +POT-Creation-Date: 2012-01-23 19:54+\n PO-Revision-Date: 2009-01-26 16:20+0200\n Last-Translator: Dmitry Nikitin luckas...@mail.ru\n Language-Team: Ukrainian xfce4-...@xfce.org\n @@ -243,17 +243,17 @@ msgstr ID сокета #: ../dialogs/accessibility-settings/main.c:44 #: ../dialogs/appearance-settings/main.c:95 #: ../dialogs/display-settings/main.c:103 -#: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mouse-settings/main.c:98 -#: ../xfce4-settings-editor/main.c:43 ../xfsettingsd/main.c:77 -#: ../xfce4-settings-manager/main.c:39 +#: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mime-settings/main.c:40 +#: ../dialogs/mouse-settings/main.c:98 ../xfce4-settings-editor/main.c:43 +#: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:39 msgid Version information msgstr Інформація про версію #: ../dialogs/accessibility-settings/main.c:192 #: ../dialogs/appearance-settings/main.c:966 #: ../dialogs/display-settings/main.c:1043 -#: ../dialogs/keyboard-settings/main.c:76 -#: ../dialogs/mouse-settings/main.c:1516 ../xfce4-settings-editor/main.c:63 +#: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62 +#: ../dialogs/mouse-settings/main.c:1515 ../xfce4-settings-editor/main.c:63 #: ../xfsettingsd/main.c:173 ../xfce4-settings-manager/main.c:57 #, c-format msgid Type '%s --help' for usage. @@ -262,8 +262,8 @@ msgstr Наберіть '%s --help' для використання. #: ../dialogs/accessibility-settings/main.c:211 #: ../dialogs/appearance-settings/main.c:985 #: ../dialogs/display-settings/main.c:1062 -#: ../dialogs/keyboard-settings/main.c:92 -#: ../dialogs/mouse-settings/main.c:1535 ../xfce4-settings-editor/main.c:82 +#: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81 +#: ../dialogs/mouse-settings/main.c:1534 ../xfce4-settings-editor/main.c:82 #: ../xfsettingsd/main.c:189 ../xfce4-settings-manager/main.c:70 msgid The Xfce development team. All rights reserved. msgstr Команда розробників Xfce. Всі права застережено. @@ -271,8 +271,8 @@ msgstr Команда розробників Xfce. Всі права засте #: ../dialogs/accessibility-settings/main.c:212 #: ../dialogs/appearance-settings/main.c:986 #: ../dialogs/display-settings/main.c:1063 -#: ../dialogs/keyboard-settings/main.c:93 -#: ../dialogs/mouse-settings/main.c:1536 ../xfce4-settings-editor/main.c:83 +#: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82 +#: ../dialogs/mouse-settings/main.c:1535 ../xfce4-settings-editor/main.c:83 #: ../xfsettingsd/main.c:190 ../xfce4-settings-manager/main.c:71 #, c-format msgid Please report bugs to %s. @@ -724,26 +724,32 @@ msgid Select command msgstr Вибрати команду #: ../dialogs/keyboard-settings/command-dialog.c:235 +#: ../dialogs/mime-settings/xfce-mime-chooser.c:386 msgid All Files msgstr Всі файли #: ../dialogs/keyboard-settings/command-dialog.c:240 +#: ../dialogs/mime-settings/xfce-mime-chooser.c:391 msgid Executable Files msgstr Виконувані файли #: ../dialogs/keyboard-settings/command-dialog.c:255 +#: ../dialogs/mime-settings/xfce-mime-chooser.c:406 msgid Perl Scripts msgstr Скрипти Perl #: ../dialogs/keyboard-settings/command-dialog.c:261 +#: ../dialogs/mime-settings/xfce-mime-chooser.c:412 msgid Python Scripts msgstr Скрипти Python #: ../dialogs/keyboard-settings/command-dialog.c:267 +#: ../dialogs/mime-settings/xfce-mime-chooser.c:418 msgid Ruby Scripts msgstr Скрипти Ruby #: ../dialogs/keyboard-settings/command-dialog.c:273 +#: ../dialogs/mime-settings/xfce-mime-chooser.c:424 msgid Shell Scripts msgstr Скрипти Shell @@ -773,7 +779,7 @@ msgid Edit keyboard settings and application shortcuts msgstr Редагувати властивості клавіатури та ярликів запуску програм #: ../dialogs/keyboard-settings/keyboard-dialog.glade.h:7 -#: ../dialogs/mouse-settings/mouse-dialog.glade.h:14 +#: ../dialogs/mouse-settings/mouse-dialog.glade.h:15 msgid General msgstr Загальне @@ -925,6 +931,131 @@ msgstr msgid Warning msgstr Попередження +#: ../dialogs/mime-settings/xfce-mime-chooser.c:128 +msgid Select Application +msgstr Вибрати програму + +#:
[Xfce4-commits] xfconf:master l10n: Added Norwegian Nynorsk translation
Updating branch refs/heads/master
to e9a057be92dd7f5f7dcfa33da656833696140b6b (commit)
from f795adc5ec4a69e82886d13fa7ed9726023e52c5 (commit)
commit e9a057be92dd7f5f7dcfa33da656833696140b6b
Author: Eivind Ødegård ginger...@yahoo.no
Date: Mon Jan 23 23:27:31 2012 +0100
l10n: Added Norwegian Nynorsk translation
New status: 67 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
po/{te.po = nn.po} | 187 +--
1 files changed, 92 insertions(+), 95 deletions(-)
diff --git a/po/te.po b/po/nn.po
similarity index 55%
copy from po/te.po
copy to po/nn.po
index 47b7acd..60ab9fb 100644
--- a/po/te.po
+++ b/po/nn.po
@@ -2,336 +2,333 @@
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR EMAIL@ADDRESS, YEAR.
-# Praveen Illa mail2...@gmail.com, 2011.
#
msgid
msgstr
-Project-Id-Version: \n
+Project-Id-Version: xfconf\n
Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2011-11-28 21:48+0100\n
-PO-Revision-Date: 2011-08-23 00:51+0530\n
-Last-Translator: Praveen Illa mail2...@gmail.com\n
-Language-Team: Telugu indlinux-tel...@lists.sourceforge.net\n
-Language: te\n
+POT-Creation-Date: 2012-01-17 15:18+\n
+PO-Revision-Date: 2012-01-23 23:26+0100\n
+Last-Translator: Eivind Ødegård ginge...@yahoo.no\n
+Language-Team: nn_NO i18n...@lister.ping.uio.no\n
+Language: \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
+Plural-Forms: nplurals=2; plural=(n!=1)\n
+X-Poedit-Language: Norwegian Nynorsk\n
+X-Poedit-Country: NORWAY\n
#: ../xfconf/xfconf-cache.c:876
#, c-format
msgid Failed to make ResetProperty DBus call
-msgstr
+msgstr Klarte ikkje laga ResetProperty-DBus-kall
#: ../xfconfd/xfconf-backend-perchannel-xml.c:277
#, c-format
msgid Unable to create configuration directory \%s\
-msgstr
+msgstr Klarer ikkje laga oppsettsmappa «%s»
#: ../xfconfd/xfconf-backend-perchannel-xml.c:322
#: ../xfconfd/xfconf-daemon.c:238
#, c-format
msgid Permission denied while modifying property \%s\ on channel \%s\
-msgstr
+msgstr TIlgang nekta då me endra eigenskapen «%s» på kanal «%s»
#: ../xfconfd/xfconf-backend-perchannel-xml.c:387
#: ../xfconfd/xfconf-backend-perchannel-xml.c:469
#: ../xfconfd/xfconf-backend-perchannel-xml.c:634
-#: ../xfconfd/xfconf-backend-perchannel-xml.c:654 ../xfconf-query/main.c:341
+#: ../xfconfd/xfconf-backend-perchannel-xml.c:654
+#: ../xfconf-query/main.c:341
#, c-format
msgid Property \%s\ does not exist on channel \%s\
-msgstr
+msgstr Eigenskapen «%s» finst ikkje på kanalen «%s»
#: ../xfconfd/xfconf-backend-perchannel-xml.c:601
#, c-format
msgid Unable to remove channel \%s\: %s
-msgstr
+msgstr Klarer ikkje fjerna kanalen «%s»: %s
#: ../xfconfd/xfconf-backend-perchannel-xml.c:1298
#, c-format
msgid Invalid type for property: \%s\
-msgstr
+msgstr Ugyldig type for eigenskap: «%s»
#: ../xfconfd/xfconf-backend-perchannel-xml.c:1314
#: ../xfconfd/xfconf-backend-perchannel-xml.c:1390
#, c-format
msgid Unable to parse value of type \%s\ from \%s\
-msgstr
+msgstr Klarer ikkje tolka verdien av typen «%s» frå «%s»
#: ../xfconfd/xfconf-backend-perchannel-xml.c:1370
#, c-format
msgid The type attribute of value cannot be an array
-msgstr
+msgstr Typeeigenskapen for verdi kan ikkje vera ein tabell
#: ../xfconfd/xfconf-backend-perchannel-xml.c:1379
#, c-format
msgid Invalid type for value: \%s\
-msgstr
+msgstr Ugyldig type for verdi: «%s»
#: ../xfconfd/xfconf-backend-perchannel-xml.c:1655
#: ../xfconfd/xfconf-backend-perchannel-xml.c:1904
#, c-format
msgid Channel \%s\ does not exist
-msgstr \%s\ ఛానల్ ఉనికిలో లేదు
+msgstr Kanalen «%s» finst ikkje
#: ../xfconfd/xfconf-backend-perchannel-xml.c:1962
#, c-format
msgid Unable to write channel \%s\: %s
-msgstr
+msgstr Kan ikkje skriva til kanalen «%s»: %s
#: ../xfconfd/xfconf-backend-factory.c:76
#, c-format
msgid Unable to find Xfconf backend of type \%s\
-msgstr
+msgstr Klarer ikkje finna Xfconf-bakprogrammet av typen «%s»
#: ../xfconfd/xfconf-backend.c:103
#, c-format
msgid Property names must start with a '/' character
-msgstr
+msgstr Eigenskapnamn må starta med ein '/'
#: ../xfconfd/xfconf-backend.c:112
#, c-format
msgid The root element ('/') is not a valid property name
-msgstr
+msgstr Rotelementet ('/') er ikkje eit gyldig eigenskapnamn
#: ../xfconfd/xfconf-backend.c:126
#, c-format
-msgid
-Property names can only include the ASCII characters A-Z, a-z, 0-9, '_',
-'-', '' and '', as well as '/' as a separator
-msgstr
+msgid Property names can only include the ASCII characters A-Z, a-z, 0-9,
'_', '-', '' and '', as well as '/' as a separator
+msgstr Eigenskapnamn kan berre innehalda ASCII-teikna A-Z, a-z, 0-9, '_',
'-', '' og '' og '/' som deleteikn
[Xfce4-commits] xfce4-settings:master l10n: Updated Norwegian Nynorsk (nn) translation to 100%
Updating branch refs/heads/master to 66303a29a3f5da2cb302d7fd9e9bbc797f43 (commit) from 7f17dc0d8422f58d943a3c1f1c77477784365791 (commit) commit 66303a29a3f5da2cb302d7fd9e9bbc797f43 Author: Eivind Ødegård ginger...@yahoo.no Date: Mon Jan 23 23:31:56 2012 +0100 l10n: Updated Norwegian Nynorsk (nn) translation to 100% New status: 325 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nn.po | 512 -- 1 files changed, 368 insertions(+), 144 deletions(-) diff --git a/po/nn.po b/po/nn.po index 58ed7f3..65c4333 100644 --- a/po/nn.po +++ b/po/nn.po @@ -2,22 +2,22 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR EMAIL@ADDRESS, YEAR. -# +# msgid msgstr Project-Id-Version: xfce4-settings\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-01-08 19:03+\n +POT-Creation-Date: 2012-01-23 19:54+\n PO-Revision-Date: 2012-01-17 20:31+0100\n Last-Translator: Eivind Ødegård ginge...@yahoo.no\n Language-Team: nn_NO i18n...@lister.ping.uio.no\n -Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +X-Poedit-Country: NORWAY\n +Language: \n Plural-Forms: nplurals=2; plural=(n!=1)\n X-Poedit-Language: Norwegian Nynorsk\n -X-Poedit-Country: NORWAY\n #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:1 msgid Acceleration _profile: @@ -57,8 +57,12 @@ msgid Disable sticky keys if _two keys are pressed msgstr Slå av fastlimte tastar viss du trykkjer _to tastar #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:10 -msgid If enabled, the session manager will start the required applications for screen readers and magnifiers -msgstr Når dette er på, vil økthandsamaren starta dei naudsynte programma for skjermlesarar og forstørring +msgid +If enabled, the session manager will start the required applications for +screen readers and magnifiers +msgstr +Når dette er på, vil økthandsamaren starta dei naudsynte programma for +skjermlesarar og forstørring #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:11 msgid K_eystroke delay: @@ -97,8 +101,11 @@ msgid The amount of time, in milliseconds, required between keystrokes msgstr Kravd tid mellom tastetrykk (i millisekund) #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:20 -msgid The amount of time, in milliseconds, that must elapse before a keystroke will be accepted -msgstr Kor mykje tid som krevst før eit tastetrykk blir oppfanga (i millisekund) +msgid +The amount of time, in milliseconds, that must elapse before a keystroke +will be accepted +msgstr +Kor mykje tid som krevst før eit tastetrykk blir oppfanga (i millisekund) #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:21 msgid The maximum pointer speed after acceleration @@ -113,20 +120,32 @@ msgid The time, in milliseconds, between repeated motion events msgstr Tida mellom oppattekne rørslehandlingar (i millisekund) #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:24 -msgid The time, in milliseconds, between the initial key press and first repeated motion event -msgstr Tida mellom fyrste tastetrykk og fyrste oppattekne rørslehandling (i millisekund) +msgid +The time, in milliseconds, between the initial key press and first repeated +motion event +msgstr +Tida mellom fyrste tastetrykk og fyrste oppattekne rørslehandling (i +millisekund) #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:25 msgid The time, in milliseconds, to get to maximum speed msgstr Tida som skal til for å nå høgste fart (i millisekund) #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:26 -msgid To help prevent accidental keystrokes, slow keys requires that a key is held for a certain minimum amount of time before the keystroke will be accepted -msgstr Om du bruker sakte tasting, må du halda inne tastane ei viss tid før tastetrykket blir fanga opp. Slik hindrar du å tasta ved eit uhell. +msgid +To help prevent accidental keystrokes, slow keys requires that a key is held +for a certain minimum amount of time before the keystroke will be accepted +msgstr +Om du bruker sakte tasting, må du halda inne tastane ei viss tid før +tastetrykket blir fanga opp. Slik hindrar du å tasta ved eit uhell. #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:27 -msgid To help prevent accidental multiple keystrokes, bounce keys imposes a minimum delay between keystrokes -msgstr For å hindra at du tastar fleire tastar ved eit uhell, set me ei minstetid mellom tastetrykk +msgid +To help prevent accidental multiple keystrokes, bounce keys imposes a +minimum delay between keystrokes +msgstr +For å hindra at du tastar fleire tastar ved eit uhell, set
[Xfce4-commits] thunar-volman:master l10n: Updated Norwegian Nynorsk (nn) translation to 100%
Updating branch refs/heads/master to 2e4237d8634106eec2746db4a2e6591f0e617b0b (commit) from f51e2143eec8d47dc9cd0bb69228fc350fd130f1 (commit) commit 2e4237d8634106eec2746db4a2e6591f0e617b0b Author: Eivind Ødegård ginger...@yahoo.no Date: Mon Jan 23 23:32:54 2012 +0100 l10n: Updated Norwegian Nynorsk (nn) translation to 100% New status: 113 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nn.po | 69 ++--- 1 files changed, 29 insertions(+), 40 deletions(-) diff --git a/po/nn.po b/po/nn.po index f028e7e..ba42d49 100644 --- a/po/nn.po +++ b/po/nn.po @@ -2,19 +2,19 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR EMAIL@ADDRESS, YEAR. -# +# msgid msgstr Project-Id-Version: Thunar-volman\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-11-07 14:39+0100\n +POT-Creation-Date: 2012-01-23 17:36+\n PO-Revision-Date: 2012-01-07 01:16+0100\n Last-Translator: Eivind Ødegård ginge...@yahoo.no\n Language-Team: nn i18n...@lister.ping.uio.no\n -Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: \n X-Poedit-Language: Norwegian Nynorsk\n X-Poedit-Country: NORWAY\n @@ -33,25 +33,25 @@ msgid Print version information and exit msgstr Vis versjonsinformasjonen og avslutt #. setup application name -#: ../thunar-volman/main.c:96 +#: ../thunar-volman/main.c:93 msgid Thunar Volume Manager msgstr Thunar lagringshandsaming -#: ../thunar-volman/main.c:135 +#: ../thunar-volman/main.c:119 msgid All rights reserved. msgstr Alle rettar atterhaldne. -#: ../thunar-volman/main.c:136 +#: ../thunar-volman/main.c:120 #, c-format msgid Please report bugs to %s. msgstr Rapporter feil til %s. -#: ../thunar-volman/main.c:190 +#: ../thunar-volman/main.c:174 #, c-format msgid There is no device with the sysfs path \%s\ msgstr Det finst inga eining med sysfs-stigen «%s» -#: ../thunar-volman/main.c:202 +#: ../thunar-volman/main.c:186 #, c-format msgid Must specify the sysfs path of new devices with --device-added msgstr Må nemna sysfs-stigen til nye einingar med --device-added @@ -74,8 +74,7 @@ msgstr Vil du importera bilete, eller handsama musikken? #: ../thunar-volman/tvm-block-device.c:378 #: ../thunar-volman/tvm-block-device.c:425 #: ../thunar-volman/tvm-block-device.c:507 -#: ../thunar-volman/tvm-block-device.c:829 -#: ../thunar-volman/tvm-run.c:192 +#: ../thunar-volman/tvm-block-device.c:829 ../thunar-volman/tvm-run.c:192 #: ../thunar-volman/tvm-run.c:203 msgid Ig_nore msgstr O_versjå @@ -99,7 +98,9 @@ msgid A photo card has been detected msgstr Me fann eit lagringskort for foto #: ../thunar-volman/tvm-block-device.c:275 -msgid There are photos on the card. Would you like to add these photos to your album? +msgid +There are photos on the card. Would you like to add these photos to your +album? msgstr Det er bilete på kortet. Vil du leggja dei til albumet ditt? #. prompt the user to execute the file @@ -218,10 +219,6 @@ msgstr Ukjent blokkeiningstype msgid Device type not supported msgstr Støttar ikkje denne einingstypen -#: ../thunar-volman/tvm-input-device.c:74 -msgid input-keyboard -msgstr inngangstastatur - #: ../thunar-volman/tvm-input-device.c:75 msgid Keyboard detected msgstr Fann tastatur @@ -230,11 +227,6 @@ msgstr Fann tastatur msgid A keyboard was detected msgstr Fann eit tastatur -#: ../thunar-volman/tvm-input-device.c:86 -#: ../thunar-volman/tvm-input-device.c:100 -msgid input-tablet -msgstr inngangsbrett - #: ../thunar-volman/tvm-input-device.c:87 #: ../thunar-volman/tvm-input-device.c:101 msgid Tablet detected @@ -245,10 +237,6 @@ msgstr Fann brett msgid A graphics tablet was detected msgstr Fann eit grafikkbrett -#: ../thunar-volman/tvm-input-device.c:110 -msgid input-mouse -msgstr inngangsmus - #: ../thunar-volman/tvm-input-device.c:111 msgid Mouse detected msgstr Fann mus @@ -275,8 +263,7 @@ msgstr Tom DVD sett inn msgid You have inserted a blank DVD. msgstr Du har sett inn ein tom DVD. -#: ../thunar-volman/tvm-run.c:191 -#: ../thunar-volman/tvm-run.c:202 +#: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202 msgid What would you like to do? msgstr Kva vil du gjera? @@ -369,9 +356,8 @@ msgstr Rubyskript msgid Shell Scripts msgstr Skalskript -#. #. Storage -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:130 msgid Storage msgstr Lagring @@ -416,9 +402,8 @@ msgstr Kommando for _data-CDar: msgid Command for A_udio CDs: msgstr Kommando for _lyd-CDar: -#. #. Multimedia -#. +#. #: ../thunar-volman-settings/tvm-preferences-dialog.c:255 msgid Multimedia msgstr Multimedia @@ -462,9 +447,8 @@ msgstr Berbare musikkspelarar msgid Play _music files when connected msgstr Spel
[Xfce4-commits] www:master l10n: Updated Spanish (Castilian) (es) translation to 88%
Updating branch refs/heads/master to a7a8b4c28b93ae1a05de41d24dcaad5aa8187650 (commit) from bed3c42dcd558defa7d5e20c8b7ba59de4370982 (commit) commit a7a8b4c28b93ae1a05de41d24dcaad5aa8187650 Author: Daniel Durante danieldura...@ymail.com Date: Tue Jan 24 01:01:09 2012 +0100 l10n: Updated Spanish (Castilian) (es) translation to 88% New status: 593 messages complete with 80 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). lib/po/es.po | 23 --- 1 files changed, 8 insertions(+), 15 deletions(-) diff --git a/lib/po/es.po b/lib/po/es.po index 183331a..7b62e6f 100644 --- a/lib/po/es.po +++ b/lib/po/es.po @@ -8,7 +8,7 @@ msgstr Project-Id-Version: www.xfce.org\n Report-Msgid-Bugs-To: https://bugzilla.xfce.org\n; POT-Creation-Date: 2011-09-26 18:33+0200\n -PO-Revision-Date: 2012-01-20 21:59+0100\n +PO-Revision-Date: 2012-01-24 01:00+0100\n Last-Translator: Daniel Durante danieldura...@ymail.com\n Language-Team: Spanish\n MIME-Version: 1.0\n @@ -1299,9 +1299,8 @@ msgid The desktop icon support goes hand in hand with the new file manager a h msgstr El soporte de iconos en en escritorio va parejo con el nuevo gestor de ficheros a href=\http://thunar.xfce.org/\;Thunar/a que sustituye al anteriorbXffm/b. #: about/tour44.php:37 -#, fuzzy msgid bThunar/b was written from scratch to provide an easy to use, but still very lightweight file manager for Xfce. Its user interface was designed to look similar to the file chooser which was introduced with GTK+ 2.4, and other file managers such as bNautilus/b and bpcmanfm/b already picked up that idea as well. -msgstr bThunar/b fue escrito desde cero para proporcionar un fácil de utilizar, pero el manager de archivos sigue siendo muy ligero para Xfce. Su interfaz de usuario fue diseñado para ser similar a la selección de archivos que se introdujo con GTK + 2.4, y otros administradores de archivos como bNautilus/b y bpcmanfm/b ya recogió esa idea también. +msgstr bThunar/b fue escrito desde cero para proporcionar un uso fácil, pero todavía el administrador de ficheros es muy liviano para Xfce. Su interfaz de usuario fue diseñado para ser similar al selector de archivos que se introdujo con GTK + 2.4. Otros administradores de archivos como bNautilus/b y bpcmanfm/b también participan de esta idea. #: about/tour44.php:41 msgid bThunar/b supports all the file management functionality which users will expect, and also several advanced features. For example, a so-called iBulk Renamer/i is included which allows users to rename multiple files at once using a certain criterion. @@ -1382,9 +1381,8 @@ msgid The new time management application bOrage/b replaces the bXfcalend msgstr La nueva aplicación de control de tiempo bOrage/b reemplaza a bXfcalendar/b, que se introdujo con Xfce 4.2.0. bOrage/b dispone de varias funciones para administrar eficientemente su tiempo. #: about/tour44.php:140 -#, fuzzy msgid While bOrage/b is very lightweight and easy to use, it supports all the important features found in larger calendar applications like bOutlook/b or bEvolution/b. While bXfcalendar/b used the custom ttdbh/tt format in the past to store your settings, bOrage/b is based on ttical/tt and therefore compatible with other calendar applications. -msgstr Mientras bOrage/b es muy ligero y fácil de usar, que soporta todas las características importantes que se encuentran en aplicaciones de calendario más grandes, como bOutlook/b o bEvolution./b Mientras bXfcalendar/b utiliza el formato ttDAP/tt costumbre en el pasado para guardar la configuración, bOrage/b se basa en ttiCal/tt y por lo tanto compatible con otras aplicaciones de calendario. +msgstr Mientras bOrage/b es muy ligero y fácil de usar, soporta todas las características importantes que se encuentran en aplicaciones de calendario de más envergadura como bOutlook/b o bEvolution./b Mientras bXfcalendar/b utiliza el formato ttDAP/tt usado anteriormente para guardar la configuración, bOrage/b se basa en ttiCal/tt y por lo tanto compatible con otras aplicaciones de calendario. #: about/tour44.php:144 msgid Terminal Emulator @@ -1452,9 +1450,8 @@ msgid Feedback msgstr Feedback #: about/tour44.php:211 -#, fuzzy msgid Please post comments on this article in my a href=\http://xfce-diary.blogspot.com/2007/01/visual-tour-of-xfce-440.html\;blog/a and use the a href=\/community/lists\xfce/a mailinglist if you have questions about Xfce 4.4.0 or trouble with the installation. -msgstr Por favor, enviar comentarios sobre este artículo en mi a href=\http://xfce-diary.blogspot.com/2007/01/visual-tour-of-xfce-440.html\;blog/a y utilizar el a href=\/community/lists\xfce/a lista de correo si tiene alguna pregunta acerca de Xfce 4.4.0 o problemas con la instalación. +msgstr Por favor, envie los comentarios sobre este artículo a mi a
[Xfce4-commits] thunar:jannis/new-shortcuts-pane Minor adjustments to use the right icon, drop thunar_file_get_icon().
Updating branch refs/heads/jannis/new-shortcuts-pane
to 0941a545ebea71dd0b6c6272bd188760b5b87827 (commit)
from d82316d6863147902a61d65e3bfe7537f60055bb (commit)
commit 0941a545ebea71dd0b6c6272bd188760b5b87827
Author: Jannis Pohlmann jannis.pohlm...@codethink.co.uk
Date: Tue Dec 27 12:44:24 2011 +0100
Minor adjustments to use the right icon, drop thunar_file_get_icon().
thunar/thunar-file.c | 22 --
thunar/thunar-file.h |1 -
thunar/thunar-shortcut-group.c |2 +-
thunar/thunar-shortcut.c | 32
4 files changed, 25 insertions(+), 32 deletions(-)
diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
index 4441ece..c321ec5 100644
--- a/thunar/thunar-file.c
+++ b/thunar/thunar-file.c
@@ -2980,28 +2980,6 @@ thunar_file_get_custom_icon (const ThunarFile *file)
/**
- * thunar_file_get_icon:
- * @file : a #ThunarFile instance.
- *
- * Returns the icon for @file if any, else %NULL is returned.
- *
- * Return value: the icon for @file or %NULL, the GIcon is owner
- * by the file, so do not unref it.
- **/
-GIcon *
-thunar_file_get_icon (const ThunarFile *file)
-{
- _thunar_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
-
- if (file-info == NULL)
-return NULL;
-
- return g_file_info_get_icon (file-info);
-}
-
-
-
-/**
* thunar_file_get_preview_icon:
* @file : a #ThunarFile instance.
*
diff --git a/thunar/thunar-file.h b/thunar/thunar-file.h
index ff424ce..ea94a95 100644
--- a/thunar/thunar-file.h
+++ b/thunar/thunar-file.h
@@ -242,7 +242,6 @@ const gchar *thunar_file_get_thumbnail_path(const
ThunarFile*fil
gboolean thunar_file_is_thumbnail (const ThunarFile
*file);
void thunar_file_set_thumb_state (ThunarFile
*file,
ThunarFileThumbState
state);
-GIcon*thunar_file_get_icon (const ThunarFile
*file);
GIcon*thunar_file_get_preview_icon (const ThunarFile
*file);
gchar*thunar_file_get_icon_name(const ThunarFile
*file,
ThunarFileIconState
icon_state,
diff --git a/thunar/thunar-shortcut-group.c b/thunar/thunar-shortcut-group.c
index 7e58847..c00d15e 100644
--- a/thunar/thunar-shortcut-group.c
+++ b/thunar/thunar-shortcut-group.c
@@ -37,7 +37,7 @@
#define THUNAR_SHORTCUT_GROUP_FLASH_TIMES 3
#define THUNAR_SHORTCUT_GROUP_MARKUP \
- span size='medium' weight='bold' color='#353535'%s/span
+ span size='medium' weight='bold'%s/span
diff --git a/thunar/thunar-shortcut.c b/thunar/thunar-shortcut.c
index 8beca47..5417b36 100644
--- a/thunar/thunar-shortcut.c
+++ b/thunar/thunar-shortcut.c
@@ -1316,11 +1316,13 @@ thunar_shortcut_matches_types (ThunarShortcut
*shortcut,
static void
thunar_shortcut_update (ThunarShortcut *shortcut)
{
- const gchar *display_name;
- GIcon *icon;
- gchar *base_name;
- gchar *name;
- gchar *uri;
+ GtkIconTheme *icon_theme;
+ const gchar *display_name;
+ GIcon*icon = NULL;
+ gchar*base_name;
+ gchar*icon_name;
+ gchar*name;
+ gchar*uri;
_thunar_return_if_fail (THUNAR_IS_SHORTCUT (shortcut));
@@ -1339,13 +1341,23 @@ thunar_shortcut_update (ThunarShortcut *shortcut)
thunar_shortcut_set_name (shortcut, display_name);
/* update the icon of the shortcut */
- icon = thunar_file_get_icon (shortcut-file);
+ icon_theme = gtk_icon_theme_get_default ();
+ icon_name = thunar_file_get_icon_name (shortcut-file,
+
THUNAR_FILE_ICON_STATE_DEFAULT,
+ icon_theme);
+ g_debug (%30s has icon name %s and custom icon %p,
+ thunar_shortcut_get_display_name (shortcut),
+ icon_name,
+ shortcut-custom_icon);
+ if (icon_name != NULL)
+icon = g_themed_icon_new (icon_name);
thunar_shortcut_set_icon (shortcut, icon);
+ g_object_unref (icon);
+ g_free (icon_name);
if (thunar_file_get_kind (shortcut-file) == G_FILE_TYPE_MOUNTABLE)
{
- g_debug (%s is mountable,
- display_name);
+ g_debug (%s is mountable, display_name);
}
}
else if (shortcut-location != NULL)
@@ -2112,6 +2124,10 @@ thunar_shortcut_set_icon (ThunarShortcut *shortcut,
_thunar_return_if_fail (THUNAR_IS_SHORTCUT (shortcut));
_thunar_return_if_fail (icon == NULL || G_IS_ICON (icon));
+ g_debug (%30s set icon to %s,
+ thunar_shortcut_get_display_name (shortcut),
+ icon ? g_icon_to_string (icon) : NULL);
+
if (icon == NULL !shortcut-constructed)
return;
[Xfce4-commits] thunar:jannis/new-shortcuts-pane Move DND to ThunarShortcutGroup, start with creating shortcuts via DND.
Updating branch refs/heads/jannis/new-shortcuts-pane
to 8c9570cf8750b06e547e197d39f1608e7724f66f (commit)
from 0941a545ebea71dd0b6c6272bd188760b5b87827 (commit)
commit 8c9570cf8750b06e547e197d39f1608e7724f66f
Author: Jannis Pohlmann jan...@xfce.org
Date: Tue Jan 24 01:46:53 2012 +
Move DND to ThunarShortcutGroup, start with creating shortcuts via DND.
The empty spot indicator for text/uri-list should really just be a thin
line, not a huge empty block.
TODO | 14 ++
thunar/thunar-shortcut-group.c | 204 +++--
thunar/thunar-shortcut.c | 324 ++--
thunar/thunar-shortcut.h |8 +-
4 files changed, 256 insertions(+), 294 deletions(-)
diff --git a/TODO b/TODO
index 7547d2a..c5f677e 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,17 @@
+Branch jannis/new-shortcuts-pane
+
+
+ - Reordering shortcuts may not change the order or position of immutable
+ shortcuts. That still needs to be implemented in ThunarShortcutGroup.
+
+ - Dragging a URI to the new shortcuts pane must either cause an empty
+ spot indicator to show up or must indicate possible drop actions on
+ the current shortcut. The latter already works, the empty spot
+ indicator still needs to be implemented.
+
+ -
+
+
Important for Thunar 1.2
diff --git a/thunar/thunar-shortcut-group.c b/thunar/thunar-shortcut-group.c
index c00d15e..28b0230 100644
--- a/thunar/thunar-shortcut-group.c
+++ b/thunar/thunar-shortcut-group.c
@@ -1,6 +1,6 @@
/* vi:set et ai sw=2 sts=2 ts=2: */
/*-
- * Copyright (c) 2011 Jannis Pohlmann jan...@xfce.org
+ * Copyright (c) 2011-2012 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
@@ -27,9 +27,11 @@
#include gtk/gtk.h
+#include thunar/thunar-dnd.h
#include thunar/thunar-enum-types.h
#include thunar/thunar-private.h
#include thunar/thunar-shortcut-group.h
+#include thunar/thunar-shortcut.h
@@ -95,6 +97,8 @@ static void thunar_shortcut_group_expand_style_set
(ThunarShortcutGroup
GtkWidget
*expander);
static void thunar_shortcut_group_apply_indentation
(ThunarShortcutGroup*group,
ThunarShortcut
*shortcut);
+static void thunar_shortcut_group_drag_highlight
(ThunarShortcutGroup*group,
+ThunarShortcut
*shortcut);
static gboolean thunar_shortcut_group_find_child_by_coords
(ThunarShortcutGroup*group,
gint
x,
gint
y,
@@ -128,6 +132,7 @@ struct _ThunarShortcutGroup
guint drop_data_ready : 1;
guint drop_occurred : 1;
+ GList *drop_file_list;
GtkWidget *drag_shortcut;
GdkPixmap *drag_snapshot;
@@ -440,11 +445,19 @@ thunar_shortcut_group_drag_data_received (GtkWidget
*widget,
GdkDragContext *context,
gint x,
gint y,
- GtkSelectionData *data,
+ GtkSelectionData *selection_data,
guint info,
guint timestamp)
{
ThunarShortcutGroup *group = THUNAR_SHORTCUT_GROUP (widget);
+ ThunarShortcut *shortcut;
+ GtkAllocationallocation;
+ ThunarFile *file;
+ GdkDragActionaction = 0;
+ GdkDragActionactions = 0;
+ GtkWidget *child = NULL;
+ gboolean success = FALSE;
+ gint child_index;
_thunar_return_if_fail (THUNAR_IS_SHORTCUT_GROUP (widget));
_thunar_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
@@ -454,11 +467,82 @@ thunar_shortcut_group_drag_data_received (GtkWidget
*widget,
/* only read data if we don't have it yet */
if (!group-drop_data_ready)
{
+ /* extract the URI list from the selection data (if valid) */
+ if (info == THUNAR_DND_TARGET_TEXT_URI_LIST
+ selection_data-format == 8
+ selection_data-length 0)
+{
+ group-drop_file_list =
+thunar_g_file_list_new_from_string ((const gchar *)
selection_data-data);
+}
+
+ /* reset the state */
+ group-drop_data_ready = TRUE;
}
if (group-drop_occurred)
{
+ /* reset
[Xfce4-commits] thunar-volman:master l10n: Updated Kazakh (kk) translation to 100%
Updating branch refs/heads/master to dd00e805bccf8536c6ea994289299e74b10d4465 (commit) from 2e4237d8634106eec2746db4a2e6591f0e617b0b (commit) commit dd00e805bccf8536c6ea994289299e74b10d4465 Author: Bauzhan Muftakhidinov baurthefi...@gmail.com Date: Tue Jan 24 08:41:41 2012 +0100 l10n: Updated Kazakh (kk) translation to 100% New status: 113 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/kk.po | 63 + 1 files changed, 34 insertions(+), 29 deletions(-) diff --git a/po/kk.po b/po/kk.po index 9180a2b..9eaf125 100644 --- a/po/kk.po +++ b/po/kk.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: trunk\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-11-07 14:39+0100\n +POT-Creation-Date: 2012-01-24 05:12+\n PO-Revision-Date: 2010-10-19 09:08+0600\n Last-Translator: Baurzhan Muftakhidinov baurthefi...@gmail.com\n Language-Team: Kazakh kk...@googlegroups.com\n @@ -32,25 +32,25 @@ msgid Print version information and exit msgstr Нұсқа ақпаратын шығару мен шығу #. setup application name -#: ../thunar-volman/main.c:96 +#: ../thunar-volman/main.c:93 msgid Thunar Volume Manager msgstr Thunar тасушылар басқарушысы -#: ../thunar-volman/main.c:135 +#: ../thunar-volman/main.c:119 msgid All rights reserved. msgstr Барлық құқықтары қорғалған. -#: ../thunar-volman/main.c:136 +#: ../thunar-volman/main.c:120 #, c-format msgid Please report bugs to %s. msgstr Ақаулықтар жөнінде хабарласыңыз: %s. -#: ../thunar-volman/main.c:190 +#: ../thunar-volman/main.c:174 #, c-format msgid There is no device with the sysfs path \%s\ msgstr sysfs жолы \%s\ болатын құрылғы жоқ -#: ../thunar-volman/main.c:202 +#: ../thunar-volman/main.c:186 #, c-format msgid Must specify the sysfs path of new devices with --device-added msgstr Жаңа құрылғылар үшін syfs жолын --device-added көмегімен көрсету керек @@ -97,8 +97,12 @@ msgid A photo card has been detected msgstr Фото картасы табылды #: ../thunar-volman/tvm-block-device.c:275 -msgid There are photos on the card. Would you like to add these photos to your album? -msgstr Картадан фотосуреттер табылды. Осы суреттерді альбомыңызға қосуды қалайсыз ба? +msgid +There are photos on the card. Would you like to add these photos to your +album? +msgstr +Картадан фотосуреттер табылды. Осы суреттерді альбомыңызға қосуды қалайсыз +ба? #. prompt the user to execute the file #. prompt the user to execute this file @@ -216,10 +220,6 @@ msgstr Белгісіз блоктық құрылғы түрі msgid Device type not supported msgstr Құрылғы түріне қолдау жоқ -#: ../thunar-volman/tvm-input-device.c:74 -msgid input-keyboard -msgstr input-keyboard - #: ../thunar-volman/tvm-input-device.c:75 msgid Keyboard detected msgstr Пернетақта табылды @@ -228,11 +228,6 @@ msgstr Пернетақта табылды msgid A keyboard was detected msgstr Пернетақта табылды -#: ../thunar-volman/tvm-input-device.c:86 -#: ../thunar-volman/tvm-input-device.c:100 -msgid input-tablet -msgstr input-tablet - #: ../thunar-volman/tvm-input-device.c:87 #: ../thunar-volman/tvm-input-device.c:101 msgid Tablet detected @@ -243,10 +238,6 @@ msgstr Планшет табылды msgid A graphics tablet was detected msgstr Графикалық планшет табылды -#: ../thunar-volman/tvm-input-device.c:110 -msgid input-mouse -msgstr input-mouse - #: ../thunar-volman/tvm-input-device.c:111 msgid Mouse detected msgstr Тышқан табылды @@ -515,16 +506,16 @@ msgid Keyboards msgstr Пернетақталар #: ../thunar-volman-settings/tvm-preferences-dialog.c:593 -msgid Automatically run a program when an USB _keyboard is connected -msgstr USB _пернетақта қосылғанда бағдарламаны автожөнелту +msgid Automatically run a program when a USB _keyboard is connected +msgstr USB _пернетақта қосылғанда, бағдарламаны автожөнелту #: ../thunar-volman-settings/tvm-preferences-dialog.c:615 msgid Mice msgstr Тышқандар #: ../thunar-volman-settings/tvm-preferences-dialog.c:632 -msgid Automatically run a program when an USB _mouse is connected -msgstr USB _тышқан қосылғанда бағдарламаны автожөнелту +msgid Automatically run a program when a USB _mouse is connected +msgstr USB _тышқан қосылғанда, бағдарламаны автожөнелту #: ../thunar-volman-settings/tvm-preferences-dialog.c:654 msgid Tablet @@ -542,6 +533,15 @@ msgstr Кома_нда: msgid Failed to open the documentation browser msgstr Құжаттама шолушысын ашу сәтсіз аяқталды +#~ msgid input-keyboard +#~ msgstr input-keyboard + +#~ msgid input-tablet +#~ msgstr input-tablet + +#~ msgid input-mouse +#~ msgstr input-mouse + #~ msgid Failed to open display #~ msgstr Дисплейді ашу сәтсіз аяқталды @@ -557,8 +557,11 @@ msgstr Құжаттама шолушысын ашу сәтсіз аяқталд #~ msgid Encrypted volume #~ msgstr Шифрленген диск бөлімі -#~ msgid span weight=\bold\ size=\larger\Mounting encrypted volume.../span -#~ msgstr span weight=\bold\ size=\larger\Шифрленген диск
