date:20121220

[Xfce4-commits] libxfce4ui:jeromeg/keyboard-shortcuts Get rid of FinallyGetModifiersForKeycode.

2012-12-20 Thread Jérôme Guelfucci

Updating branch refs/heads/jeromeg/keyboard-shortcuts
 to f48c83b67cb46f7b64d4d5cd3bb474e7ee4e9b8b (commit)
   from 8f1bb1455886ee653979fddd3d2aaedf43a0ee2c (commit)

commit f48c83b67cb46f7b64d4d5cd3bb474e7ee4e9b8b
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Thu Dec 20 10:32:39 2012 +0100

Get rid of FinallyGetModifiersForKeycode.

It simply does not work as expected and the logic seems boggus.

 libxfce4kbd-private/xfce-shortcuts-grabber.c |  108 +++---
 1 files changed, 12 insertions(+), 96 deletions(-)

diff --git a/libxfce4kbd-private/xfce-shortcuts-grabber.c 
b/libxfce4kbd-private/xfce-shortcuts-grabber.c
index 31585b5..0d816a2 100644
--- a/libxfce4kbd-private/xfce-shortcuts-grabber.c
+++ b/libxfce4kbd-private/xfce-shortcuts-grabber.c
@@ -213,85 +213,21 @@ xfce_shortcuts_grabber_ungrab_all (XfceShortcutsGrabber 
*grabber)
 
 
 
-/* Return the modifier mask that needs to be pressed to produce key in the
- * given group (keyboard layout) and level (shift level).
- *
- * Taken from libkeybinder
- * Copyright (C) 2010 Ulrik Sverdrup ulrik.sverd...@gmail.com
- */
-static GdkModifierType
-FinallyGetModifiersForKeycode (XkbDescPtr xkb,
-   KeyCodekey,
-   uint   group,
-   uint   level)
-{
-  XkbKeyTypeRec *type;
-  intnKeyGroups;
-  inteffectiveGroup;
-  intk;
-
-  nKeyGroups = XkbKeyNumGroups (xkb, key);
-
-  if ((!XkbKeycodeInRange (xkb, key)) || (nKeyGroups == 0))
-return MODIFIERS_ERROR;
-
-  /* Taken from GDK's MyEnhancedXkbTranslateKeyCode */
-  /* find the offset of the effective group */
-  effectiveGroup = group;
-
-  if (effectiveGroup = nKeyGroups)
-{
-  unsigned groupInfo = XkbKeyGroupInfo (xkb,key);
-
-  switch (XkbOutOfRangeGroupAction(groupInfo))
-{
-  default:
-effectiveGroup %= nKeyGroups;
-break;
-  case XkbClampIntoRange:
-effectiveGroup = nKeyGroups-1;
-break;
-  case XkbRedirectIntoRange:
-effectiveGroup = XkbOutOfRangeGroupNumber (groupInfo);
-if (effectiveGroup = nKeyGroups)
-  effectiveGroup = 0;
-break;
-}
-}
-
-  type = XkbKeyKeyType (xkb, key, effectiveGroup);
-
-  for (k = 0; k  type-map_count; k++)
-{
-  if (type-map[k].active  type-map[k].level == level)
-{
-  if (type-preserve)
-return (type-map[k].mods.mask  ~type-preserve[k].mask);
-  else
-return type-map[k].mods.mask;
-}
-}
-
-  return MODIFIERS_NONE;
-}
-
-
-
 static void
 xfce_shortcuts_grabber_grab (XfceShortcutsGrabber *grabber,
  XfceKey  *key,
  gboolean  grab)
 {
-  GdkKeymapKey *keys;
-  XkbDescPtrxmap;
-  GdkDisplay   *display;
-  GdkKeymap*keymap;
-  gchar*shortcut_name;
-  guint modifiers;
-  guint k;
-  gint  i, j;
-  gint  n_keys;
-  gint  screens;
+  GdkModifierType  numlock_modifier;
+  GdkKeymapKey*keys;
+  GdkDisplay  *display;
+  GdkKeymap   *keymap;
+  gchar   *shortcut_name;
+  guintmodifiers;
+  guintk;
+  gint i, j;
+  gint n_keys;
+  gint screens;
 
   g_return_if_fail (XFCE_IS_SHORTCUTS_GRABBER (grabber));
   g_return_if_fail (key != NULL);
@@ -324,22 +260,16 @@ xfce_shortcuts_grabber_grab (XfceShortcutsGrabber 
*grabber,
   return;
 }
 
-  xmap = XkbGetMap (GDK_DISPLAY_XDISPLAY (display),
-XkbAllClientInfoMask,
-XkbUseCoreKbd);
-
   /* Get all keys generating keyval */
   if (!gdk_keymap_get_entries_for_keyval (keymap,key-keyval,
   keys, n_keys))
 {
-  XkbFreeClientMap (xmap, 0, TRUE);
   TRACE (Got no keys for keyval);
   return;
 }
 
   if (n_keys == 0)
 {
-  XkbFreeClientMap (xmap, 0, TRUE);
   g_free (keys);
 
   TRACE (Got 0 keys for keyval);
@@ -350,21 +280,8 @@ xfce_shortcuts_grabber_grab (XfceShortcutsGrabber *grabber,
 {
   /* Grab all hardware keys generating keyval */
 
-  GdkModifierType add_modifiers;
-
   TRACE (Keycode: %d, keys[i].keycode);
 
-  add_modifiers = FinallyGetModifiersForKeycode (xmap,
- keys[i].keycode,
- keys[i].group,
- keys[i].level);
-
-  if (add_modifiers == MODIFIERS_ERROR)
-{
-  TRACE (Error when getting modifiers for keycode);
-  continue;
-}
-
   for (j = 0; j  screens; j++)
 {
   /* Do the grab on all screens */
@@ -398,7 +315,7 @@ xfce_shortcuts_grabber_grab (XfceShortcutsGrabber *grabber,

[Xfce4-commits] libxfce4ui:jeromeg/keyboard-shortcuts Fix keyboard shortcuts with keypad (bug #4178).

2012-12-20 Thread Jérôme Guelfucci

Updating branch refs/heads/jeromeg/keyboard-shortcuts
 to 4c2a8a1dd003091288f4b86521ae8f3ff7359370 (commit)
   from f48c83b67cb46f7b64d4d5cd3bb474e7ee4e9b8b (commit)

commit 4c2a8a1dd003091288f4b86521ae8f3ff7359370
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Thu Dec 20 10:34:23 2012 +0100

Fix keyboard shortcuts with keypad (bug #4178).

To do so, we also grab all shortcuts with the numlock modifier.

 libxfce4kbd-private/xfce-shortcuts-grabber.c |   11 +++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/libxfce4kbd-private/xfce-shortcuts-grabber.c 
b/libxfce4kbd-private/xfce-shortcuts-grabber.c
index 0d816a2..dcfc235 100644
--- a/libxfce4kbd-private/xfce-shortcuts-grabber.c
+++ b/libxfce4kbd-private/xfce-shortcuts-grabber.c
@@ -276,6 +276,10 @@ xfce_shortcuts_grabber_grab (XfceShortcutsGrabber *grabber,
   return;
 }
 
+  numlock_modifier =
+XkbKeysymToModifiers (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+ GDK_KEY_Num_Lock);
+
   for (i = 0; i  n_keys; i ++)
 {
   /* Grab all hardware keys generating keyval */
@@ -291,12 +295,19 @@ xfce_shortcuts_grabber_grab (XfceShortcutsGrabber 
*grabber,
   guint mod_masks [] = {
 0,
 GDK_MOD2_MASK,
+numlock_modifier | GDK_MOD2_MASK,
 GDK_LOCK_MASK,
+numlock_modifier | GDK_LOCK_MASK,
 GDK_MOD5_MASK,
+numlock_modifier | GDK_MOD5_MASK,
 GDK_MOD2_MASK | GDK_LOCK_MASK,
+numlock_modifier | GDK_MOD2_MASK | GDK_LOCK_MASK,
 GDK_MOD2_MASK | GDK_MOD5_MASK,
+numlock_modifier | GDK_MOD2_MASK | GDK_MOD5_MASK,
 GDK_LOCK_MASK | GDK_MOD5_MASK,
+numlock_modifier | GDK_LOCK_MASK | GDK_MOD5_MASK,
 GDK_MOD2_MASK | GDK_LOCK_MASK | GDK_MOD5_MASK,
+numlock_modifier | GDK_MOD2_MASK | GDK_LOCK_MASK | GDK_MOD5_MASK,
   };
 
 #if GTK_CHECK_VERSION (3, 0, 0)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-power-manager:master l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100%

2012-12-20 Thread Transifex

Updating branch refs/heads/master
 to 5be022289c54f4b3956b5aa9a922f088d33b7d5b (commit)
   from e126935263151f1488496a4753dfa0edc385e729 (commit)

commit 5be022289c54f4b3956b5aa9a922f088d33b7d5b
Author: Walter cheuk wwych...@gmail.com
Date:   Thu Dec 20 10:38:14 2012 +0100

l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100%

New status: 213 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/zh_TW.po |   24 
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/po/zh_TW.po b/po/zh_TW.po
index dd81203..64baf7a 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid 
 msgstr 
 Project-Id-Version: xfce4-power-manager master\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-11-25 06:06+\n
+POT-Creation-Date: 2012-12-20 05:18+\n
 PO-Revision-Date: 2012-04-26 23:54+0800\n
 Last-Translator: Cheng-Chia Tseng pswo10...@gmail.com\n
 Language-Team: chinese-l10n chinese-l...@googlegroups.com\n
@@ -83,7 +83,7 @@ msgstr 電力管理設定值
 
 #: ../data/interfaces/xfpm-settings.ui.h:15
 msgid Prefer power savings over performance
-msgstr 偏好保存電量更勝效能
+msgstr 偏好省電更勝效能
 
 #: ../data/interfaces/xfpm-settings.ui.h:16
 msgid Put display to sleep when computer is inactive for:
@@ -148,7 +148,7 @@ msgstr 當關閉筆電上蓋時：
 
 #: ../data/interfaces/xfpm-settings.ui.h:30
 msgid When power button is pressed:
-msgstr 當按壓電源按鈕時：
+msgstr 按下電源按鈕時：
 
 #: ../data/interfaces/xfpm-settings.ui.h:31
 msgid When sleep button is pressed:
@@ -284,7 +284,7 @@ msgstr 擴展功能
 
 #: ../settings/xfpm-settings.c:1662
 msgid Check your power manager installation
-msgstr 檢查您的電力管理員是否安裝正常
+msgstr 檢查您的電源管理員是否安裝正常
 
 #: ../settings/xfpm-settings-main.c:78
 msgid Settings manager socket
@@ -302,7 +302,7 @@ msgstr 輸入 '%s --help' 以瞭解用法。
 
 #: ../settings/xfpm-settings-main.c:123
 msgid Failed to load power manager configuration, using defaults
-msgstr 無法載入電力管理員組態，改為使用預設值
+msgstr 無法載入電源管理員組態，改為使用預設值
 
 #: ../settings/xfpm-settings-main.c:148
 msgid Unable to connect to Xfce Power Manager
@@ -311,7 +311,7 @@ msgstr 無法連接至 Xfce 電力管理員
 #: ../settings/xfpm-settings-main.c:190 ../src/xfpm-main.c:329
 #, c-format
 msgid Xfce power manager is not running
-msgstr Xfce 電力管理員未有執行
+msgstr Xfce 電源管理員未有執行
 
 #: ../settings/xfpm-settings-main.c:195
 msgid Run
@@ -358,11 +358,11 @@ msgstr 退出
 
 #: ../src/xfpm-power.c:427
 msgid All running instances of the power manager will exit
-msgstr 所有執行中的電力管理員實體將離開
+msgstr 所有執行中的電源管理員實體將結束
 
 #: ../src/xfpm-power.c:429
 msgid Quit the power manager?
-msgstr 要退出電力管理員嗎？
+msgstr 要結束電源管理員嗎？
 
 #. Power information
 #: ../src/xfpm-power.c:534 ../src/xfpm-power-info.c:818
@@ -815,7 +815,7 @@ msgstr 傾印所有資訊
 
 #: ../src/xfpm-main.c:267
 msgid Restart the running instance of Xfce power manager
-msgstr 重新啟動 Xfce 電力管理員執行中的實體
+msgstr 重新啟動 Xfce 電源管理員執行中的實體
 
 #: ../src/xfpm-main.c:268
 msgid Show the configuration dialog
@@ -823,7 +823,7 @@ msgstr 顯示組態對話窗
 
 #: ../src/xfpm-main.c:269
 msgid Quit any running xfce power manager
-msgstr 退出任何執行中的 Xfce 電力管理員
+msgstr 結束任何執行中的 Xfce 電源管理員
 
 #: ../src/xfpm-main.c:270 ../src/xfpm-power-info.c:933
 msgid Version information
@@ -835,12 +835,12 @@ msgstr 無法取得訊息匯流排工作階段的連線
 
 #: ../src/xfpm-main.c:414
 msgid Another power manager is already running
-msgstr 另一個電力管理員正在執行
+msgstr 另一個電源管理員正在執行
 
 #: ../src/xfpm-main.c:420
 #, c-format
 msgid Xfce power manager is already running
-msgstr Xfce 電力管理員正在執行
+msgstr Xfce 電源管理員正在執行
 
 #: ../src/xfpm-inhibit.c:331
 #, c-format
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-power-manager:master l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100%

2012-12-20 Thread Transifex

Updating branch refs/heads/master
 to 4ae668fabd2233c080d9f25459b18d4fc2d6486c (commit)
   from 5be022289c54f4b3956b5aa9a922f088d33b7d5b (commit)

commit 4ae668fabd2233c080d9f25459b18d4fc2d6486c
Author: Walter cheuk wwych...@gmail.com
Date:   Thu Dec 20 10:53:32 2012 +0100

l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100%

New status: 213 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/zh_TW.po |   40 
 1 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 64baf7a..d957d18 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -75,7 +75,7 @@ msgstr 螢幕電力管理控制
 #: ../settings/xfpm-settings.c:1203 ../settings/xfpm-settings.c:1260
 #: ../settings/xfpm-settings.c:1312
 msgid Nothing
-msgstr 無
+msgstr 無動作
 
 #: ../data/interfaces/xfpm-settings.ui.h:14
 msgid Power manager settings
@@ -140,11 +140,11 @@ msgstr 當電池電量危急時：
 
 #: ../data/interfaces/xfpm-settings.ui.h:28
 msgid When hibernate button is pressed:
-msgstr 當按壓休眠按鈕時：
+msgstr 按下休眠按鈕時：
 
 #: ../data/interfaces/xfpm-settings.ui.h:29
 msgid When laptop lid is closed:
-msgstr 當關閉筆電上蓋時：
+msgstr 關閉筆電上蓋時：
 
 #: ../data/interfaces/xfpm-settings.ui.h:30
 msgid When power button is pressed:
@@ -152,12 +152,12 @@ msgstr 按下電源按鈕時：
 
 #: ../data/interfaces/xfpm-settings.ui.h:31
 msgid When sleep button is pressed:
-msgstr 當按壓睡眠按鈕時：
+msgstr 按下睡眠按鈕時：
 
 #: ../data/interfaces/xfpm-settings.ui.h:32
 #: ../settings/xfpm-settings-main.c:121 ../src/xfpm-main.c:413
 msgid Xfce Power Manager
-msgstr Xfce 電力管理員
+msgstr Xfce 電源管理員
 
 #: ../settings/xfpm-settings.c:567 ../settings/xfpm-settings.c:582
 #: ../settings/xfpm-settings.c:609
@@ -224,7 +224,7 @@ msgstr 不許關閉硬碟轉動
 
 #: ../settings/xfpm-settings.c:1150
 msgid Always show icon
-msgstr 總是顯示圖示
+msgstr 一定顯示圖示
 
 #: ../settings/xfpm-settings.c:1153
 msgid When battery is present
@@ -236,7 +236,7 @@ msgstr 當電池充電或放電時
 
 #: ../settings/xfpm-settings.c:1159
 msgid Never show icon
-msgstr 永不顯示圖示
+msgstr 不會顯示圖示
 
 #: ../settings/xfpm-settings.c:1185
 msgid 
@@ -306,7 +306,7 @@ msgstr 無法載入電源管理員組態，改為使用預設值
 
 #: ../settings/xfpm-settings-main.c:148
 msgid Unable to connect to Xfce Power Manager
-msgstr 無法連接至 Xfce 電力管理員
+msgstr 無法連接至 Xfce 電源管理員
 
 #: ../settings/xfpm-settings-main.c:190 ../src/xfpm-main.c:329
 #, c-format
@@ -319,18 +319,18 @@ msgstr 執行
 
 #: ../settings/xfpm-settings-main.c:196
 msgid Xfce4 Power Manager is not running, do you want to launch it now?
-msgstr Xfce4 電力管理員未有執行，想要現在啟動嗎？
+msgstr Xfce4 電源管理員未有執行，想要現在啟動嗎？
 
 #: ../settings/xfce4-power-manager-settings.desktop.in.h:1
 #: ../src/xfpm-power.c:307 ../src/xfpm-power.c:595 ../src/xfpm-power.c:730
 #: ../src/xfpm-power.c:766 ../src/xfpm-power.c:935 ../src/xfpm-power.c:959
 #: ../src/xfpm-battery.c:351 ../src/xfce4-power-manager.desktop.in.h:1
 msgid Power Manager
-msgstr 電力管理員
+msgstr 電源管理員
 
 #: ../settings/xfce4-power-manager-settings.desktop.in.h:2
 msgid Settings for the Xfce Power Manager
-msgstr Xfce 電力管理員設定值
+msgstr Xfce 電源管理員設定值
 
 #: ../common/xfpm-common.c:155
 msgid translator-credits
@@ -354,7 +354,7 @@ msgstr 確定要讓系統休眠嗎？
 
 #: ../src/xfpm-power.c:426
 msgid Quit
-msgstr 退出
+msgstr 結束
 
 #: ../src/xfpm-power.c:427
 msgid All running instances of the power manager will exit
@@ -439,11 +439,11 @@ msgstr 不支援暫停
 
 #: ../src/xfpm-power-common.c:122 ../src/xfpm-power-common.c:141
 msgid Battery
-msgstr 電源
+msgstr 電池
 
 #: ../src/xfpm-power-common.c:124 ../src/xfpm-battery.c:832
 msgid UPS
-msgstr UPS
+msgstr 不斷電系統 UPS
 
 #: ../src/xfpm-power-common.c:126
 msgid Line power
@@ -459,7 +459,7 @@ msgstr 鍵盤
 
 #: ../src/xfpm-power-common.c:134
 msgid PDA
-msgstr PDA
+msgstr 電子手帳 PDA
 
 #: ../src/xfpm-power-common.c:136
 msgid Phone
@@ -468,7 +468,7 @@ msgstr 手機
 #: ../src/xfpm-power-common.c:138 ../src/xfpm-power-common.c:153
 #: ../src/xfpm-power-common.c:168 ../src/xfpm-battery.c:850
 msgid Unknown
-msgstr 未知
+msgstr 不詳
 
 #: ../src/xfpm-power-common.c:155
 msgid Lithium ion
@@ -496,7 +496,7 @@ msgstr 鎳氫
 
 #: ../src/xfpm-battery.c:171
 msgid Unknown time
-msgstr 未知時間
+msgstr 時間不詳
 
 #: ../src/xfpm-battery.c:177
 #, c-format
@@ -528,7 +528,7 @@ msgstr[1] 小時
 #: ../src/xfpm-battery.c:196
 msgid minute
 msgid_plural minutes
-msgstr[0] 小時
+msgstr[0] 分鐘
 msgstr[1] 分鐘
 
 #: ../src/xfpm-battery.c:211 ../src/xfpm-battery.c:262
@@ -684,7 +684,7 @@ msgstr 鍵盤電池
 
 #: ../src/xfpm-battery.c:844
 msgid PDA battery
-msgstr PDA 電池
+msgstr 電子手帳 PDA 電池
 
 #: ../src/xfpm-battery.c:847
 msgid Phone battery
@@ -819,7 +819,7 @@ msgstr 重新啟動 Xfce 電源管理員執行中的實體
 
 #: ../src/xfpm-main.c:268
 msgid Show the configuration dialog
-msgstr 顯示組態對話窗
+msgstr 顯示組態對話視窗
 
 #: ../src/xfpm-main.c:269
 msgid Quit any running xfce power manager
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-weather-plugin:master Scrollbox: Do not animate if only one label is chosen (bug #9664).

2012-12-20 Thread Harald Judt

Updating branch refs/heads/master
 to e52c04b5c229fc61618a422190e1a9d69124e56f (commit)
   from 77788b6b254142ceaf57e6fc65374132a14a7a26 (commit)

commit e52c04b5c229fc61618a422190e1a9d69124e56f
Author: Harald Judt h.j...@gmx.at
Date:   Thu Dec 20 10:27:51 2012 +0100

Scrollbox: Do not animate if only one label is chosen (bug #9664).

 panel-plugin/weather-scrollbox.c |5 -
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/panel-plugin/weather-scrollbox.c b/panel-plugin/weather-scrollbox.c
index 50b95a2..fe2c7f4 100644
--- a/panel-plugin/weather-scrollbox.c
+++ b/panel-plugin/weather-scrollbox.c
@@ -351,7 +351,10 @@ gtk_scrollbox_control_loop(gpointer user_data)
 }
 break;
 case FADE_SLEEP:
-self-fade = self-animate ? FADE_OUT : FADE_NONE;
+if (self-animate  self-labels_len  1)
+self-fade = FADE_OUT;
+else
+self-fade = FADE_NONE;
 break;
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-weather-plugin:master Scrollbox: Fix not starting with the first label on change.

2012-12-20 Thread Harald Judt

Updating branch refs/heads/master
 to 5fcca543a15d77a13e4fdeff88064eedbac1f5b7 (commit)
   from e52c04b5c229fc61618a422190e1a9d69124e56f (commit)

commit 5fcca543a15d77a13e4fdeff88064eedbac1f5b7
Author: Harald Judt h.j...@gmx.at
Date:   Thu Dec 20 10:53:51 2012 +0100

Scrollbox: Fix not starting with the first label on change.

 panel-plugin/weather-scrollbox.c |   10 +++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/panel-plugin/weather-scrollbox.c b/panel-plugin/weather-scrollbox.c
index fe2c7f4..3e85dcf 100644
--- a/panel-plugin/weather-scrollbox.c
+++ b/panel-plugin/weather-scrollbox.c
@@ -256,10 +256,14 @@ gtk_scrollbox_swap_labels(GtkScrollbox *self)
 }
 
 /* Keep current list position if possible */
-pos = g_list_position(self-labels, self-active);
+if (self-active  self-labels_len  1)
+pos = g_list_position(self-labels, self-active);
+else
+pos = -1;
+
 self-labels_len = g_list_length(self-labels_new);
-if (pos = self-labels_len)
-pos = 0;
+if (pos = (gint) self-labels_len)
+pos = -1;
 self-active = g_list_nth(self-labels_new, pos + 1);
 if (self-active == NULL)
 self-active = self-labels_new;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:jeromeg/keyboard-shortcuts Set parent window for the conflict dialog.

2012-12-20 Thread Jérôme Guelfucci

Updating branch refs/heads/jeromeg/keyboard-shortcuts
 to b1b9fa1598e54093c4a9682b875f083dfb0a2a74 (commit)
   from 849aa7824f8a482496c05b1fd77099e062d1c92b (commit)

commit b1b9fa1598e54093c4a9682b875f083dfb0a2a74
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Thu Dec 20 11:03:03 2012 +0100

Set parent window for the conflict dialog.

 dialogs/keyboard-settings/xfce-keyboard-settings.c |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c 
b/dialogs/keyboard-settings/xfce-keyboard-settings.c
index 1e83e75..0a01e1a 100644
--- a/dialogs/keyboard-settings/xfce-keyboard-settings.c
+++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c
@@ -797,7 +797,8 @@ xfce_keyboard_settings_validate_shortcut 
(XfceShortcutDialog   *dialog,
 
   if (G_UNLIKELY (info != NULL))
 {
-  response = xfce_shortcut_conflict_dialog 
(xfce_shortcuts_provider_get_name (settings-priv-provider),
+  response = xfce_shortcut_conflict_dialog (GTK_WINDOW (dialog),
+
xfce_shortcuts_provider_get_name (settings-priv-provider),
 
xfce_shortcuts_provider_get_name (info-provider),
 shortcut,
 
xfce_shortcut_dialog_get_action_name (dialog),
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-power-manager:xfce-4.10 l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100%

2012-12-20 Thread Transifex

Updating branch refs/heads/xfce-4.10
 to 49a1eb9266c3ddea61a66f1019456a3bd4f58fc8 (commit)
   from b10cb29c37ffe4c78aab9f4917e0f68537aee466 (commit)

commit 49a1eb9266c3ddea61a66f1019456a3bd4f58fc8
Author: Walter cheuk wwych...@gmail.com
Date:   Thu Dec 20 11:03:46 2012 +0100

l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100%

New status: 213 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/zh_TW.po |  102 +-
 1 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 3fe1313..f418cbb 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid 
 msgstr 
 Project-Id-Version: xfce4-power-manager master\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-11-25 06:09+\n
+POT-Creation-Date: 2012-12-20 05:21+\n
 PO-Revision-Date: 2012-04-26 23:54+0800\n
 Last-Translator: Cheng-Chia Tseng pswo10...@gmail.com\n
 Language-Team: chinese-l10n chinese-l...@googlegroups.com\n
@@ -68,22 +68,22 @@ msgstr 螢幕
 
 #: ../data/interfaces/xfpm-settings.ui.h:12
 msgid Monitor power management control
-msgstr 螢幕電源管理控制
+msgstr 螢幕電力管理控制
 
 #: ../data/interfaces/xfpm-settings.ui.h:13 ../settings/xfpm-settings.c:809
 #: ../settings/xfpm-settings.c:877 ../settings/xfpm-settings.c:1026
 #: ../settings/xfpm-settings.c:1203 ../settings/xfpm-settings.c:1260
 #: ../settings/xfpm-settings.c:1312
 msgid Nothing
-msgstr 無
+msgstr 無動作
 
 #: ../data/interfaces/xfpm-settings.ui.h:14
 msgid Power manager settings
-msgstr 電源管理設定值
+msgstr 電源管理員設定值
 
 #: ../data/interfaces/xfpm-settings.ui.h:15
 msgid Prefer power savings over performance
-msgstr 偏好保存電量更勝效能
+msgstr 偏好保存電力更勝效能
 
 #: ../data/interfaces/xfpm-settings.ui.h:16
 msgid Put display to sleep when computer is inactive for:
@@ -136,28 +136,28 @@ msgstr 系統匣圖示：
 
 #: ../data/interfaces/xfpm-settings.ui.h:27
 msgid When battery power is critical:
-msgstr 當電池電量危急時：
+msgstr 電池電量危急時：
 
 #: ../data/interfaces/xfpm-settings.ui.h:28
 msgid When hibernate button is pressed:
-msgstr 當按壓休眠按鈕時：
+msgstr 按下休眠按鈕時：
 
 #: ../data/interfaces/xfpm-settings.ui.h:29
 msgid When laptop lid is closed:
-msgstr 當筆電上蓋關閉時：
+msgstr 關閉筆電上蓋時：
 
 #: ../data/interfaces/xfpm-settings.ui.h:30
 msgid When power button is pressed:
-msgstr 當按壓電源按鈕時：
+msgstr 按下電源按鈕時：
 
 #: ../data/interfaces/xfpm-settings.ui.h:31
 msgid When sleep button is pressed:
-msgstr 當按壓睡眠按鈕時：
+msgstr 按下睡眠按鈕時：
 
 #: ../data/interfaces/xfpm-settings.ui.h:32
 #: ../settings/xfpm-settings-main.c:121 ../src/xfpm-main.c:413
 msgid Xfce Power Manager
-msgstr Xfce 電力管理員
+msgstr Xfce 電源管理員
 
 #: ../settings/xfpm-settings.c:567 ../settings/xfpm-settings.c:582
 #: ../settings/xfpm-settings.c:609
@@ -197,12 +197,12 @@ msgstr 秒
 #: ../settings/xfpm-settings.c:792 ../settings/xfpm-settings.c:990
 #: ../settings/xfpm-settings.c:1470
 msgid Hibernate and suspend operations not supported
-msgstr 休眠與暫停操作不被支援
+msgstr 不支援休眠與暫停操作
 
 #: ../settings/xfpm-settings.c:797 ../settings/xfpm-settings.c:995
 #: ../settings/xfpm-settings.c:1475
 msgid Hibernate and suspend operations not permitted
-msgstr 休眠與暫停操作不受許可
+msgstr 不允許休眠與暫停操作
 
 #: ../settings/xfpm-settings.c:826 ../settings/xfpm-settings.c:1220
 #: ../src/xfpm-power.c:805
@@ -220,23 +220,23 @@ msgstr 鎖上螢幕
 
 #: ../settings/xfpm-settings.c:960 ../settings/xfpm-settings.c:1110
 msgid Spinning down hard disks permission denied
-msgstr 關閉電源轉動的許可被拒絕
+msgstr 不允許關閉硬碟轉動
 
 #: ../settings/xfpm-settings.c:1150
 msgid Always show icon
-msgstr 總是顯示圖示
+msgstr 一定顯示圖示
 
 #: ../settings/xfpm-settings.c:1153
 msgid When battery is present
-msgstr 當電池存在時
+msgstr 當有電池時
 
 #: ../settings/xfpm-settings.c:1156
 msgid When battery is charging or discharging
-msgstr 當電源充電或放電時
+msgstr 當電池充電或放電時
 
 #: ../settings/xfpm-settings.c:1159
 msgid Never show icon
-msgstr 永不顯示圖示
+msgstr 不要顯示圖示
 
 #: ../settings/xfpm-settings.c:1185
 msgid 
@@ -248,19 +248,19 @@ msgstr 
 
 #: ../settings/xfpm-settings.c:1379
 msgid Suspend operation not supported
-msgstr 暫停操作不被支援
+msgstr 不支援暫停操作
 
 #: ../settings/xfpm-settings.c:1385
 msgid Suspend operation not permitted
-msgstr 暫停操作不受許可
+msgstr 不允許暫停操作
 
 #: ../settings/xfpm-settings.c:1391
 msgid Hibernate operation not supported
-msgstr 休眠操作不被支援
+msgstr 不支援休眠操作
 
 #: ../settings/xfpm-settings.c:1396
 msgid Hibernate operation not permitted
-msgstr 休眠操作不受許可
+msgstr 不允許休眠操作
 
 #: ../settings/xfpm-settings.c:1443
 msgid When all the power sources of the computer reach this charge level
@@ -284,7 +284,7 @@ msgstr 擴展功能
 
 #: ../settings/xfpm-settings.c:1662
 msgid Check your power manager installation
-msgstr 檢查您的電力管理員是否正確安裝
+msgstr 檢查您的電源管理員是否正確安裝
 
 #: ../settings/xfpm-settings-main.c:78
 msgid Settings manager socket
@@ -302,16 +302,16 @@ msgstr 輸入 '%s --help' 以瞭解用法。
 
 #: ../settings/xfpm-settings-main.c:123
 msgid Failed to load power manager configuration, using defaults
-msgstr 無法載入電力管理員組態，改為使用預設值
+msgstr

[Xfce4-commits] xfce4-power-manager:master l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100%

2012-12-20 Thread Transifex

Updating branch refs/heads/master
 to 4f2151b84fee92650220db9c488dd377cec42df3 (commit)
   from 4ae668fabd2233c080d9f25459b18d4fc2d6486c (commit)

commit 4f2151b84fee92650220db9c488dd377cec42df3
Author: Walter cheuk wwych...@gmail.com
Date:   Thu Dec 20 11:04:36 2012 +0100

l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100%

New status: 213 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/zh_TW.po |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/po/zh_TW.po b/po/zh_TW.po
index d957d18..aeb3e84 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -136,7 +136,7 @@ msgstr 系統匣圖示：
 
 #: ../data/interfaces/xfpm-settings.ui.h:27
 msgid When battery power is critical:
-msgstr 當電池電量危急時：
+msgstr 電池電量危急時：
 
 #: ../data/interfaces/xfpm-settings.ui.h:28
 msgid When hibernate button is pressed:
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] libxfce4ui:jeromeg/keyboard-shortcuts Allow passing parent window to conflict dialog.

2012-12-20 Thread Jérôme Guelfucci

Updating branch refs/heads/jeromeg/keyboard-shortcuts
 to b56143b76d5e25ac661252d177cb7f598abfde87 (commit)
   from 4c2a8a1dd003091288f4b86521ae8f3ff7359370 (commit)

commit b56143b76d5e25ac661252d177cb7f598abfde87
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Thu Dec 20 11:04:20 2012 +0100

Allow passing parent window to conflict dialog.

 libxfce4kbd-private/xfce-shortcuts.c |7 ---
 libxfce4kbd-private/xfce-shortcuts.h |3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/libxfce4kbd-private/xfce-shortcuts.c 
b/libxfce4kbd-private/xfce-shortcuts.c
index e569a0e..1985ed4 100644
--- a/libxfce4kbd-private/xfce-shortcuts.c
+++ b/libxfce4kbd-private/xfce-shortcuts.c
@@ -67,7 +67,8 @@ static XfceShortcutConflictMessage conflict_messages[] = {
 
 
 gint
-xfce_shortcut_conflict_dialog (const gchar *owner,
+xfce_shortcut_conflict_dialog (GtkWindow   *parent,
+   const gchar *owner,
const gchar *other,
const gchar *shortcut,
const gchar *owner_action,
@@ -150,7 +151,7 @@ xfce_shortcut_conflict_dialog (const gchar *owner,
 owner_button_text = g_markup_printf_escaped 
(_(conflict_messages[i].owner_button_text), owner_action_name);
 other_button_text = g_markup_printf_escaped 
(_(conflict_messages[i].other_button_text), other_action_name);
 
-response = xfce_message_dialog (NULL, title, GTK_STOCK_DIALOG_QUESTION,
+response = xfce_message_dialog (parent, title, 
GTK_STOCK_DIALOG_QUESTION,
 title, secondary_text,
 XFCE_BUTTON_TYPE_MIXED, NULL, 
owner_button_text, GTK_RESPONSE_ACCEPT,
 XFCE_BUTTON_TYPE_MIXED, NULL, 
other_button_text, GTK_RESPONSE_REJECT,
@@ -168,7 +169,7 @@ xfce_shortcut_conflict_dialog (const gchar *owner,
 
   if (G_UNLIKELY (!handled))
 {
-  xfce_message_dialog (NULL, title, GTK_STOCK_DIALOG_ERROR,
+  xfce_message_dialog (parent, title, GTK_STOCK_DIALOG_ERROR,
title, _(This shortcut is already being used for 
something else.),
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
   response = GTK_RESPONSE_REJECT;
diff --git a/libxfce4kbd-private/xfce-shortcuts.h 
b/libxfce4kbd-private/xfce-shortcuts.h
index 4c7a27a..421c79a 100644
--- a/libxfce4kbd-private/xfce-shortcuts.h
+++ b/libxfce4kbd-private/xfce-shortcuts.h
@@ -26,7 +26,8 @@
 
 G_BEGIN_DECLS
 
-gboolean xfce_shortcut_conflict_dialog (const gchar *owner,
+gboolean xfce_shortcut_conflict_dialog (GtkWindow   *parent,
+const gchar *owner,
 const gchar *other,
 const gchar *shortcut,
 const gchar *owner_action,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfwm4:jeromeg/keyboard-shortcuts Pass parent to conflict dialog.

2012-12-20 Thread Jérôme Guelfucci

Updating branch refs/heads/jeromeg/keyboard-shortcuts
 to 7d933f37584a08775607d9c93e713de02f48a45b (commit)
   from 556ffdb3fd2e6e414de8cb347f2c9d8251aebf9d (commit)

commit 7d933f37584a08775607d9c93e713de02f48a45b
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Thu Dec 20 11:05:58 2012 +0100

Pass parent to conflict dialog.

 settings-dialogs/xfwm4-settings.c |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/settings-dialogs/xfwm4-settings.c 
b/settings-dialogs/xfwm4-settings.c
index 6746d27..64dea66 100644
--- a/settings-dialogs/xfwm4-settings.c
+++ b/settings-dialogs/xfwm4-settings.c
@@ -1909,7 +1909,8 @@ xfwm_settings_validate_shortcut (XfceShortcutDialog  
*dialog,
 {
   if (G_LIKELY (!g_str_equal (xfce_shortcut_dialog_get_action (dialog), 
other_shortcut-command)))
 {
-  response = xfce_shortcut_conflict_dialog 
(xfce_shortcuts_provider_get_name (settings-priv-provider),
+  response = xfce_shortcut_conflict_dialog (GTK_WINDOW (dialog),
+
xfce_shortcuts_provider_get_name (settings-priv-provider),
 
xfce_shortcuts_provider_get_name (other_provider),
 shortcut,
 
xfce_shortcut_dialog_get_action_name (dialog),
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] terminal:master l10n: Updated Dutch (Flemish) (nl) translation to 100%

2012-12-20 Thread Transifex

Updating branch refs/heads/master
 to 3d3ed37148854d2be3cb057d21024b1e8a43c867 (commit)
   from 3d86b95c4e80b555dcdd62b216dfcffe67acf7df (commit)

commit 3d3ed37148854d2be3cb057d21024b1e8a43c867
Author: Pjotr vertaalt pjotrverta...@gmail.com
Date:   Thu Dec 20 13:07:05 2012 +0100

l10n: Updated Dutch (Flemish) (nl) translation to 100%

New status: 262 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/nl.po |  557 ++
 1 files changed, 306 insertions(+), 251 deletions(-)

diff --git a/po/nl.po b/po/nl.po
index 600ab00..c66f55f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgid 
 msgstr 
 Project-Id-Version: terminal\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-04-17 14:06+\n
+POT-Creation-Date: 2012-12-20 08:30+\n
 PO-Revision-Date: 2011-09-08 12:16+0200\n
 Last-Translator: Pjotr\n
 Language-Team: Dutch (Flemish)\n
@@ -19,101 +19,101 @@ msgstr 
 Language: nl (Dutch)\n
 Plural-Forms: nplurals=2; plural=(n != 1);\n
 
-#: ../terminal/main.c:52
+#: ../terminal/main.c:51
 msgid Usage:
 msgstr Gebruik:
 
-#: ../terminal/main.c:52
+#: ../terminal/main.c:51
 msgid OPTION
 msgstr OPTIE
 
-#: ../terminal/main.c:57
+#: ../terminal/main.c:56
 msgid General Options
 msgstr Algemene opties
 
 #. parameter of --default-display
 #. parameter of --display
-#: ../terminal/main.c:59 ../terminal/main.c:85
+#: ../terminal/main.c:58 ../terminal/main.c:84
 msgid display
 msgstr scherm
 
 #. parameter of --default-working-directory
 #. parameter of --working-directory
-#: ../terminal/main.c:61 ../terminal/main.c:76
+#: ../terminal/main.c:60 ../terminal/main.c:75
 msgid directory
 msgstr map
 
-#: ../terminal/main.c:65
+#: ../terminal/main.c:64
 msgid Window or Tab Separators
 msgstr Venster- of tabbladscheidingen
 
-#: ../terminal/main.c:70
+#: ../terminal/main.c:69
 msgid Tab Options
 msgstr Tabbladopties
 
 #. parameter of --command
-#: ../terminal/main.c:72
+#: ../terminal/main.c:71
 msgid command
 msgstr opdracht
 
 #. parameter of --title
-#: ../terminal/main.c:74
+#: ../terminal/main.c:73
 msgid title
 msgstr titel
 
-#: ../terminal/main.c:83
+#: ../terminal/main.c:82
 msgid Window Options
 msgstr Vensteropties
 
 #. parameter of --geometry
-#: ../terminal/main.c:87
+#: ../terminal/main.c:86
 msgid geometry
 msgstr geometrie
 
 #. parameter of --role
-#: ../terminal/main.c:89
+#: ../terminal/main.c:88
 msgid role
 msgstr rol
 
 #. parameter of --startup-id
-#: ../terminal/main.c:91
+#: ../terminal/main.c:90
 msgid string
 msgstr tekstsnoer
 
 #. parameter of --icon
-#: ../terminal/main.c:93
+#: ../terminal/main.c:92
 msgid icon
 msgstr pictogram
 
-#: ../terminal/main.c:95
+#: ../terminal/main.c:94
 #, c-format
 msgid See the %s man page for full explanation of the options above.
 msgstr 
 Bekijk de %s man-pagina voor volledige uitleg van de bovenstaande opties.
 
-#: ../terminal/main.c:126 ../terminal/terminal-preferences.c:1274
-#: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.in.h:1
+#: ../terminal/main.c:124 ../terminal/terminal-preferences.c:1189
+#: ../terminal/terminal-shortcut-editor.c:119 ../Terminal.desktop.in.in.h:1
 msgid Terminal
 msgstr Terminal
 
-#: ../terminal/main.c:147
+#: ../terminal/main.c:145
 msgid The Xfce development team. All rights reserved.
 msgstr De Xfce-ontwikkelploeg. Alle rechten voorbehouden.
 
-#: ../terminal/main.c:148
+#: ../terminal/main.c:146
 msgid Written by Benedikt Meurer be...@xfce.org
 msgstr Geschreven door Benedikt Meurer be...@xfce.org
 
-#: ../terminal/main.c:149
+#: ../terminal/main.c:147
 msgid and Nick Schermer n...@xfce.org.
 msgstr en Nick Schermer n...@xfce.org.
 
-#: ../terminal/main.c:150
+#: ../terminal/main.c:148
 #, c-format
 msgid Please report bugs to %s.
 msgstr Gelieve fouten te melden aan %s.
 
-#: ../terminal/main.c:249
+#: ../terminal/main.c:244
 #, c-format
 msgid Unable to register terminal service: %s\n
 msgstr Kan terminaldienst niet registreren: %s\n
@@ -142,21 +142,96 @@ msgstr 
 msgid Unable to register object %s
 msgstr Kan object %s niet registreren
 
-#: ../terminal/terminal-dialogs.c:90 ../Terminal-default-apps.xml.in.in.h:1
+#: ../terminal/terminal-dialogs.c:84 ../Terminal-default-apps.xml.in.in.h:1
 msgid Xfce Terminal Emulator
 msgstr Xfce Terminalvenster
 
-#: ../terminal/terminal-dialogs.c:97
+#: ../terminal/terminal-dialogs.c:91
 msgid translator-credits
 msgstr 
 Stephan Arts step...@xfce.org\n
 Jasper Huijsmans jas...@xfce.org\n
 Pjotr
 
-#: ../terminal/terminal-dialogs.c:100
+#: ../terminal/terminal-dialogs.c:94
 msgid Visit Terminal website
 msgstr Bezoek de Terminal-website
 
+#: ../terminal/terminal-encoding-action.c:71
+msgid Western European
+msgstr Westeuropees
+
+#: ../terminal/terminal-encoding-action.c:72
+msgid Central European
+msgstr Centraaleuropees
+
+#: ../terminal/terminal-encoding-action.c:73
+msgid Baltic
+msgstr Baltisch
+
+#:

[Xfce4-commits] xfce4-settings:master l10n: Updated Dutch (Flemish) (nl) translation to 100%

2012-12-20 Thread Transifex

Updating branch refs/heads/master
 to feb247ff35375f47199aaec33dfed690c6bc9f96 (commit)
   from 923cb709ee8ff029918e567aaf7b4b63a47501f1 (commit)

commit feb247ff35375f47199aaec33dfed690c6bc9f96
Author: Pjotr vertaalt pjotrverta...@gmail.com
Date:   Thu Dec 20 13:08:04 2012 +0100

l10n: Updated Dutch (Flemish) (nl) translation to 100%

New status: 349 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/nl.po |  214 -
 1 files changed, 112 insertions(+), 102 deletions(-)

diff --git a/po/nl.po b/po/nl.po
index 31aa6d4..e2882a9 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgid 
 msgstr 
 Project-Id-Version: xfce4-settings\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-11-20 19:36+\n
+POT-Creation-Date: 2012-12-20 11:09+\n
 PO-Revision-Date: 2011-09-08 22:32+0200\n
 Last-Translator: Pjotr\n
 Language-Team: Dutch (Flemish)\n
@@ -233,52 +233,52 @@ msgstr pixels/sec
 
 #: ../dialogs/accessibility-settings/main.c:43
 #: ../dialogs/appearance-settings/main.c:94
-#: ../dialogs/display-settings/main.c:136
+#: ../dialogs/display-settings/main.c:137
 #: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:79
 msgid Settings manager socket
 msgstr Contactpunt voor instellingenbeheer
 
 #: ../dialogs/accessibility-settings/main.c:43
 #: ../dialogs/appearance-settings/main.c:94
-#: ../dialogs/display-settings/main.c:136
+#: ../dialogs/display-settings/main.c:137
 #: ../dialogs/keyboard-settings/main.c:39 ../dialogs/mouse-settings/main.c:79
 msgid SOCKET ID
 msgstr CONTACTPUNT ID
 
 #: ../dialogs/accessibility-settings/main.c:44
 #: ../dialogs/appearance-settings/main.c:95
-#: ../dialogs/display-settings/main.c:137
+#: ../dialogs/display-settings/main.c:138
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mime-settings/main.c:40
 #: ../dialogs/mouse-settings/main.c:80 ../xfce4-settings-editor/main.c:43
-#: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:39
+#: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:40
 msgid Version information
 msgstr Versie-informatie
 
 #: ../dialogs/accessibility-settings/main.c:192
 #: ../dialogs/appearance-settings/main.c:966
-#: ../dialogs/display-settings/main.c:1926
+#: ../dialogs/display-settings/main.c:1943
 #: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62
 #: ../dialogs/mouse-settings/main.c:1597 ../xfce4-settings-editor/main.c:63
-#: ../xfsettingsd/main.c:187 ../xfce4-settings-manager/main.c:60
+#: ../xfsettingsd/main.c:187 ../xfce4-settings-manager/main.c:61
 #, c-format
 msgid Type '%s --help' for usage.
 msgstr Tik '%s --help' voor een gebruiksaanwijzing.
 
 #: ../dialogs/accessibility-settings/main.c:211
 #: ../dialogs/appearance-settings/main.c:985
-#: ../dialogs/display-settings/main.c:1945
+#: ../dialogs/display-settings/main.c:1962
 #: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1616 ../xfce4-settings-editor/main.c:82
-#: ../xfsettingsd/main.c:203 ../xfce4-settings-manager/main.c:76
+#: ../xfsettingsd/main.c:203 ../xfce4-settings-manager/main.c:77
 msgid The Xfce development team. All rights reserved.
 msgstr De Xfce-ontwikkelploeg. Alle rechten voorbehouden.
 
 #: ../dialogs/accessibility-settings/main.c:212
 #: ../dialogs/appearance-settings/main.c:986
-#: ../dialogs/display-settings/main.c:1946
+#: ../dialogs/display-settings/main.c:1963
 #: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82
 #: ../dialogs/mouse-settings/main.c:1617 ../xfce4-settings-editor/main.c:83
-#: ../xfsettingsd/main.c:204 ../xfce4-settings-manager/main.c:77
+#: ../xfsettingsd/main.c:204 ../xfce4-settings-manager/main.c:78
 #, c-format
 msgid Please report bugs to %s.
 msgstr Gelieve fouten te melden aan %s.
@@ -300,54 +300,45 @@ msgid Appearance
 msgstr Uiterlijk
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
-#: ../dialogs/display-settings/main.c:116
-msgid Both
-msgstr Beide
-
-#: ../dialogs/appearance-settings/appearance-dialog.glade.h:4
-msgid Both Horizontal
-msgstr Beide horizontaal
-
-#: ../dialogs/appearance-settings/appearance-dialog.glade.h:5
 msgid Custom _DPI setting:
 msgstr Aangepaste _DPI-instelling:
 
-#: ../dialogs/appearance-settings/appearance-dialog.glade.h:6
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:4
 #: ../dialogs/appearance-settings/xfce-ui-settings.desktop.in.h:2
 msgid Customize the look of your desktop
 msgstr Pas het uiterlijk van uw werkomgeving aan
 
-#: ../dialogs/appearance-settings/appearance-dialog.glade.h:7
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:5
 msgid DPI
 msgstr DPI
 
-#: ../dialogs/appearance-settings/appearance-dialog.glade.h:8
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:6
 msgid Default Fon_t
 msgstr Standaardlettertype
 
-#:

[Xfce4-commits] thunar-volman:master l10n: Updated Kazakh (kk) translation to 100%

2012-12-20 Thread Transifex

Updating branch refs/heads/master
 to a34b4d77daa72ba8d26365e2f32dd8313865e387 (commit)
   from 988bbf431264722af852900094d0f82d8b582040 (commit)

commit a34b4d77daa72ba8d26365e2f32dd8313865e387
Author: Baurzhan Muftakhidinov baurthefi...@gmail.com
Date:   Thu Dec 20 13:31:26 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 |   26 +-
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/po/kk.po b/po/kk.po
index 9eaf125..e0cf77a 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: 2012-01-24 05:12+\n
+POT-Creation-Date: 2012-12-20 08:51+\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
@@ -36,21 +36,21 @@ msgstr Нұсқа ақпаратын шығару мен шығу
 msgid Thunar Volume Manager
 msgstr Thunar тасушылар басқарушысы
 
-#: ../thunar-volman/main.c:119
+#: ../thunar-volman/main.c:121
 msgid All rights reserved.
 msgstr Барлық құқықтары қорғалған.
 
-#: ../thunar-volman/main.c:120
+#: ../thunar-volman/main.c:122
 #, c-format
 msgid Please report bugs to %s.
 msgstr Ақаулықтар жөнінде хабарласыңыз: %s.
 
-#: ../thunar-volman/main.c:174
+#: ../thunar-volman/main.c:176
 #, c-format
 msgid There is no device with the sysfs path \%s\
 msgstr sysfs жолы \%s\ болатын құрылғы жоқ
 
-#: ../thunar-volman/main.c:186
+#: ../thunar-volman/main.c:188
 #, c-format
 msgid Must specify the sysfs path of new devices with --device-added
 msgstr Жаңа құрылғылар үшін syfs жолын --device-added көмегімен көрсету керек
@@ -212,13 +212,13 @@ msgstr CD _ойнау
 
 #: ../thunar-volman/tvm-block-device.c:919
 #, c-format
-msgid Unknown block device type
-msgstr Белгісіз блоктық құрылғы түрі
+msgid Unknown block device type \%s\
+msgstr Белгісіз блоктық құрылғы түрі \%s\
 
 #: ../thunar-volman/tvm-device.c:139
 #, c-format
-msgid Device type not supported
-msgstr Құрылғы түріне қолдау жоқ
+msgid Device type \%s\ not supported
+msgstr Құрылғы \%s\ түріне қолдау жоқ
 
 #: ../thunar-volman/tvm-input-device.c:75
 msgid Keyboard detected
@@ -248,8 +248,8 @@ msgstr Тышқан табылды
 
 #: ../thunar-volman/tvm-input-device.c:141
 #, c-format
-msgid Unsupported input device type
-msgstr Енгізу құрылғының осы түрі үшін қолдау жоқ
+msgid Unsupported input device type \%s\
+msgstr Енгізу құрылғының \%s\ түрі үшін қолдау жоқ
 
 #: ../thunar-volman/tvm-run.c:171
 #, c-format
@@ -316,8 +316,8 @@ msgstr USB принтері табылды
 
 #: ../thunar-volman/tvm-usb-device.c:100
 #, c-format
-msgid Unsupported USB device type
-msgstr Қолдауы жоқ USB құрылғы түрі
+msgid Unsupported USB device type \%s\
+msgstr Қолдауы жоқ \%s\ USB құрылғы түрі
 
 #. setup application name
 #: ../thunar-volman-settings/main.c:52
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:master l10n: Updated Kazakh (kk) translation to 97%

2012-12-20 Thread Transifex

Updating branch refs/heads/master
 to 73e59ce947b236bec0632e1205962b1d312e0a68 (commit)
   from feb247ff35375f47199aaec33dfed690c6bc9f96 (commit)

commit 73e59ce947b236bec0632e1205962b1d312e0a68
Author: Baurzhan Muftakhidinov baurthefi...@gmail.com
Date:   Thu Dec 20 13:34:40 2012 +0100

l10n: Updated Kazakh (kk) translation to 97%

New status: 340 messages complete with 5 fuzzies and 4 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/kk.po |  174 +++---
 1 files changed, 87 insertions(+), 87 deletions(-)

diff --git a/po/kk.po b/po/kk.po
index 17d76ac..392c300 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: 2012-11-24 14:33+\n
+POT-Creation-Date: 2012-12-20 11:09+\n
 PO-Revision-Date: 2012-08-04 08:27+0600\n
 Last-Translator: Baurzhan Muftakhidinov baurthefi...@gmail.com\n
 Language-Team: Kazakh kk...@googlegroups.com\n
@@ -239,35 +239,35 @@ msgstr SOCKET ID
 #: ../dialogs/display-settings/main.c:138
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mime-settings/main.c:40
 #: ../dialogs/mouse-settings/main.c:80 ../xfce4-settings-editor/main.c:43
-#: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:39
+#: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:40
 msgid Version information
 msgstr Нұсқа ақпараты
 
 #: ../dialogs/accessibility-settings/main.c:192
 #: ../dialogs/appearance-settings/main.c:966
-#: ../dialogs/display-settings/main.c:1941
+#: ../dialogs/display-settings/main.c:1943
 #: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62
 #: ../dialogs/mouse-settings/main.c:1597 ../xfce4-settings-editor/main.c:63
-#: ../xfsettingsd/main.c:187 ../xfce4-settings-manager/main.c:60
+#: ../xfsettingsd/main.c:187 ../xfce4-settings-manager/main.c:61
 #, c-format
 msgid Type '%s --help' for usage.
 msgstr Көмек үшін '%s --help' енгізіңіз.
 
 #: ../dialogs/accessibility-settings/main.c:211
 #: ../dialogs/appearance-settings/main.c:985
-#: ../dialogs/display-settings/main.c:1960
+#: ../dialogs/display-settings/main.c:1962
 #: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1616 ../xfce4-settings-editor/main.c:82
-#: ../xfsettingsd/main.c:203 ../xfce4-settings-manager/main.c:76
+#: ../xfsettingsd/main.c:203 ../xfce4-settings-manager/main.c:77
 msgid The Xfce development team. All rights reserved.
 msgstr Xfce өндіру тобы. Барлық құқықтары қорғалған.
 
 #: ../dialogs/accessibility-settings/main.c:212
 #: ../dialogs/appearance-settings/main.c:986
-#: ../dialogs/display-settings/main.c:1961
+#: ../dialogs/display-settings/main.c:1963
 #: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82
 #: ../dialogs/mouse-settings/main.c:1617 ../xfce4-settings-editor/main.c:83
-#: ../xfsettingsd/main.c:204 ../xfce4-settings-manager/main.c:77
+#: ../xfsettingsd/main.c:204 ../xfce4-settings-manager/main.c:78
 #, c-format
 msgid Please report bugs to %s.
 msgstr Ақаулықтар жөнінде хабарласыңыз: %s.
@@ -289,53 +289,44 @@ msgid Appearance
 msgstr Сыртқы түрі
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
-#: ../dialogs/display-settings/main.c:117
-msgid Both
-msgstr Екеуі де
-
-#: ../dialogs/appearance-settings/appearance-dialog.glade.h:4
-msgid Both Horizontal
-msgstr Екеуі де жатық
-
-#: ../dialogs/appearance-settings/appearance-dialog.glade.h:5
 msgid Custom _DPI setting:
 msgstr Қалауыңы_зша DPI мәні:
 
-#: ../dialogs/appearance-settings/appearance-dialog.glade.h:6
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:4
 #: ../dialogs/appearance-settings/xfce-ui-settings.desktop.in.h:2
 msgid Customize the look of your desktop
 msgstr Жұмыс үстеліңіздің сыртқы түрін баптаңыз
 
-#: ../dialogs/appearance-settings/appearance-dialog.glade.h:7
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:5
 msgid DPI
 msgstr DPI
 
-#: ../dialogs/appearance-settings/appearance-dialog.glade.h:8
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:6
 msgid Default Fon_t
 msgstr Негізгі қарі_п
 
-#: ../dialogs/appearance-settings/appearance-dialog.glade.h:9
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:7
 msgid Enable _event sounds
 msgstr Оқ_иғалар дыбыстарын іске қосу
 
-#: ../dialogs/appearance-settings/appearance-dialog.glade.h:10
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:8
 msgid Enable e_ditable accelerators
 msgstr Түзе_тілетін үдеткіштерді іске қосу
 
-#: ../dialogs/appearance-settings/appearance-dialog.glade.h:11
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:9
 msgid Enable input feedbac_k sounds
 msgstr Теру кезіндегі _кері байланыс дыбыстарын іске қосу
 
-#: ../dialogs/appearance-settings/appearance-dialog.glade.h:12
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:10
 msgid Enable or disable

[Xfce4-commits] thunar:master l10n: Updated Portuguese (pt) translation to 100%

2012-12-20 Thread Transifex

Updating branch refs/heads/master
 to f746d3bf6fd8c96ef97a6422b44718b3e286c1be (commit)
   from 1906a05216c861667952f24e25d5a32fab114761 (commit)

commit f746d3bf6fd8c96ef97a6422b44718b3e286c1be
Author: Sergio Marques smarque...@gmail.com
Date:   Thu Dec 20 16:52:27 2012 +0100

l10n: Updated Portuguese (pt) translation to 100%

New status: 737 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/pt.po |  230 +++--
 1 files changed, 117 insertions(+), 113 deletions(-)

diff --git a/po/pt.po b/po/pt.po
index 2f1112e..7cab053 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid 
 msgstr 
 Project-Id-Version: Thunar\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-12-07 21:03+\n
+POT-Creation-Date: 2012-12-20 14:00+\n
 PO-Revision-Date: 2012-11-02 02:14+0100\n
 Last-Translator: Sérgio Marques smarque...@gmail.com\n
 Language-Team: \n
@@ -136,10 +136,10 @@ msgstr Ocorreu um erro ao iniciar a operação
 
 #. tell the user that we were unable to launch the file specified
 #: ../thunar/thunar-application.c:1113 ../thunar/thunar-application.c:1239
-#: ../thunar/thunar-launcher.c:1208 ../thunar/thunar-location-entry.c:402
+#: ../thunar/thunar-launcher.c:1216 ../thunar/thunar-location-entry.c:402
 #: ../thunar/thunar-location-entry.c:430
-#: ../thunar/thunar-shortcuts-view.c:1621
-#: ../thunar/thunar-shortcuts-view.c:1649 ../thunar/thunar-window.c:2219
+#: ../thunar/thunar-shortcuts-view.c:1630
+#: ../thunar/thunar-shortcuts-view.c:1658 ../thunar/thunar-window.c:
 #, c-format
 msgid Failed to open \%s\
 msgstr Ocorreu um erro ao abrir \%s\
@@ -152,20 +152,20 @@ msgstr Ocorreu um erro ao abrir \%s\: %s
 #. display an error message
 #: ../thunar/thunar-application.c:1307
 #: ../thunar/thunar-properties-dialog.c:671
-#: ../thunar/thunar-standard-view.c:2712 ../thunar/thunar-tree-view.c:1751
+#: ../thunar/thunar-standard-view.c:2711 ../thunar/thunar-tree-view.c:1760
 #, c-format
 msgid Failed to rename \%s\
 msgstr Ocorreu um erro ao renomear \%s\
 
 #: ../thunar/thunar-application.c:1409
 #: ../thunar/thunar-location-buttons.c:1285
-#: ../thunar/thunar-standard-view.c:2277 ../thunar/thunar-tree-view.c:1613
+#: ../thunar/thunar-standard-view.c:2276 ../thunar/thunar-tree-view.c:1622
 msgid New Folder
 msgstr Nova pasta
 
 #: ../thunar/thunar-application.c:1410
 #: ../thunar/thunar-location-buttons.c:1286
-#: ../thunar/thunar-standard-view.c:2278 ../thunar/thunar-tree-view.c:1614
+#: ../thunar/thunar-standard-view.c:2277 ../thunar/thunar-tree-view.c:1623
 msgid Create New Folder
 msgstr Criar nova pasta
 
@@ -178,7 +178,7 @@ msgid Create New File
 msgstr Criar novo ficheiro
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-application.c:1472 ../thunar/thunar-standard-view.c:2322
+#: ../thunar/thunar-application.c:1472 ../thunar/thunar-standard-view.c:2321
 #, c-format
 msgid Create Document from template \%s\
 msgstr Criar documento a partir do modelo \%s\
@@ -253,7 +253,7 @@ msgstr Remover todos os ficheiros e pastas no lixo?
 #. append the Empty Trash menu action
 #. prepare the menu item
 #: ../thunar/thunar-application.c:1953 ../thunar/thunar-location-buttons.c:171
-#: ../thunar/thunar-shortcuts-view.c:1181 ../thunar/thunar-tree-view.c:1174
+#: ../thunar/thunar-shortcuts-view.c:1191 ../thunar/thunar-tree-view.c:1183
 #: ../thunar/thunar-window.c:344 ../plugins/thunar-tpa/thunar-tpa.c:189
 msgid _Empty Trash
 msgstr _Esvaziar lixo
@@ -306,7 +306,7 @@ msgstr Nenhuma aplicação selecionada
 msgid Other Application...
 msgstr Outra aplicação...
 
-#: ../thunar/thunar-chooser-dialog.c:188 ../thunar/thunar-launcher.c:180
+#: ../thunar/thunar-chooser-dialog.c:188 ../thunar/thunar-launcher.c:181
 msgid Open With
 msgstr Abrir com
 
@@ -754,7 +754,7 @@ msgstr _Ligação para aqui
 
 #. display an error to the user
 #. display an error message to the user
-#: ../thunar/thunar-dnd.c:254 ../thunar/thunar-launcher.c:566
+#: ../thunar/thunar-dnd.c:254 ../thunar/thunar-launcher.c:567
 #, c-format
 msgid Failed to execute file \%s\
 msgstr Ocorreu um erro ao executar o ficheiro \%s\
@@ -820,42 +820,42 @@ msgstr Ficheiro
 msgid File Name
 msgstr Nome do ficheiro
 
-#: ../thunar/thunar-file.c:916 ../thunar/thunar-gio-extensions.c:236
-#: ../thunar/thunar-shortcuts-model.c:900 ../thunar/thunar-window.c:362
+#: ../thunar/thunar-file.c:929 ../thunar/thunar-gio-extensions.c:236
+#: ../thunar/thunar-shortcuts-model.c:899 ../thunar/thunar-window.c:362
 msgid File System
 msgstr Sistema de ficheiros
 
-#: ../thunar/thunar-file.c:1353
+#: ../thunar/thunar-file.c:1366
 #, c-format
 msgid The root folder has no parent
 msgstr A pasta \root\ não tem ascendente
 
-#: ../thunar/thunar-file.c:1438 ../thunar/thunar-file.c:1713
+#: ../thunar/thunar-file.c:1451 ../thunar/thunar-file.c:1726
 #, c-format
 msgid Failed to parse the desktop file: %s
 msgstr Ocorreu um erro ao

[Xfce4-commits] xfce4-settings:master l10n: Updated Portuguese (pt) translation to 100%

2012-12-20 Thread Transifex

Updating branch refs/heads/master
 to 49cfef8593f95d2bac26bfb8f3894fcfa7fd9eef (commit)
   from 73e59ce947b236bec0632e1205962b1d312e0a68 (commit)

commit 49cfef8593f95d2bac26bfb8f3894fcfa7fd9eef
Author: Sergio Marques smarque...@gmail.com
Date:   Thu Dec 20 16:54:47 2012 +0100

l10n: Updated Portuguese (pt) translation to 100%

New status: 349 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/pt.po |  168 -
 1 files changed, 88 insertions(+), 80 deletions(-)

diff --git a/po/pt.po b/po/pt.po
index b582fce..1614414 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid 
 msgstr 
 Project-Id-Version: xfce4-settings\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-11-27 06:45+\n
+POT-Creation-Date: 2012-12-20 11:09+\n
 PO-Revision-Date: 2012-04-27 15:49+0100\n
 Last-Translator: Nuno Miguel nunom...@gmail.com\n
 Language-Team: \n
@@ -245,35 +245,35 @@ msgstr ID de SOCKET
 #: ../dialogs/display-settings/main.c:138
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mime-settings/main.c:40
 #: ../dialogs/mouse-settings/main.c:80 ../xfce4-settings-editor/main.c:43
-#: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:39
+#: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:40
 msgid Version information
 msgstr Informações da versão
 
 #: ../dialogs/accessibility-settings/main.c:192
 #: ../dialogs/appearance-settings/main.c:966
-#: ../dialogs/display-settings/main.c:1941
+#: ../dialogs/display-settings/main.c:1943
 #: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62
 #: ../dialogs/mouse-settings/main.c:1597 ../xfce4-settings-editor/main.c:63
-#: ../xfsettingsd/main.c:187 ../xfce4-settings-manager/main.c:60
+#: ../xfsettingsd/main.c:187 ../xfce4-settings-manager/main.c:61
 #, c-format
 msgid Type '%s --help' for usage.
 msgstr Digite '%s --help' para informações de utilização.
 
 #: ../dialogs/accessibility-settings/main.c:211
 #: ../dialogs/appearance-settings/main.c:985
-#: ../dialogs/display-settings/main.c:1960
+#: ../dialogs/display-settings/main.c:1962
 #: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1616 ../xfce4-settings-editor/main.c:82
-#: ../xfsettingsd/main.c:203 ../xfce4-settings-manager/main.c:76
+#: ../xfsettingsd/main.c:203 ../xfce4-settings-manager/main.c:77
 msgid The Xfce development team. All rights reserved.
 msgstr A equipa de desenvolvimento do Xfce. Todos os direitos reservados.
 
 #: ../dialogs/accessibility-settings/main.c:212
 #: ../dialogs/appearance-settings/main.c:986
-#: ../dialogs/display-settings/main.c:1961
+#: ../dialogs/display-settings/main.c:1963
 #: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82
 #: ../dialogs/mouse-settings/main.c:1617 ../xfce4-settings-editor/main.c:83
-#: ../xfsettingsd/main.c:204 ../xfce4-settings-manager/main.c:77
+#: ../xfsettingsd/main.c:204 ../xfce4-settings-manager/main.c:78
 #, c-format
 msgid Please report bugs to %s.
 msgstr Por favor reporte os erros em %s.
@@ -295,54 +295,45 @@ msgid Appearance
 msgstr Aparência
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
-#: ../dialogs/display-settings/main.c:117
-msgid Both
-msgstr Ambos
-
-#: ../dialogs/appearance-settings/appearance-dialog.glade.h:4
-msgid Both Horizontal
-msgstr Ambos na horizontal
-
-#: ../dialogs/appearance-settings/appearance-dialog.glade.h:5
 msgid Custom _DPI setting:
 msgstr _Definições personalizadas de ppp:
 
-#: ../dialogs/appearance-settings/appearance-dialog.glade.h:6
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:4
 #: ../dialogs/appearance-settings/xfce-ui-settings.desktop.in.h:2
 msgid Customize the look of your desktop
 msgstr Personalizar a aparência do seu ambiente de trabalho
 
-#: ../dialogs/appearance-settings/appearance-dialog.glade.h:7
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:5
 msgid DPI
 msgstr PPP
 
-#: ../dialogs/appearance-settings/appearance-dialog.glade.h:8
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:6
 msgid Default Fon_t
 msgstr _Tipo de letra por omissão
 
-#: ../dialogs/appearance-settings/appearance-dialog.glade.h:9
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:7
 msgid Enable _event sounds
 msgstr Ativar sons de _evento
 
-#: ../dialogs/appearance-settings/appearance-dialog.glade.h:10
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:8
 msgid Enable e_ditable accelerators
 msgstr Ativar edição de acele_radores
 
-#: ../dialogs/appearance-settings/appearance-dialog.glade.h:11
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:9
 msgid Enable input feedbac_k sounds
 msgstr Ativar sons de retorno de e_ntrada
 
-#: ../dialogs/appearance-settings/appearance-dialog.glade.h:12
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:10
 msgid Enable or

[Xfce4-commits] parole:master l10n: Updated Portuguese (pt) translation to 100%

2012-12-20 Thread Transifex

Updating branch refs/heads/master
 to 1ac7329ce4af4adfb8c05f448b8efbe911d64124 (commit)
   from 1c115d42f0eaaaf23cc3033649aeeb3111a0da91 (commit)

commit 1ac7329ce4af4adfb8c05f448b8efbe911d64124
Author: Sergio Marques smarque...@gmail.com
Date:   Thu Dec 20 16:55:46 2012 +0100

l10n: Updated Portuguese (pt) translation to 100%

New status: 204 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/pt.po |  175 +++---
 1 files changed, 87 insertions(+), 88 deletions(-)

diff --git a/po/pt.po b/po/pt.po
index 4b6f3d5..5089a47 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid 
 msgstr 
 Project-Id-Version: parole 2.0.1\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-12-07 20:33+\n
+POT-Creation-Date: 2012-12-20 13:30+\n
 PO-Revision-Date: \n
 Last-Translator: Nuno Miguel nunom...@gmail.com\n
 Language-Team: Portuguese\n
@@ -34,13 +34,17 @@ msgstr 4:3 (TV)
 msgid 
 bigspan color='#BB'iby/i/span span color='#F4F4F4'Unknown 
 Artist/span/big
-msgstr bigspan color='#BB'ide/i/span span 
color='#F4F4F4'artista desconhecido/span/big
+msgstr 
+bigspan color='#BB'ide/i/span span color='#F4F4F4'artista 
+desconhecido/span/big
 
 #: ../data/interfaces/parole.ui.h:5
 msgid 
 bigspan color='#BB'ion/i/span span color='#F4F4F4'Unknown 
 Album/span/big
-msgstr bigspan color='#BB'iem/i/span span 
color='#F4F4F4'álbum desconhecido/span/big
+msgstr 
+bigspan color='#BB'iem/i/span span color='#F4F4F4'álbum 
+desconhecido/span/big
 
 #: ../data/interfaces/parole.ui.h:6
 msgid span color='#F4F4F4'bbigUnknown Song/big/b/span
@@ -63,12 +67,12 @@ msgstr Automático
 msgid Buffering (0%)
 msgstr A processar (0%))
 
-#: ../data/interfaces/parole.ui.h:12 ../src/parole-player.c:707
+#: ../data/interfaces/parole.ui.h:12 ../src/parole-player.c:708
 msgid Empty
 msgstr Vazio
 
-#: ../data/interfaces/parole.ui.h:13 ../src/parole-disc.c:111
-#: ../src/parole-disc.c:157
+#: ../data/interfaces/parole.ui.h:13 ../src/parole-disc.c:110
+#: ../src/parole-disc.c:156
 msgid Insert Disc
 msgstr Insira o disco
 
@@ -193,27 +197,36 @@ msgid DVD Name
 msgstr Nome do DVD
 
 #: ../data/interfaces/playlist.ui.h:7
+msgid Disc Playlist
+msgstr Lista de reprodução do disco
+
+#: ../data/interfaces/playlist.ui.h:8
 msgid Play opened files
 msgstr Reproduzir ficheiros abertos
 
-#: ../data/interfaces/playlist.ui.h:8
+#: ../data/interfaces/playlist.ui.h:9 ../src/parole-medialist.c:785
+#: ../src/parole-player.c:2960
+msgid Playlist
+msgstr Lista de reprodução
+
+#: ../data/interfaces/playlist.ui.h:10
 #: ../data/interfaces/parole-settings.ui.h:17
 msgid Remember playlist
 msgstr Lembrar lista de reprodução
 
-#: ../data/interfaces/playlist.ui.h:9
+#: ../data/interfaces/playlist.ui.h:11
 msgid Repeat
 msgstr _Repetir
 
-#: ../data/interfaces/playlist.ui.h:10
+#: ../data/interfaces/playlist.ui.h:12
 msgid Replace playlist when opening files
 msgstr Substituir lista de reprodução ao abrir ficheiros
 
-#: ../data/interfaces/playlist.ui.h:11
+#: ../data/interfaces/playlist.ui.h:13
 msgid Shuffle
 msgstr _Baralhar
 
-#: ../data/interfaces/playlist.ui.h:12
+#: ../data/interfaces/playlist.ui.h:14
 msgid Title Menu
 msgstr Menu de título
 
@@ -373,7 +386,7 @@ msgstr Mensagem
 msgid Error
 msgstr Erro
 
-#: ../src/gst/parole-gst.c:1239 ../src/parole-medialist.c:344
+#: ../src/gst/parole-gst.c:1239 ../src/parole-medialist.c:357
 #, c-format
 msgid Track %i
 msgstr Faixa %i
@@ -532,68 +545,64 @@ msgstr O Parole já está em execução. Use -i para abrir 
uma nova instância\
 msgid Supported files
 msgstr Ficheiros suportados
 
-#: ../src/parole-mediachooser.c:217 ../src/parole-player.c:920
+#: ../src/parole-mediachooser.c:217 ../src/parole-player.c:921
 msgid All files
 msgstr Todos os ficheiros
 
-#: ../src/parole-medialist.c:360
+#: ../src/parole-medialist.c:373
 #, c-format
 msgid Chapter %i
 msgstr Capítulo %i
 
-#: ../src/parole-medialist.c:630
+#: ../src/parole-medialist.c:643
 msgid Permission denied
 msgstr Permissão negada
 
-#: ../src/parole-medialist.c:632
+#: ../src/parole-medialist.c:645
 msgid Error saving playlist file
 msgstr Erro ao gravar a lista de reprodução
 
-#: ../src/parole-medialist.c:644
+#: ../src/parole-medialist.c:657
 msgid Unknown playlist format
 msgstr Formato desconhecido
 
-#: ../src/parole-medialist.c:645
+#: ../src/parole-medialist.c:658
 msgid Please chooser a supported playlist format
 msgstr Por favor, selecione um formato suportado
 
-#: ../src/parole-medialist.c:697 ../src/parole-plugins-manager.c:349
-#: ../src/plugins/properties/stream-properties-provider.c:140
-#: ../src/plugins/properties/stream-properties-provider.c:141
-#: ../src/plugins/properties/stream-properties-provider.c:142
-#: ../src/plugins/properties/stream-properties-provider.c:143
+#: ../src/parole-medialist.c:710 ../src/parole-plugins-manager.c:349
 msgid Unknown
 msgstr

[Xfce4-commits] terminal:master Use GDBus for dbus communication.

2012-12-20 Thread Nick Schermer

Updating branch refs/heads/master
 to 42f061bd1c62e832d2d0974ca4c4d2e5336e1197 (commit)
   from c0d2ad500ea9c1381d8250534a5250896bd56e22 (commit)

commit 42f061bd1c62e832d2d0974ca4c4d2e5336e1197
Author: Nick Schermer n...@xfce.org
Date:   Thu Dec 20 21:01:29 2012 +0100

Use GDBus for dbus communication.

 configure.ac.in|   17 +--
 terminal/Makefile.am   |   19 +--
 terminal/main.c|   37 ++--
 terminal/terminal-config.h.in  |4 -
 terminal/terminal-dbus.c   |  317 
 terminal/terminal-gdbus.c  |  216 
 terminal/{terminal-dbus.h = terminal-gdbus.h} |   10 +-
 7 files changed, 245 insertions(+), 375 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 74ac2b0..08f1f29 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -66,7 +66,7 @@ AC_PROG_LIBTOOL()
 dnl **
 dnl *** Check for standard headers ***
 dnl **
-AC_CHECK_HEADERS([ctype.h errno.h limits.h pwd.h signal.h time.h])
+AC_CHECK_HEADERS([ctype.h errno.h limits.h pwd.h signal.h time.h unistd.h])
 
 dnl **
 dnl *** Check for i18n support ***
@@ -87,21 +87,6 @@ XDT_CHECK_PACKAGE([VTE], [vte], [0.28])
 XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.26.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0])
 
-dnl **
-dnl *** Optional support for D-BUS ***
-dnl **
-XDT_CHECK_OPTIONAL_PACKAGE([DBUS], [dbus-glib-1], [0.22],
-   [dbus], [D-BUS GLib bindings])
-if test x$DBUS_FOUND = xyes; then
-  AC_MSG_CHECKING([whether to use new D-BUS API])
-  if $PKG_CONFIG --atleast-version 0.31 dbus-1 /dev/null 21; then
-AC_DEFINE([DBUS_USE_NEW_API], [1], [Define to use new D-BUS API])
-AC_MSG_RESULT([yes])
-  else
-AC_MSG_RESULT([no])
-  fi
-fi
-
 dnl ***
 dnl *** Check if we need to build the documentation ***
 dnl ***
diff --git a/terminal/Makefile.am b/terminal/Makefile.am
index 2e53093..aa06fe2 100644
--- a/terminal/Makefile.am
+++ b/terminal/Makefile.am
@@ -1,11 +1,10 @@
 INCLUDES = \
+   -I$(top_srcdir) \
-DDATADIR=\$(datadir)\ \
-DHELPDIR=\$(docdir)\ \
-DEXO_DISABLE_DEPRECATED\
-DG_LOG_DOMAIN=\Terminal\ \
-DPACKAGE_LOCALE_DIR=\$(localedir)\ \
-   -DSN_API_NOT_YET_FROZEN \
-   -I$(top_srcdir) \
$(PLATFORM_CPPFLAGS)
 
 bin_PROGRAMS = \
@@ -17,15 +16,12 @@ Terminal_built_sources = \
terminal-marshal.c \
terminal-marshal.h
 
-Terminal_dbus_sources = \
-   terminal-dbus.c \
-   terminal-dbus.h
-
 Terminal_headers = \
terminal-accel-map.h \
terminal-app.h \
terminal-dialogs.h \
terminal-encoding-action.h \
+   terminal-gdbus.h \
terminal-image-loader.h \
terminal-options.h \
terminal-preferences.h \
@@ -47,6 +43,7 @@ Terminal_SOURCES = \
terminal-app.c \
terminal-dialogs.c \
terminal-encoding-action.c \
+   terminal-gdbus.c \
terminal-image-loader.c \
terminal-options.c \
terminal-preferences.c \
@@ -59,7 +56,6 @@ Terminal_SOURCES = \
terminal-window.c
 
 Terminal_CFLAGS = \
-   $(DBUS_CFLAGS) \
$(EXO_CFLAGS) \
$(GTK_CFLAGS) \
$(GIO_CFLAGS) \
@@ -73,7 +69,6 @@ Terminal_LDFLAGS = \
$(PLATFORM_LDFLAGS)
 
 Terminal_LDADD = \
-   $(DBUS_LIBS) \
$(EXO_LIBS) \
$(GTK_LIBS) \
$(GIO_LIBS) \
@@ -88,14 +83,6 @@ install-exec-hook:
$(mkinstalldirs) $(DESTDIR)$(bindir)
-( cd $(DESTDIR)$(bindir) ; test -x terminal || test -x Terminal  ln 
-sf Terminal terminal )
 
-if HAVE_DBUS
-Terminal_CFLAGS += \
-   -DDBUS_API_SUBJECT_TO_CHANGE
-
-Terminal_SOURCES += \
-   $(Terminal_dbus_sources)
-endif
-
 
 ##
 ## Rules to auto-generate built sources
diff --git a/terminal/main.c b/terminal/main.c
index 4e77699..1c86410 100644
--- a/terminal/main.c
+++ b/terminal/main.c
@@ -32,9 +32,7 @@
 #include terminal/terminal-app.h
 #include terminal/terminal-private.h
 
-#ifdef HAVE_DBUS
-#include terminal/terminal-dbus.h
-#endif
+#include terminal/terminal-gdbus.h
 
 
 
@@ -116,6 +114,7 @@ main (int argc, char **argv)
   gint nargc;
   gint n;
   gchar   *name;
+  const gchar *msg;
 
   /* install required signal handlers */
   signal (SIGPIPE, SIG_IGN);
@@ -179,19 +178,20 @@ main (int argc, char **argv)
 nargv[nargc++] = g_strdup (argv[n]);
   nargv[nargc] = NULL;
 
-#ifdef HAVE_DBUS
+  /* for GDBus */
+  g_type_init ();
+
   if (!disable_server)
 {
   /* try to connect to an existing Terminal service */
-  if (terminal_dbus_invoke_launch (nargc, nargv, error))
+  if

[Xfce4-commits] parole:master Finished porting all settings to Xfconf.

2012-12-20 Thread Sean Davis

Updating branch refs/heads/master
 to 5d84cc65f25ba221fd63d77032ecd8f0b5ce7872 (commit)
   from 1ac7329ce4af4adfb8c05f448b8efbe911d64124 (commit)

commit 5d84cc65f25ba221fd63d77032ecd8f0b5ce7872
Author: Sean Davis smd.seanda...@gmail.com
Date:   Thu Dec 20 15:48:05 2012 -0500

Finished porting all settings to Xfconf.

 src/common/parole-rc-utils.c |   88 ---
 src/common/parole-rc-utils.h |   31 ---
 src/gst/parole-gst.c |5 +-
 src/main.c   |9 +-
 src/parole-conf.c|  540 --
 src/parole-conf.h|7 +
 src/parole-mediachooser.c|   12 +-
 src/parole-medialist.c   |8 +-
 src/parole-module.c  |1 -
 src/parole-player.c  |   38 +++-
 src/parole-plugins-manager.c |   29 ++-
 11 files changed, 436 insertions(+), 332 deletions(-)

diff --git a/src/common/parole-rc-utils.c b/src/common/parole-rc-utils.c
index 5631d26..3a17521 100644
--- a/src/common/parole-rc-utils.c
+++ b/src/common/parole-rc-utils.c
@@ -47,94 +47,6 @@ parole_get_resource_file (const gchar *group, gboolean 
readonly)
 return rc;
 }
 
-void parole_rc_write_entry_bool (const gchar *property, const gchar *group, 
gboolean value)
-{
-XfceRc *rc = parole_get_resource_file (group, FALSE);
-
-xfce_rc_write_bool_entry (rc, property, value);
-xfce_rc_close (rc);
-}
-
-void parole_rc_write_entry_int (const gchar *property, const gchar *group, 
gint value)
-{
-XfceRc *rc = parole_get_resource_file (group, FALSE);
-
-xfce_rc_write_int_entry (rc, property, value);
-xfce_rc_close (rc);
-}
-
-void parole_rc_write_entry_string (const gchar *property, const gchar *group, 
const gchar *value)
-{
-XfceRc *rc = parole_get_resource_file (group, FALSE);
-
-xfce_rc_write_entry (rc, property, value);
-xfce_rc_close (rc);
-}
-
-void parole_rc_write_entry_list (const gchar *property, const gchar *group, 
gchar **value)
-{
-XfceRc *rc = parole_get_resource_file (group, FALSE);
-
-xfce_rc_write_list_entry (rc, property, value, ;);
-xfce_rc_close (rc);
-}
-
-gboolean parole_rc_read_entry_bool (const gchar *property, const gchar *group, 
gboolean fallback)
-{
-XfceRc *rc = parole_get_resource_file (group, TRUE);
-gboolean ret_val = fallback;
-
-if ( rc )
-{
-   ret_val = xfce_rc_read_bool_entry (rc, property, fallback);
-   xfce_rc_close (rc);
-}
-
-return ret_val;
-}
-
-gint parole_rc_read_entry_int (const gchar *property, const gchar *group, gint 
fallback)
-{
-XfceRc *rc = parole_get_resource_file (group, TRUE);
-gint ret_val = fallback;
-
-if ( rc )
-{
-   ret_val =  xfce_rc_read_int_entry (rc, property, fallback);
-   xfce_rc_close (rc);
-}
-
-return ret_val;
-}
-
-const gchar *parole_rc_read_entry_string (const gchar *property, const gchar 
*group, const gchar *fallback)
-{
-const gchar *ret_val = fallback;
-XfceRc *rc = parole_get_resource_file (group, TRUE);
-
-if ( rc )
-{
-   ret_val = xfce_rc_read_entry (rc, property, fallback);
-   xfce_rc_close (rc);
-}
-
-return ret_val;
-}
-
-gchar **parole_rc_read_entry_list (const gchar *property, const gchar *group)
-{
-gchar **ret_val = NULL;
-XfceRc *rc = parole_get_resource_file (group, TRUE);
-
-if ( rc )
-{
-   ret_val = xfce_rc_read_list_entry (rc, property, ;);
-   xfce_rc_close (rc);
-}
-
-return ret_val;
-}
-
 gchar **parole_get_history_full(const gchar *relpath)
 {
 gchar **lines = NULL;
diff --git a/src/common/parole-rc-utils.h b/src/common/parole-rc-utils.h
index 8492a78..fd7c623 100644
--- a/src/common/parole-rc-utils.h
+++ b/src/common/parole-rc-utils.h
@@ -32,37 +32,6 @@
 XfceRc *parole_get_resource_file(const gchar *group, 
 gboolean readonly);
 
-void   parole_rc_write_entry_bool  (const gchar *property,
-const gchar *group,
-gboolean value);
-
-void   parole_rc_write_entry_int   (const gchar *property,
-const gchar *group,
-gint value);
-
-void   parole_rc_write_entry_string(const gchar *property, 
-const gchar *group,
-const gchar *value);
-
-void   parole_rc_write_entry_list  (const gchar *property, 
-const gchar *group,
-gchar **value);
-

[Xfce4-commits] terminal:master Use package name for notebook group.

2012-12-20 Thread Nick Schermer

Updating branch refs/heads/master
 to 2db4bcb21cd06f56c89ce858fd7cebc97053fe53 (commit)
   from 99e272cd9061301942ae64f55d73c5dbe1651def (commit)

commit 2db4bcb21cd06f56c89ce858fd7cebc97053fe53
Author: Nick Schermer n...@xfce.org
Date:   Thu Dec 20 21:48:29 2012 +0100

Use package name for notebook group.

 terminal/terminal-window.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c
index 9378044..578499c 100644
--- a/terminal/terminal-window.c
+++ b/terminal/terminal-window.c
@@ -204,7 +204,7 @@ struct _TerminalWindow
 
 
 static guint window_signals[LAST_SIGNAL];
-static gconstpointer window_notebook_group = Terminal;
+static gconstpointer window_notebook_group = PACKAGE_NAME;
 static GQuarkgomenu_action_quark = 0;
 
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] terminal:master Remove toolbar editor.

2012-12-20 Thread Nick Schermer

Updating branch refs/heads/master
 to 99e272cd9061301942ae64f55d73c5dbe1651def (commit)
   from 0206267295327fecbc5ac588d42eda0187b84908 (commit)

commit 99e272cd9061301942ae64f55d73c5dbe1651def
Author: Nick Schermer n...@xfce.org
Date:   Thu Dec 20 21:47:18 2012 +0100

Remove toolbar editor.

 Makefile.am|1 -
 Terminal-toolbars.ui   |   36 ---
 doc/xfce4-terminal.1.xml   |   12 ---
 po/POTFILES.in |2 -
 terminal/Makefile.am   |4 -
 terminal/terminal-toolbars-model.c |  186 
 terminal/terminal-toolbars-model.h |   61 
 terminal/terminal-toolbars-view.c  |  127 
 terminal/terminal-toolbars-view.h  |   56 ---
 terminal/terminal-window-ui.xml|  112 -
 terminal/terminal-window.c |   34 +---
 11 files changed, 65 insertions(+), 566 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index b1eba37..d70f975 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,7 +34,6 @@ xml_DATA = $(xml_in_files:.xml.in=.xml)
 
 uidir = $(datadir)/xfce4-terminal
 ui_DATA = \
-   Terminal-toolbars.ui \
xfce4-terminal.glade
 
 EXTRA_DIST = \
diff --git a/Terminal-toolbars.ui b/Terminal-toolbars.ui
deleted file mode 100644
index 1f1c890..000
--- a/Terminal-toolbars.ui
+++ /dev/null
@@ -1,36 +0,0 @@
-?xml version=1.0 encoding=UTF-8?
-!DOCTYPE toolbars SYSTEM toolbars.dtd
-
-!--
-  Copyright (c) 2004-2006 os-cillation
-
-  Default toolbar configuration for Terminal.
---
-
-toolbars
-  toolbar name=main style=both-horiz
-toolitem id=new-window /
-toolitem id=new-tab /
-
-separator /
-
-toolitem id=copy /
-toolitem id=paste /
-
-separator /
-
-toolitem id=fullscreen /
-toolitem id=preferences /
-
-separator /
-
-toolitem id=prev-tab /
-toolitem id=next-tab /
-
-separator /
-
-toolitem id=contents /
-  /toolbar
-/toolbars
-
-!-- vi:set ts=2 sw=2 ai et: --
diff --git a/doc/xfce4-terminal.1.xml b/doc/xfce4-terminal.1.xml
index f4df5a7..9de88e5 100644
--- a/doc/xfce4-terminal.1.xml
+++ b/doc/xfce4-terminal.1.xml
@@ -510,18 +510,6 @@
   /para
 /listitem
   /varlistentry
-
-  varlistentry
-
termfilename${XDG_DATA_DIRS}/Terminal/Terminal-toolbars.ui/filename/term
-listitem
-  para
-This file includes the user interface definition for the toolbars. 
If
-you customize the toolbars using the graphical toolbars editor, 
application;
-will store the new toolbars layout in the file
-
filename${XDG_DATA_HOME}/Terminal/Terminal-toolbars.ui/filename.
-  /para
-/listitem
-  /varlistentry
 /variablelist
   /refsect1
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0fc53e7..e9d3516 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -10,8 +10,6 @@ terminal/terminal-preferences-dialog.c
 terminal/terminal-preferences.c
 terminal/terminal-screen.c
 terminal/terminal-shortcut-editor.c
-terminal/terminal-toolbars-model.c
-terminal/terminal-toolbars-view.c
 terminal/terminal-widget.c
 terminal/terminal-window.c
 
diff --git a/terminal/Makefile.am b/terminal/Makefile.am
index e6a3eb3..76191f7 100644
--- a/terminal/Makefile.am
+++ b/terminal/Makefile.am
@@ -29,8 +29,6 @@ xfce4_terminal_headers = \
terminal-private.h \
terminal-screen.h \
terminal-shortcut-editor.h \
-   terminal-toolbars-model.h \
-   terminal-toolbars-view.h \
terminal-widget.h \
terminal-window.h \
terminal-window-ui.h
@@ -50,8 +48,6 @@ xfce4_terminal_SOURCES = \
terminal-preferences-dialog.c \
terminal-screen.c \
terminal-shortcut-editor.c \
-   terminal-toolbars-model.c \
-   terminal-toolbars-view.c \
terminal-widget.c \
terminal-window.c
 
diff --git a/terminal/terminal-toolbars-model.c 
b/terminal/terminal-toolbars-model.c
deleted file mode 100644
index bdadb2f..000
--- a/terminal/terminal-toolbars-model.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*-
- * Copyright (c) 2004-2006 os-cillation e.K.
- *
- * Written by Benedikt Meurer be...@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 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.
- *
- * The geometry

[Xfce4-commits] xfwm4:jeromeg/keyboard-shortcuts Fix crash when handling conflict involving xfwm4 actions.

2012-12-20 Thread Jérôme Guelfucci

Updating branch refs/heads/jeromeg/keyboard-shortcuts
 to 17d3d97874eb9c764669f5499ad5b4468506ade4 (commit)
   from 7d933f37584a08775607d9c93e713de02f48a45b (commit)

commit 17d3d97874eb9c764669f5499ad5b4468506ade4
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Thu Dec 20 23:22:08 2012 +0100

Fix crash when handling conflict involving xfwm4 actions.

xfce_shortcut_dialog_get_action_name seems to return garbage which made
the application segfault.

 settings-dialogs/xfwm4-settings.c |   22 ++
 1 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/settings-dialogs/xfwm4-settings.c 
b/settings-dialogs/xfwm4-settings.c
index 64dea66..1b5b7e9 100644
--- a/settings-dialogs/xfwm4-settings.c
+++ b/settings-dialogs/xfwm4-settings.c
@@ -1844,24 +1844,6 @@ xfwm_settings_shortcut_reset_clicked (GtkButton
*button,
 
 
 
-static const gchar *
-xfwm_settings_shortcut_feature_name (const gchar *feature)
-{
-  const gchar *result = feature;
-  gint i;
-
-  for (i = 0; xfwm4_shortcut_values[i].name != NULL; ++i)
-if (G_UNLIKELY (g_str_equal (xfwm4_shortcut_values[i].feature, feature)))
-  {
-result = xfwm4_shortcut_values[i].name;
-break;
-  }
-
-  return result;
-}
-
-
-
 static gboolean
 xfwm_settings_validate_shortcut (XfceShortcutDialog  *dialog,
  const gchar *shortcut,
@@ -1913,8 +1895,8 @@ xfwm_settings_validate_shortcut (XfceShortcutDialog  
*dialog,
 
xfce_shortcuts_provider_get_name (settings-priv-provider),
 
xfce_shortcuts_provider_get_name (other_provider),
 shortcut,
-
xfce_shortcut_dialog_get_action_name (dialog),
-
xfwm_settings_shortcut_feature_name (other_shortcut-command),
+
xfce_shortcut_dialog_get_action (dialog),
+other_shortcut-command,
 FALSE);
 
   if (G_UNLIKELY (response == GTK_RESPONSE_ACCEPT))
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] libxfce4ui:jeromeg/keyboard-shortcuts Add some debugging information for conflict.

2012-12-20 Thread Jérôme Guelfucci

Updating branch refs/heads/jeromeg/keyboard-shortcuts
 to e5637cc58ae7b44ba0e0ff2cdc797757d23d8f05 (commit)
   from b56143b76d5e25ac661252d177cb7f598abfde87 (commit)

commit e5637cc58ae7b44ba0e0ff2cdc797757d23d8f05
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Thu Dec 20 23:21:43 2012 +0100

Add some debugging information for conflict.

 libxfce4kbd-private/xfce-shortcuts.c |4 
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/libxfce4kbd-private/xfce-shortcuts.c 
b/libxfce4kbd-private/xfce-shortcuts.c
index 1985ed4..ba8019e 100644
--- a/libxfce4kbd-private/xfce-shortcuts.c
+++ b/libxfce4kbd-private/xfce-shortcuts.c
@@ -114,6 +114,8 @@ xfce_shortcut_conflict_dialog (GtkWindow   *parent,
   {
 gint j;
 
+DBG (Owner action %s is an xfwm4 action, get the string, 
owner_action);
+
 /* We need to get the human readable string of the action name */
 for (j = 0; xfwm4_shortcut_values[j].name != NULL; ++j)
 if (G_UNLIKELY (g_str_equal (xfwm4_shortcut_values[j].feature,
@@ -127,6 +129,8 @@ xfce_shortcut_conflict_dialog (GtkWindow   *parent,
 else
   owner_action_name = g_markup_escape_text (owner_action, -1);
 
+DBG (Owner action name: %s, owner_action_name);
+
 if (other_action == NULL)
   other_action_name = NULL;
 else if (g_utf8_collate (other, xfwm4) == 0)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] libxfce4ui:jeromeg/keyboard-shortcuts Show the accelerator label in the shortcut dialog.

2012-12-20 Thread Jérôme Guelfucci

Updating branch refs/heads/jeromeg/keyboard-shortcuts
 to f3ed87bd674c0e7464018082566fbb62a9226628 (commit)
   from e5637cc58ae7b44ba0e0ff2cdc797757d23d8f05 (commit)

commit f3ed87bd674c0e7464018082566fbb62a9226628
Author: Jérôme Guelfucci jero...@xfce.org
Date:   Thu Dec 20 23:38:22 2012 +0100

Show the accelerator label in the shortcut dialog.

 libxfce4kbd-private/xfce-shortcut-dialog.c |   12 
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/libxfce4kbd-private/xfce-shortcut-dialog.c 
b/libxfce4kbd-private/xfce-shortcut-dialog.c
index 38e53ea..fc5b6fa 100644
--- a/libxfce4kbd-private/xfce-shortcut-dialog.c
+++ b/libxfce4kbd-private/xfce-shortcut-dialog.c
@@ -357,7 +357,8 @@ xfce_shortcut_dialog_key_pressed (XfceShortcutDialog 
*dialog,
   GdkModifierType  consumed, modifiers;
   guintkeyval, mod_mask;
   gchar   *text;
-  gchar   *shortcut;
+  gchar   *escaped_label;
+  gchar   *label;
 
   g_free (dialog-shortcut);
 
@@ -392,13 +393,16 @@ xfce_shortcut_dialog_key_pressed (XfceShortcutDialog 
*dialog,
   /* Get and store the pressed shortcut */
   dialog-shortcut = gtk_accelerator_name (keyval, modifiers);
 
-  shortcut = g_markup_escape_text (dialog-shortcut, -1);
-  text = g_strdup_printf (span size='large'b%s/b/span, shortcut);
+  label = gtk_accelerator_get_label (keyval, modifiers);
+  escaped_label = g_markup_escape_text (label, -1);
+  text = g_strdup_printf (span size='large'b%s/b/span,
+  escaped_label);
 
   gtk_label_set_markup (GTK_LABEL (dialog-shortcut_label), text);
 
+  g_free (label);
+  g_free (escaped_label);
   g_free (text);
-  g_free (shortcut);
 
   return FALSE;
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] terminal:master Use byte strings.

2012-12-20 Thread Nick Schermer

Updating branch refs/heads/master
 to f09b3ba79b11b2b7c54be8ee2a768a9a9a76bdd9 (commit)
   from 3610a76a4791f4b0c00c25b0ee2bd323fd8c7000 (commit)

commit f09b3ba79b11b2b7c54be8ee2a768a9a9a76bdd9
Author: Nick Schermer n...@xfce.org
Date:   Fri Dec 21 00:10:51 2012 +0100

Use byte strings.

Not sure if the data is utf8.

 configure.ac.in   |2 +-
 terminal/terminal-gdbus.c |   17 ++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 26ccee8..240d7ab 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -14,7 +14,7 @@ m4_define([terminal_version_micro], [8])
 m4_define([terminal_version_nano], [])
 m4_define([terminal_version_build], [@REVISION@])
 m4_define([terminal_version_tag], [git])
-m4_define([terminal_version_dbus], [4])
+m4_define([terminal_version_dbus], [5])
 m4_define([terminal_version], 
[terminal_version_major().terminal_version_minor().terminal_version_micro()ifelse(terminal_version_nano(),
 [], [], [.terminal_version_nano()])ifelse(terminal_version_tag(), [git], 
[terminal_version_tag()-terminal_version_build()], [terminal_version_tag()])])
 
 dnl ***
diff --git a/terminal/terminal-gdbus.c b/terminal/terminal-gdbus.c
index 3f8f6e4..69de0f5 100644
--- a/terminal/terminal-gdbus.c
+++ b/terminal/terminal-gdbus.c
@@ -40,9 +40,9 @@ static const gchar terminal_gdbus_introspection_xml[] =
   node
 interface name=' TERMINAL_DBUS_INTERFACE '
   method name=' TERMINAL_DBUS_METHOD_LAUNCH '
-arg type='x' name='uid' direction='in'/
-arg type='s' name='display-name' direction='in'/
-arg type='as' name='argv' direction='in'/
+arg type='u' name='uid' direction='in'/
+arg type='ay' name='display-name' direction='in'/
+arg type='aay' name='argv' direction='in'/
   /method
 /interface
   /node;
@@ -60,8 +60,8 @@ terminal_gdbus_method_call (GDBusConnection   *connection,
 gpointer   user_data)
 {
   TerminalApp  *app = TERMINAL_APP (user_data);
-  gint64uid = -1;
-  const gchar  *display_name = NULL;
+  guint32   uid = G_MAXUINT32;
+  gchar*display_name = NULL;
   gchar   **argv = NULL;
   GError   *error = NULL;
 
@@ -72,7 +72,7 @@ terminal_gdbus_method_call (GDBusConnection   *connection,
   if (g_strcmp0 (method_name, TERMINAL_DBUS_METHOD_LAUNCH) == 0)
 {
   /* get paramenters */
-  g_variant_get (parameters, (xs^as), uid, display_name, argv);
+  g_variant_get (parameters, (u^ay^aay), uid, display_name, argv);
 
   if (uid != getuid ())
 {
@@ -98,6 +98,9 @@ terminal_gdbus_method_call (GDBusConnection   *connection,
   /* everything went fine */
   g_dbus_method_invocation_return_value (invocation, NULL);
 }
+
+  g_free (display_name);
+  g_strfreev (argv);
 }
   else
 {
@@ -193,7 +196,7 @@ terminal_gdbus_invoke_launch (gint argc,
TERMINAL_DBUS_PATH,
TERMINAL_DBUS_INTERFACE,
TERMINAL_DBUS_METHOD_LAUNCH,
-   g_variant_new ((xs^as),
+   g_variant_new ((u^ay^aay),
   getuid (),
   g_getenv (DISPLAY),
   argv),
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-settings:master l10n: Updated Ukrainian (uk) translation to 100%

2012-12-20 Thread Transifex

Updating branch refs/heads/master
 to 8afb45a90fcf081243e707c39547ec8260c30499 (commit)
   from 49cfef8593f95d2bac26bfb8f3894fcfa7fd9eef (commit)

commit 8afb45a90fcf081243e707c39547ec8260c30499
Author: Yarema aka Knedlyk yupad...@gmail.com
Date:   Fri Dec 21 00:46:41 2012 +0100

l10n: Updated Ukrainian (uk) translation to 100%

New status: 349 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/uk.po |  170 +-
 1 files changed, 90 insertions(+), 80 deletions(-)

diff --git a/po/uk.po b/po/uk.po
index 88dade0..f350d1f 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-11-23 17:09+\n
+POT-Creation-Date: 2012-12-20 21:51+\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
@@ -245,35 +245,35 @@ msgstr ID сокета
 #: ../dialogs/display-settings/main.c:138
 #: ../dialogs/keyboard-settings/main.c:40 ../dialogs/mime-settings/main.c:40
 #: ../dialogs/mouse-settings/main.c:80 ../xfce4-settings-editor/main.c:43
-#: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:39
+#: ../xfsettingsd/main.c:77 ../xfce4-settings-manager/main.c:40
 msgid Version information
 msgstr Інформація про версію
 
 #: ../dialogs/accessibility-settings/main.c:192
 #: ../dialogs/appearance-settings/main.c:966
-#: ../dialogs/display-settings/main.c:1941
+#: ../dialogs/display-settings/main.c:1943
 #: ../dialogs/keyboard-settings/main.c:76 ../dialogs/mime-settings/main.c:62
 #: ../dialogs/mouse-settings/main.c:1597 ../xfce4-settings-editor/main.c:63
-#: ../xfsettingsd/main.c:187 ../xfce4-settings-manager/main.c:60
+#: ../xfsettingsd/main.c:187 ../xfce4-settings-manager/main.c:61
 #, c-format
 msgid Type '%s --help' for usage.
 msgstr Наберіть '%s --help' для використання.
 
 #: ../dialogs/accessibility-settings/main.c:211
 #: ../dialogs/appearance-settings/main.c:985
-#: ../dialogs/display-settings/main.c:1960
+#: ../dialogs/display-settings/main.c:1962
 #: ../dialogs/keyboard-settings/main.c:92 ../dialogs/mime-settings/main.c:81
 #: ../dialogs/mouse-settings/main.c:1616 ../xfce4-settings-editor/main.c:82
-#: ../xfsettingsd/main.c:203 ../xfce4-settings-manager/main.c:76
+#: ../xfsettingsd/main.c:203 ../xfce4-settings-manager/main.c:77
 msgid The Xfce development team. All rights reserved.
 msgstr Команда розробників Xfce. Всі права застережено.
 
 #: ../dialogs/accessibility-settings/main.c:212
 #: ../dialogs/appearance-settings/main.c:986
-#: ../dialogs/display-settings/main.c:1961
+#: ../dialogs/display-settings/main.c:1963
 #: ../dialogs/keyboard-settings/main.c:93 ../dialogs/mime-settings/main.c:82
 #: ../dialogs/mouse-settings/main.c:1617 ../xfce4-settings-editor/main.c:83
-#: ../xfsettingsd/main.c:204 ../xfce4-settings-manager/main.c:77
+#: ../xfsettingsd/main.c:204 ../xfce4-settings-manager/main.c:78
 #, c-format
 msgid Please report bugs to %s.
 msgstr Звіти про помилки для %s.
@@ -295,53 +295,44 @@ msgid Appearance
 msgstr Зовнішній вигляд
 
 #: ../dialogs/appearance-settings/appearance-dialog.glade.h:3
-#: ../dialogs/display-settings/main.c:117
-msgid Both
-msgstr Значки та текст
-
-#: ../dialogs/appearance-settings/appearance-dialog.glade.h:4
-msgid Both Horizontal
-msgstr Обидва горизонтально
-
-#: ../dialogs/appearance-settings/appearance-dialog.glade.h:5
 msgid Custom _DPI setting:
 msgstr Нетипо_ві параметри DPI:
 
-#: ../dialogs/appearance-settings/appearance-dialog.glade.h:6
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:4
 #: ../dialogs/appearance-settings/xfce-ui-settings.desktop.in.h:2
 msgid Customize the look of your desktop
 msgstr Налаштуйте зовнішній вигляд вашої стільниці
 
-#: ../dialogs/appearance-settings/appearance-dialog.glade.h:7
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:5
 msgid DPI
 msgstr DPI
 
-#: ../dialogs/appearance-settings/appearance-dialog.glade.h:8
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:6
 msgid Default Fon_t
 msgstr Типовий шриф_т
 
-#: ../dialogs/appearance-settings/appearance-dialog.glade.h:9
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:7
 msgid Enable _event sounds
 msgstr Увімкнути зв_уки подій
 
-#: ../dialogs/appearance-settings/appearance-dialog.glade.h:10
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:8
 msgid Enable e_ditable accelerators
 msgstr Увімкнути змінні прискорю_вачі
 
-#: ../dialogs/appearance-settings/appearance-dialog.glade.h:11
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:9
 msgid Enable input feedbac_k sounds
 msgstr Увімкну_ти вхідні фонові звуки
 
-#: ../dialogs/appearance-settings/appearance-dialog.glade.h:12
+#: ../dialogs/appearance-settings/appearance-dialog.glade.h:10
 msgid Enable or disable event sounds

[Xfce4-commits] terminal:master l10n: Updated Ukrainian (uk) translation to 100%

2012-12-20 Thread Transifex

Updating branch refs/heads/master
 to 57d3d5940c564e100a1339607383e325ea9d362b (commit)
   from f09b3ba79b11b2b7c54be8ee2a768a9a9a76bdd9 (commit)

commit 57d3d5940c564e100a1339607383e325ea9d362b
Author: Yarema aka Knedlyk yupad...@gmail.com
Date:   Fri Dec 21 00:52:55 2012 +0100

l10n: Updated Ukrainian (uk) translation to 100%

New status: 262 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/uk.po |  559 ++
 1 files changed, 310 insertions(+), 249 deletions(-)

diff --git a/po/uk.po b/po/uk.po
index a376d98..f05ab58 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,7 +8,7 @@ msgid 
 msgstr 
 Project-Id-Version: thunar\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-12-04 12:39+\n
+POT-Creation-Date: 2012-12-20 19:12+\n
 PO-Revision-Date: 2008-06-30 18:50+0300\n
 Last-Translator: Dmitry Nikitin luckas...@mail.ru\n
 Language-Team: Ukrainian xfce4-...@xfce.org\n
@@ -18,100 +18,100 @@ msgstr 
 Language: uk\n
 X-Generator: KBabel 1.11.4\n
 
-#: ../terminal/main.c:52
+#: ../terminal/main.c:51
 msgid Usage:
 msgstr Використання:
 
-#: ../terminal/main.c:52
+#: ../terminal/main.c:51
 msgid OPTION
 msgstr ОПЦІЯ
 
-#: ../terminal/main.c:57
+#: ../terminal/main.c:56
 msgid General Options
 msgstr Загальні опції
 
 #. parameter of --default-display
 #. parameter of --display
-#: ../terminal/main.c:59 ../terminal/main.c:85
+#: ../terminal/main.c:58 ../terminal/main.c:84
 msgid display
 msgstr дисплей
 
 #. parameter of --default-working-directory
 #. parameter of --working-directory
-#: ../terminal/main.c:61 ../terminal/main.c:76
+#: ../terminal/main.c:60 ../terminal/main.c:75
 msgid directory
 msgstr тека
 
-#: ../terminal/main.c:65
+#: ../terminal/main.c:64
 msgid Window or Tab Separators
 msgstr Розділювачі вікна або вкладки
 
-#: ../terminal/main.c:70
+#: ../terminal/main.c:69
 msgid Tab Options
 msgstr Опції вкладки
 
 #. parameter of --command
-#: ../terminal/main.c:72
+#: ../terminal/main.c:71
 msgid command
 msgstr команда
 
 #. parameter of --title
-#: ../terminal/main.c:74
+#: ../terminal/main.c:73
 msgid title
 msgstr назва
 
-#: ../terminal/main.c:83
+#: ../terminal/main.c:82
 msgid Window Options
 msgstr Опції вікна
 
 #. parameter of --geometry
-#: ../terminal/main.c:87
+#: ../terminal/main.c:86
 msgid geometry
 msgstr геометрія
 
 #. parameter of --role
-#: ../terminal/main.c:89
+#: ../terminal/main.c:88
 msgid role
 msgstr роль
 
 #. parameter of --startup-id
-#: ../terminal/main.c:91
+#: ../terminal/main.c:90
 msgid string
 msgstr стрічка
 
 #. parameter of --icon
-#: ../terminal/main.c:93
+#: ../terminal/main.c:92
 msgid icon
 msgstr значок
 
-#: ../terminal/main.c:95
+#: ../terminal/main.c:94
 #, c-format
 msgid See the %s man page for full explanation of the options above.
 msgstr Дивіться %s сторінку man для повного пояснення наведених вище опцій.
 
-#: ../terminal/main.c:126 ../terminal/terminal-preferences.c:1274
-#: ../terminal/terminal-shortcut-editor.c:120 ../Terminal.desktop.in.in.h:1
+#: ../terminal/main.c:124 ../terminal/terminal-preferences.c:1189
+#: ../terminal/terminal-shortcut-editor.c:119 ../Terminal.desktop.in.in.h:1
 msgid Terminal
 msgstr Термінал
 
-#: ../terminal/main.c:147
+#: ../terminal/main.c:145
 msgid The Xfce development team. All rights reserved.
 msgstr Команда розробників Xfce. Всі права застережено.
 
-#: ../terminal/main.c:148
+#: ../terminal/main.c:146
 msgid Written by Benedikt Meurer be...@xfce.org
 msgstr Розроблено через Benedikt Meurer be...@xfce.org
 
-#: ../terminal/main.c:149
+#: ../terminal/main.c:147
 msgid and Nick Schermer n...@xfce.org.
 msgstr і Nick Schermer n...@xfce.org.
 
-#: ../terminal/main.c:150
+#: ../terminal/main.c:148
 #, c-format
 msgid Please report bugs to %s.
 msgstr Сповіщайте про помилки до %s.
 
-#: ../terminal/main.c:249
+#: ../terminal/main.c:244
 #, c-format
 msgid Unable to register terminal service: %s\n
 msgstr Не вдається зареєструвати службу терміналу: %s\n
@@ -139,18 +139,95 @@ msgstr Шина повідомлень D-BUS вимкнена, завершен
 msgid Unable to register object %s
 msgstr Не вдається зареєструвати об'єкт %s
 
-#: ../terminal/terminal-dialogs.c:90 ../Terminal-default-apps.xml.in.in.h:1
+#: ../terminal/terminal-dialogs.c:84 ../Terminal-default-apps.xml.in.in.h:1
 msgid Xfce Terminal Emulator
 msgstr Xfce-імітатор терміналу
 
-#: ../terminal/terminal-dialogs.c:97
+#: ../terminal/terminal-dialogs.c:91
 msgid translator-credits
-msgstr Максим Дзюманенко dziumane...@gmail.com/nЯрема aka Knedlyk 
yupad...@gmail.com
+msgstr 
+Максим Дзюманенко dziumane...@gmail.com/nЯрема aka Knedlyk yupadmin@gmail.
+com
 
-#: ../terminal/terminal-dialogs.c:100
+#: ../terminal/terminal-dialogs.c:94
 msgid Visit Terminal website
 msgstr Відвідати вебсайт Terminal
 
+#: ../terminal/terminal-encoding-action.c:71
+msgid Western European
+msgstr Західно-Європейське
+
+#:

[Xfce4-commits] libxfce4ui:jeromeg/keyboard-shortcuts Get rid of FinallyGetModifiersForKeycode.

[Xfce4-commits] libxfce4ui:jeromeg/keyboard-shortcuts Fix keyboard shortcuts with keypad (bug #4178).

[Xfce4-commits] xfce4-power-manager:master l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100%

[Xfce4-commits] xfce4-power-manager:master l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100%

[Xfce4-commits] xfce4-weather-plugin:master Scrollbox: Do not animate if only one label is chosen (bug #9664).

[Xfce4-commits] xfce4-weather-plugin:master Scrollbox: Fix not starting with the first label on change.

[Xfce4-commits] xfce4-settings:jeromeg/keyboard-shortcuts Set parent window for the conflict dialog.

[Xfce4-commits] xfce4-power-manager:xfce-4.10 l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100%

[Xfce4-commits] xfce4-power-manager:master l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100%

[Xfce4-commits] libxfce4ui:jeromeg/keyboard-shortcuts Allow passing parent window to conflict dialog.

[Xfce4-commits] xfwm4:jeromeg/keyboard-shortcuts Pass parent to conflict dialog.

[Xfce4-commits] terminal:master l10n: Updated Dutch (Flemish) (nl) translation to 100%

[Xfce4-commits] xfce4-settings:master l10n: Updated Dutch (Flemish) (nl) translation to 100%

[Xfce4-commits] thunar-volman:master l10n: Updated Kazakh (kk) translation to 100%

[Xfce4-commits] xfce4-settings:master l10n: Updated Kazakh (kk) translation to 97%

[Xfce4-commits] thunar:master l10n: Updated Portuguese (pt) translation to 100%

[Xfce4-commits] xfce4-settings:master l10n: Updated Portuguese (pt) translation to 100%

[Xfce4-commits] parole:master l10n: Updated Portuguese (pt) translation to 100%

[Xfce4-commits] terminal:master Use GDBus for dbus communication.

[Xfce4-commits] parole:master Finished porting all settings to Xfconf.

[Xfce4-commits] terminal:master Use package name for notebook group.

[Xfce4-commits] terminal:master Remove toolbar editor.

[Xfce4-commits] xfwm4:jeromeg/keyboard-shortcuts Fix crash when handling conflict involving xfwm4 actions.

[Xfce4-commits] libxfce4ui:jeromeg/keyboard-shortcuts Add some debugging information for conflict.

[Xfce4-commits] libxfce4ui:jeromeg/keyboard-shortcuts Show the accelerator label in the shortcut dialog.

[Xfce4-commits] terminal:master Use byte strings.

[Xfce4-commits] xfce4-settings:master l10n: Updated Ukrainian (uk) translation to 100%

[Xfce4-commits] terminal:master l10n: Updated Ukrainian (uk) translation to 100%

28 matches

Site Navigation

Mail list logo

Footer information