[Xfce4-commits] <orage:orage-4.8> 4.8.0.4: making branch 4.8 upto date with master changes
Juha Kautto
noreply at xfce.org
Tue Jan 25 23:02:01 CET 2011
Updating branch refs/heads/orage-4.8
to 018de99ea65bef73313cd4f1be372858000204be (commit)
from d058606ff07b898722d709b7eaf7a2ceb6cb74f7 (commit)
commit 018de99ea65bef73313cd4f1be372858000204be
Author: Juha Kautto <juha at xfce.org>
Date: Tue Jan 25 23:56:15 2011 +0200
4.8.0.4: making branch 4.8 upto date with master changes
Make branch 4-8 to contain fixes from master.
configure.in.in | 2 +-
po/cs.po | 384 +++++++++++++++++++++++++----------------------
po/de.po | 206 +++++++------------------
po/zh_CN.po | 190 ++++++++----------------
src/appointment.c | 3 +-
src/day-view.c | 27 +++-
src/tz_zoneinfo_read.c | 64 ++++++---
tz_convert/tz_convert.c | 24 +++-
8 files changed, 414 insertions(+), 486 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 9ade25f..9a2e92d 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto <juha at xfce.org>
dnl
dnl Version information
-m4_define([orage_version], [4.8.1-git])
+m4_define([orage_version], [4.8.0.4-git])
m4_define([gtk_minimum_version], [2.10.0])
m4_define([xfce_minimum_version], [4.6.0])
diff --git a/po/cs.po b/po/cs.po
index 6f00a08..d4ab0c1 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,14 +2,14 @@
# This file is distributed under the same license as the orage package.
# Lukáš Konarovský <daeltar at daeltar.org>, 2003.
# Alois Nespor <Alois.Nespor at seznam.cz>, 2004.
-# Michal Várady <miko.vaji at gmail.com>, 2006-2010.
+# Michal Várady <miko.vaji at gmail.com>, 2006-2011.
#
msgid ""
msgstr ""
"Project-Id-Version: orage 4.3.90.2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-12-17 16:36+0200\n"
-"PO-Revision-Date: 2010-03-15 20:35+0100\n"
+"PO-Revision-Date: 2011-01-15 22:07+0100\n"
"Last-Translator: Michal Várady <miko.vaji at gmail.com>\n"
"Language-Team: Czech <translation-team-cs at lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
@@ -53,13 +53,11 @@ msgid "adjust to change hour"
msgstr "nastavením změníte hodinu"
#: ../globaltime/globaltime.c:496
-msgid ""
-"adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-"nastavením změníte minutu. Pro změnu pouze o jednu minutu klikněte na šipky "
-"s tlačítkem 2 ."
+msgid "adjust to change minute. Click arrows with button 2 to change only 1 minute."
+msgstr "nastavením změníte minutu. Pro změnu pouze o jednu minutu klikněte na šipky s tlačítkem 2 ."
-#: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
+#: ../globaltime/gt_prefs.c:265
+#: ../globaltime/gt_prefs.c:266
msgid "NEW"
msgstr "NOVÁ"
@@ -75,7 +73,8 @@ msgstr "Smazání posledních hodin není možné."
msgid "update this clock"
msgstr "aktualizovat tyto hodiny"
-#: ../globaltime/gt_prefs.c:521 ../globaltime/gt_prefs.c:1034
+#: ../globaltime/gt_prefs.c:521
+#: ../globaltime/gt_prefs.c:1034
msgid "add new empty clock"
msgstr "přidat nové prázdné hodiny"
@@ -107,7 +106,8 @@ msgstr "přesunout tyto hodiny na konec"
msgid "set the timezone of this clock to be local timezone"
msgstr "nastavit časové pásmo těchto hodin na místní"
-#: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
+#: ../globaltime/gt_prefs.c:568
+#: ../globaltime/gt_prefs.c:1042
msgid "close window and exit"
msgstr "zavřít okno a ukončit"
@@ -137,7 +137,8 @@ msgid "Text Formatting"
msgstr "Formátování textu"
#. ------------------------background-------------------------
-#: ../globaltime/gt_prefs.c:649 ../globaltime/gt_prefs.c:856
+#: ../globaltime/gt_prefs.c:649
+#: ../globaltime/gt_prefs.c:856
msgid "Background color:"
msgstr "Barva pozadí:"
@@ -145,22 +146,31 @@ msgstr "Barva pozadí:"
msgid "Click to change background colour for clock"
msgstr "Klikněte pro změnu barvy pozadí hodin"
-#: ../globaltime/gt_prefs.c:665 ../globaltime/gt_prefs.c:697
-#: ../globaltime/gt_prefs.c:729 ../globaltime/gt_prefs.c:762
-#: ../globaltime/gt_prefs.c:796 ../globaltime/gt_prefs.c:826
-#: ../globaltime/gt_prefs.c:872 ../globaltime/gt_prefs.c:905
-#: ../globaltime/gt_prefs.c:938 ../globaltime/gt_prefs.c:972
+#: ../globaltime/gt_prefs.c:665
+#: ../globaltime/gt_prefs.c:697
+#: ../globaltime/gt_prefs.c:729
+#: ../globaltime/gt_prefs.c:762
+#: ../globaltime/gt_prefs.c:796
+#: ../globaltime/gt_prefs.c:826
+#: ../globaltime/gt_prefs.c:872
+#: ../globaltime/gt_prefs.c:905
+#: ../globaltime/gt_prefs.c:938
+#: ../globaltime/gt_prefs.c:972
msgid "Use default"
msgstr "Použít výchozí"
-#: ../globaltime/gt_prefs.c:670 ../globaltime/gt_prefs.c:702
-#: ../globaltime/gt_prefs.c:735 ../globaltime/gt_prefs.c:768
-#: ../globaltime/gt_prefs.c:802 ../globaltime/gt_prefs.c:832
+#: ../globaltime/gt_prefs.c:670
+#: ../globaltime/gt_prefs.c:702
+#: ../globaltime/gt_prefs.c:735
+#: ../globaltime/gt_prefs.c:768
+#: ../globaltime/gt_prefs.c:802
+#: ../globaltime/gt_prefs.c:832
msgid "Cross this to use default instead of selected value"
msgstr "Zaškrtněte pro použití vybrané hodnoty namísto výchozí"
#. ------------------------foreground-------------------------
-#: ../globaltime/gt_prefs.c:681 ../globaltime/gt_prefs.c:889
+#: ../globaltime/gt_prefs.c:681
+#: ../globaltime/gt_prefs.c:889
msgid "Foreground (=text) color:"
msgstr "Barva popředí (textu):"
@@ -169,7 +179,8 @@ msgid "Click to change foreground colour for clock"
msgstr "Klikněte pro změnu barvy popředí hodin"
#. ------------------------name font-------------------------
-#: ../globaltime/gt_prefs.c:713 ../globaltime/gt_prefs.c:922
+#: ../globaltime/gt_prefs.c:713
+#: ../globaltime/gt_prefs.c:922
msgid "Font for name of clock:"
msgstr "Písmo pro název hodin:"
@@ -178,7 +189,8 @@ msgid "Click to change font for clock name"
msgstr "Klikněte pro změnu písma názvu hodin"
#. ------------------------time font-------------------------
-#: ../globaltime/gt_prefs.c:746 ../globaltime/gt_prefs.c:956
+#: ../globaltime/gt_prefs.c:746
+#: ../globaltime/gt_prefs.c:956
msgid "Font for time of clock:"
msgstr "Písmo pro čas hodin:"
@@ -204,7 +216,8 @@ msgstr "Výchozí formátování textu"
msgid "Click to change default background colour for clocks"
msgstr "Klikněte pro změnu výchozí barvy pozadí hodin"
-#: ../globaltime/gt_prefs.c:877 ../globaltime/gt_prefs.c:910
+#: ../globaltime/gt_prefs.c:877
+#: ../globaltime/gt_prefs.c:910
msgid "Cross this to use system default instead of selected color"
msgstr "Zaškrtněte pro použití vybrané barvy místo výchozí"
@@ -216,7 +229,8 @@ msgstr "Klikněte pro změnu výchozí barvy textu hodin"
msgid "Click to change default font for clock name"
msgstr "Klikněte pro změnu výchozího písma hodin"
-#: ../globaltime/gt_prefs.c:944 ../globaltime/gt_prefs.c:978
+#: ../globaltime/gt_prefs.c:944
+#: ../globaltime/gt_prefs.c:978
msgid "Cross this to use system default font instead of selected font"
msgstr "Zaškrtněte pro použití výchozího systémového písma místo vybraného"
@@ -288,45 +302,53 @@ msgid "Local timezone:"
msgstr "Místní časové pásmo:"
#: ../globaltime/timezone_selection.c:101
-#: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
+#: ../panel-plugin/timezone_selection.c:102
+#: ../src/timezone_selection.c:102
msgid " Other"
msgstr " Jiný"
#: ../globaltime/timezone_selection.c:156
-#: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
+#: ../panel-plugin/timezone_selection.c:157
+#: ../src/timezone_selection.c:168
#, c-format
msgid "%d hour %d mins"
msgstr "%d hodin %d minut"
#: ../globaltime/timezone_selection.c:159
-#: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
+#: ../panel-plugin/timezone_selection.c:160
+#: ../src/timezone_selection.c:171
#, c-format
msgid "%d hour"
msgstr "%d hodin"
#: ../globaltime/timezone_selection.c:161
-#: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
+#: ../panel-plugin/timezone_selection.c:162
+#: ../src/timezone_selection.c:173
#, c-format
msgid "%d mins"
msgstr "%d minut"
#: ../globaltime/timezone_selection.c:167
-#: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
+#: ../panel-plugin/timezone_selection.c:168
+#: ../src/timezone_selection.c:179
msgid "backward"
msgstr "zpět"
#: ../globaltime/timezone_selection.c:170
-#: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
+#: ../panel-plugin/timezone_selection.c:171
+#: ../src/timezone_selection.c:182
msgid "forward"
msgstr "vpřed"
#: ../globaltime/timezone_selection.c:194
-#: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
+#: ../panel-plugin/timezone_selection.c:195
+#: ../src/timezone_selection.c:206
msgid "not changed"
msgstr "nezměněno"
#: ../globaltime/timezone_selection.c:195
-#: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
+#: ../panel-plugin/timezone_selection.c:196
+#: ../src/timezone_selection.c:207
msgid "not changing"
msgstr "nemění se"
@@ -334,30 +356,36 @@ msgstr "nemění se"
#: ../globaltime/timezone_selection.c:247
#: ../globaltime/timezone_selection.c:252
#: ../panel-plugin/timezone_selection.c:248
-#: ../panel-plugin/timezone_selection.c:253 ../src/appointment.c:2610
-#: ../src/timezone_selection.c:259 ../src/timezone_selection.c:264
+#: ../panel-plugin/timezone_selection.c:253
+#: ../src/appointment.c:2610
+#: ../src/timezone_selection.c:259
+#: ../src/timezone_selection.c:264
msgid "Location"
msgstr "Umístění"
#: ../globaltime/timezone_selection.c:258
-#: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
+#: ../panel-plugin/timezone_selection.c:259
+#: ../src/timezone_selection.c:270
msgid "GMT Offset"
msgstr "Rozdíl proti času GMT"
#: ../globaltime/timezone_selection.c:264
-#: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
+#: ../panel-plugin/timezone_selection.c:265
+#: ../src/timezone_selection.c:276
msgid "Previous/Next Change"
msgstr "Předchozí nebo další změna"
#: ../globaltime/timezone_selection.c:269
-#: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
+#: ../panel-plugin/timezone_selection.c:270
+#: ../src/timezone_selection.c:281
msgid "Country"
msgstr "Země"
#: ../globaltime/timezone_selection.c:299
#: ../globaltime/timezone_selection.c:309
#: ../panel-plugin/timezone_selection.c:300
-#: ../panel-plugin/timezone_selection.c:310 ../src/timezone_selection.c:311
+#: ../panel-plugin/timezone_selection.c:310
+#: ../src/timezone_selection.c:311
#: ../src/timezone_selection.c:321
msgid "Pick timezone"
msgstr "Zvolte časové pásmo"
@@ -365,7 +393,8 @@ msgstr "Zvolte časové pásmo"
#: ../globaltime/timezone_selection.c:302
#: ../globaltime/timezone_selection.c:312
#: ../panel-plugin/timezone_selection.c:303
-#: ../panel-plugin/timezone_selection.c:313 ../src/timezone_selection.c:314
+#: ../panel-plugin/timezone_selection.c:313
+#: ../src/timezone_selection.c:314
#: ../src/timezone_selection.c:324
msgid "Change mode"
msgstr "Režim změny"
@@ -375,8 +404,10 @@ msgstr "Režim změny"
#: ../globaltime/timezone_selection.c:352
#: ../panel-plugin/timezone_selection.c:304
#: ../panel-plugin/timezone_selection.c:314
-#: ../panel-plugin/timezone_selection.c:353 ../src/timezone_selection.c:315
-#: ../src/timezone_selection.c:325 ../src/timezone_selection.c:364
+#: ../panel-plugin/timezone_selection.c:353
+#: ../src/timezone_selection.c:315
+#: ../src/timezone_selection.c:325
+#: ../src/timezone_selection.c:364
msgid "UTC"
msgstr "UTC"
@@ -384,12 +415,15 @@ msgstr "UTC"
#: ../globaltime/timezone_selection.c:304
#: ../globaltime/timezone_selection.c:357
#: ../panel-plugin/timezone_selection.c:305
-#: ../panel-plugin/timezone_selection.c:358 ../src/parameters.c:512
-#: ../src/timezone_selection.c:316 ../src/timezone_selection.c:369
+#: ../panel-plugin/timezone_selection.c:358
+#: ../src/parameters.c:512
+#: ../src/timezone_selection.c:316
+#: ../src/timezone_selection.c:369
msgid "floating"
msgstr "plovoucí"
-#: ../globaltime/globaltime.desktop.in.h:1 ../src/tray_icon.c:440
+#: ../globaltime/globaltime.desktop.in.h:1
+#: ../src/tray_icon.c:440
msgid "Globaltime"
msgstr "Globální čas"
@@ -466,18 +500,8 @@ msgid "fix time after suspend/hibernate"
msgstr "opravit nastavení času po přechodu z režimu spánku nebo hibernace"
#: ../panel-plugin/oc_config.c:415
-msgid ""
-"You only need this if you do short term (less than 5 hours) suspend or "
-"hibernate and your visible time does not include seconds. Under these "
-"circumstances it is possible that Orageclock shows time inaccurately unless "
-"you have this selected. (Selecting this prevents cpu and interrupt saving "
-"features from working.)"
-msgstr ""
-"Tuto akci je nutné provést pouze v případě krátkodobě přepnutí do režimu "
-"spánku nebo hibernace a v případě, že viditelný čas neobsahuje sekundy. Za "
-"těchto podmínek je možné, že hodiny aplikace Orage zobrazují čas nepřesně, "
-"dokud nevyberete tuto volbu. (Vybráním této volby bráníte správné činnosti "
-"úsporných vlastností procesoru.)"
+msgid "You only need this if you do short term (less than 5 hours) suspend or hibernate and your visible time does not include seconds. Under these circumstances it is possible that Orageclock shows time inaccurately unless you have this selected. (Selecting this prevents cpu and interrupt saving features from working.)"
+msgstr "Tuto akci je nutné provést pouze v případě krátkodobě přepnutí do režimu spánku nebo hibernace a v případě, že viditelný čas neobsahuje sekundy. Za těchto podmínek je možné, že hodiny aplikace Orage zobrazují čas nepřesně, dokud nevyberete tuto volbu. (Vybráním této volby bráníte správné činnosti úsporných vlastností procesoru.)"
#: ../panel-plugin/oc_config.c:432
msgid ""
@@ -522,14 +546,15 @@ msgid "Maintainer"
msgstr "Správce"
#: ../src/about-xfcalendar.c:47
-#, fuzzy
msgid "Manage your time with Orage"
-msgstr "Uspořádejte si svůj čas s Xfce4"
+msgstr "Řiďte si svůj čas v aplikaci Orage"
#. if (gtk_toggle_button_get_active(
#. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
#. end time
-#: ../src/appointment.c:312 ../src/appointment.c:352 ../src/appointment.c:2639
+#: ../src/appointment.c:312
+#: ../src/appointment.c:352
+#: ../src/appointment.c:2639
msgid "End"
msgstr "Konec"
@@ -537,13 +562,16 @@ msgstr "Konec"
msgid "Due"
msgstr "Kvůli"
-#: ../src/appointment.c:471 ../src/mainbox.c:763
+#: ../src/appointment.c:471
+#: ../src/mainbox.c:763
msgid "Orage"
msgstr "Orage - kalendář"
#. to avoid timing problems when updating entry
#. Create file chooser
-#: ../src/appointment.c:650 ../src/interface.c:276 ../src/parameters.c:411
+#: ../src/appointment.c:650
+#: ../src/interface.c:276
+#: ../src/parameters.c:411
msgid "Select a file..."
msgstr "Vyberte soubor..."
@@ -551,7 +579,8 @@ msgstr "Vyberte soubor..."
msgid "Sound Files"
msgstr "Zvukové soubory"
-#: ../src/appointment.c:665 ../src/interface.c:289
+#: ../src/appointment.c:665
+#: ../src/interface.c:289
msgid "All Files"
msgstr "Všechny soubory"
@@ -559,7 +588,9 @@ msgstr "Všechny soubory"
msgid "The appointment information has been modified."
msgstr "Informace o schůzce byla změněna."
-#: ../src/appointment.c:718 ../src/appointment.c:1165 ../src/event-list.c:917
+#: ../src/appointment.c:718
+#: ../src/appointment.c:1165
+#: ../src/event-list.c:917
msgid "Do you want to continue?"
msgstr "Chcete pokračovat?"
@@ -567,7 +598,8 @@ msgstr "Chcete pokračovat?"
msgid "The end of this appointment is earlier than the beginning."
msgstr "Konec schůzky je dříve než její začátek."
-#: ../src/appointment.c:1005 ../src/appointment.c:1763
+#: ../src/appointment.c:1005
+#: ../src/appointment.c:1763
msgid "Not set"
msgstr "Nenastaveno"
@@ -610,8 +642,11 @@ msgstr "Nová schůzka - Orage"
#. File menu stuff
#. ********* File menu *********
#. File menu
-#: ../src/appointment.c:2330 ../src/day-view.c:254 ../src/event-list.c:1007
-#: ../src/interface.c:762 ../src/mainbox.c:279
+#: ../src/appointment.c:2330
+#: ../src/day-view.c:254
+#: ../src/event-list.c:1007
+#: ../src/interface.c:762
+#: ../src/mainbox.c:279
msgid "_File"
msgstr "_Soubor"
@@ -619,7 +654,8 @@ msgstr "_Soubor"
msgid "Sav_e and close"
msgstr "Uložit _a zavřít"
-#: ../src/appointment.c:2349 ../src/event-list.c:1013
+#: ../src/appointment.c:2349
+#: ../src/event-list.c:1013
msgid "D_uplicate"
msgstr "D_uplikovat"
@@ -635,11 +671,13 @@ msgstr "Uložit a zavřít"
msgid "Revert"
msgstr "Obnovit původní"
-#: ../src/appointment.c:2545 ../src/event-list.c:1098
+#: ../src/appointment.c:2545
+#: ../src/event-list.c:1098
msgid "Duplicate"
msgstr "Duplikovat"
-#: ../src/appointment.c:2550 ../src/event-list.c:1100
+#: ../src/appointment.c:2550
+#: ../src/event-list.c:1100
msgid "Delete"
msgstr "Smazat"
@@ -660,7 +698,8 @@ msgstr "Hlavní"
msgid "Type "
msgstr "Typ "
-#: ../src/appointment.c:2580 ../src/event-list.c:1151
+#: ../src/appointment.c:2580
+#: ../src/event-list.c:1151
msgid "Event"
msgstr "Událost"
@@ -672,7 +711,8 @@ msgstr ""
"Událost, která nastane. Například:\n"
"Schůzka, narozeniny nebo televizní pořad."
-#: ../src/appointment.c:2586 ../src/event-list.c:1171
+#: ../src/appointment.c:2586
+#: ../src/event-list.c:1171
msgid "Todo"
msgstr "Úkoly"
@@ -684,7 +724,8 @@ msgstr ""
"Něco, co byste měli udělat. Například:\n"
"Umyjte si auto nebo otestujte novou verzi aplikace Orage."
-#: ../src/appointment.c:2592 ../src/event-list.c:1184
+#: ../src/appointment.c:2592
+#: ../src/event-list.c:1184
msgid "Journal"
msgstr "Žurnál"
@@ -706,7 +747,9 @@ msgid "All day event"
msgstr "Celodenní událost"
#. start time
-#: ../src/appointment.c:2624 ../src/appointment.c:3287 ../src/day-view.c:682
+#: ../src/appointment.c:2624
+#: ../src/appointment.c:3287
+#: ../src/day-view.c:682
msgid "Start"
msgstr "Začátek"
@@ -718,15 +761,21 @@ msgstr "Nastavit"
msgid "Duration"
msgstr "Trvání"
-#: ../src/appointment.c:2669 ../src/appointment.c:2857 ../src/reminder.c:745
+#: ../src/appointment.c:2669
+#: ../src/appointment.c:2857
+#: ../src/reminder.c:745
msgid "days"
msgstr "dnů"
-#: ../src/appointment.c:2671 ../src/appointment.c:2859 ../src/reminder.c:747
+#: ../src/appointment.c:2671
+#: ../src/appointment.c:2859
+#: ../src/reminder.c:747
msgid "hours"
msgstr "hodin"
-#: ../src/appointment.c:2673 ../src/appointment.c:2861 ../src/reminder.c:749
+#: ../src/appointment.c:2673
+#: ../src/appointment.c:2861
+#: ../src/reminder.c:749
msgid "mins"
msgstr "minut"
@@ -736,7 +785,8 @@ msgid "Availability"
msgstr "Dostupnost"
#. completed (only for TODO)
-#: ../src/appointment.c:2693 ../src/appointment.c:3293
+#: ../src/appointment.c:2693
+#: ../src/appointment.c:3293
msgid "Completed"
msgstr "Dokončeno"
@@ -750,12 +800,8 @@ msgid "Categories"
msgstr "Kategorie"
#: ../src/appointment.c:2729
-msgid ""
-"This is special category, which can be used to color this appointment in "
-"list views."
-msgstr ""
-"Toto je speciální kategorie, kterou lze použít k obarvení této schůzky v "
-"pohledu na jejich seznam."
+msgid "This is special category, which can be used to color this appointment in list views."
+msgstr "Toto je speciální kategorie, kterou lze použít k obarvení této schůzky v pohledu na jejich seznam."
#: ../src/appointment.c:2734
msgid "update colors for categories."
@@ -780,8 +826,7 @@ msgid ""
"\n"
"These are converted only later when they are seen:\n"
" <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
msgstr ""
"Tyto zjednodušené příkazy pracují okamžitě:\n"
" <D> vkládá současné datum ve formátu místního data\n"
@@ -790,8 +835,7 @@ msgstr ""
"\n"
"Tyto hodnoty se později konvertují pouze pokud se:\n"
" <&Ynnnn> překládá na současný rok minus nnnn.\n"
-"(Tuto vlastnost lze použít například pro připomenutí narozenin a informaci o "
-"věku osoby.)"
+"(Tuto vlastnost lze použít například pro připomenutí narozenin a informaci o věku osoby.)"
#: ../src/appointment.c:2840
msgid "Before Start"
@@ -835,19 +879,16 @@ msgid "Persistent alarm"
msgstr "Trvalá výstraha"
#: ../src/appointment.c:2885
-msgid ""
-"Select this if you want Orage to remind you even if it has not been active "
-"when the alarm happened."
-msgstr ""
-"Vyberte tuto možnost, chcete-li, aby vám aplikace Orage připomněla událost, "
-"i když v tu dobu nebyla aktivní"
+msgid "Select this if you want Orage to remind you even if it has not been active when the alarm happened."
+msgstr "Vyberte tuto možnost, chcete-li, aby vám aplikace Orage připomněla událost, i když v tu dobu nebyla aktivní"
#. **** Audio Alarm ****
#: ../src/appointment.c:2894
msgid "Sound"
msgstr "Zvuk"
-#: ../src/appointment.c:2898 ../src/appointment.c:3019
+#: ../src/appointment.c:2898
+#: ../src/appointment.c:3019
msgid "Use"
msgstr "Použít"
@@ -859,7 +900,8 @@ msgstr "Chcete-li povolit akustickou výstrahu, vyberte tuto možnost"
msgid "Repeat alarm sound"
msgstr "Opakovat výstražný zvuk"
-#: ../src/appointment.c:2933 ../src/appointment.c:3235
+#: ../src/appointment.c:2933
+#: ../src/appointment.c:3235
msgid "times"
msgstr "krát"
@@ -1012,8 +1054,7 @@ msgid ""
" Every Saturday and Sunday or \n"
" First Tuesday every month"
msgstr ""
-"Použijte tuto volbu, chcete-li nastait složitější časové udaje, jako "
-"například:\n"
+"Použijte tuto volbu, chcete-li nastait složitější časové udaje, jako například:\n"
" Každou sobotu a neděli nebo \n"
" První úterý v měsíci"
@@ -1087,24 +1128,16 @@ msgid "TODO base"
msgstr "Seznam úkolů TODO"
#: ../src/appointment.c:3297
-msgid ""
-"TODO reoccurs regularly starting on start time and repeating after each "
-"interval no matter when it was last completed"
-msgstr ""
-"Seznam úkolů TODO opakovaně začíná v čase zahájení a opakuje se v každém "
-"intervalu, bez ověření zda byl dokončen"
+msgid "TODO reoccurs regularly starting on start time and repeating after each interval no matter when it was last completed"
+msgstr "Seznam úkolů TODO opakovaně začíná v čase zahájení a opakuje se v každém intervalu, bez ověření zda byl dokončen"
#: ../src/appointment.c:3299
msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
msgstr ""
-"Opakování seznamu úkolů TODO je založeno na čase dokončení a opakuje se po "
-"intervalu vypočítaném z předchozího času dokončení.\n"
-"(Historii seznamu úkolů TODO nelze vypsat, protože opakování úkolu se mění "
-"po každém dokončení.)"
+"Opakování seznamu úkolů TODO je založeno na čase dokončení a opakuje se po intervalu vypočítaném z předchozího času dokončení.\n"
+"(Historii seznamu úkolů TODO nelze vypsat, protože opakování úkolu se mění po každém dokončení.)"
#. exceptions
#: ../src/appointment.c:3306
@@ -1114,8 +1147,7 @@ msgstr "Výjimky"
#: ../src/appointment.c:3319
msgid ""
"Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
"Remove by clicking the data."
msgstr ""
"Více dnů s výjimkami přidáte kliknutím na dny v kalendáři níže.\n"
@@ -1135,12 +1167,8 @@ msgid "Add included time (+)"
msgstr "Přidat zahrnutý čas (+)"
#: ../src/appointment.c:3334
-msgid ""
-"Included times have same timezone than start time, but they may have "
-"different time"
-msgstr ""
-"Zahrnuté časy jsou ve stejné časové zóně jako počáteční čas, ale mohou mít "
-"jiný čas"
+msgid "Included times have same timezone than start time, but they may have different time"
+msgstr "Zahrnuté časy jsou ve stejné časové zóně jako počáteční čas, ale mohou mít jiný čas"
#. calendars showing the action days
#: ../src/appointment.c:3351
@@ -1149,37 +1177,48 @@ msgstr "Data akcí"
#. ********* View menu *********
#. View menu
-#: ../src/day-view.c:264 ../src/event-list.c:1030 ../src/mainbox.c:305
+#: ../src/day-view.c:264
+#: ../src/event-list.c:1030
+#: ../src/mainbox.c:305
msgid "_View"
msgstr "_Zobrazit"
#. ********* Go menu *********
-#: ../src/day-view.c:278 ../src/event-list.c:1049
+#: ../src/day-view.c:278
+#: ../src/event-list.c:1049
msgid "_Go"
msgstr "_Přejít"
-#: ../src/day-view.c:319 ../src/event-list.c:1096
+#: ../src/day-view.c:319
+#: ../src/event-list.c:1096
msgid "New"
msgstr "Nový"
-#: ../src/day-view.c:324 ../src/event-list.c:1105
+#: ../src/day-view.c:324
+#: ../src/event-list.c:1105
msgid "Back"
msgstr "Zpět"
-#: ../src/day-view.c:326 ../src/event-list.c:1107 ../src/functions.c:139
+#: ../src/day-view.c:326
+#: ../src/event-list.c:1107
+#: ../src/functions.c:139
#: ../src/tray_icon.c:400
msgid "Today"
msgstr "Dnes"
-#: ../src/day-view.c:328 ../src/event-list.c:1109
+#: ../src/day-view.c:328
+#: ../src/event-list.c:1109
msgid "Forward"
msgstr "Vpřed"
-#: ../src/day-view.c:333 ../src/event-list.c:1114
+#: ../src/day-view.c:333
+#: ../src/event-list.c:1114
msgid "Refresh"
msgstr "Aktualizovvat"
-#: ../src/day-view.c:338 ../src/event-list.c:1121 ../src/interface.c:804
+#: ../src/day-view.c:338
+#: ../src/event-list.c:1121
+#: ../src/interface.c:804
msgid "Close"
msgstr "Zavřít"
@@ -1200,7 +1239,8 @@ msgstr "Orage - pohled na den"
msgid "All day"
msgstr "Celý den"
-#: ../src/event-list.c:578 ../src/event-list.c:1267
+#: ../src/event-list.c:578
+#: ../src/event-list.c:1267
msgid "Time"
msgstr "Čas"
@@ -1354,11 +1394,8 @@ msgstr "Sestavit seznam výstrah: Přidáno %d výstrah. Zpracováno %d výstrah
#: ../src/ical-code.c:2936
#, c-format
-msgid ""
-"\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\tBylo nalezeno %d výstrah, z nichž %d je aktivních. (Bylo prohledáno %d "
-"opakujících se výstrah.)"
+msgid "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
+msgstr "\tBylo nalezeno %d výstrah, z nichž %d je aktivních. (Bylo prohledáno %d opakujících se výstrah.)"
#: ../src/ical-expimp.c:141
msgid "Starting import file preprocessing"
@@ -1424,7 +1461,8 @@ msgstr "Export"
msgid "Write to file:"
msgstr "Zapsat do souboru:"
-#: ../src/interface.c:1029 ../src/interface.c:1041
+#: ../src/interface.c:1029
+#: ../src/interface.c:1041
msgid "Select"
msgstr "Vybrat"
@@ -1495,19 +1533,23 @@ msgstr "Soubory aplikace Orage"
msgid "Orage main calendar file"
msgstr "Hlavní soubor kalendáře aplikace Orage"
-#: ../src/interface.c:1125 ../src/interface.c:1190
+#: ../src/interface.c:1125
+#: ../src/interface.c:1190
msgid "Current file"
msgstr "Aktuální soubor"
-#: ../src/interface.c:1132 ../src/interface.c:1197
+#: ../src/interface.c:1132
+#: ../src/interface.c:1197
msgid "New file"
msgstr "Nový soubor"
-#: ../src/interface.c:1148 ../src/interface.c:1214
+#: ../src/interface.c:1148
+#: ../src/interface.c:1214
msgid "Action options"
msgstr "Dostupné akce"
-#: ../src/interface.c:1151 ../src/interface.c:1217
+#: ../src/interface.c:1151
+#: ../src/interface.c:1217
msgid "Rename"
msgstr "Přejmenovat"
@@ -1521,7 +1563,8 @@ msgstr ""
"Nezasahuje do vnějšího systémů souborů.\n"
"Nový soubor již musí existovat."
-#: ../src/interface.c:1159 ../src/interface.c:1222
+#: ../src/interface.c:1159
+#: ../src/interface.c:1222
msgid "Copy"
msgstr "Kopírovat"
@@ -1531,7 +1574,8 @@ msgstr ""
"Aktuální soubor se zkopíruje a\n"
"v původním umístění zůstane nezměněn."
-#: ../src/interface.c:1167 ../src/interface.c:1227
+#: ../src/interface.c:1167
+#: ../src/interface.c:1227
msgid "Move"
msgstr "Přesunout"
@@ -1567,27 +1611,23 @@ msgstr "Pouze pro čtení"
#: ../src/interface.c:1289
msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
msgstr ""
-"Tuto možnost nastavte, chcete-li si být jisti, že tento aplikace Orage tento "
-"soubor nikdy nepozmění.\n"
-"Zapamatujte si, že pozměněním externích souborů je můžete učinit "
-"nekompatibilními s původními nástroji, v nichž byly vytvořeny!"
+"Tuto možnost nastavte, chcete-li si být jisti, že tento aplikace Orage tento soubor nikdy nepozmění.\n"
+"Zapamatujte si, že pozměněním externích souborů je můžete učinit nekompatibilními s původními nástroji, v nichž byly vytvořeny!"
#: ../src/interface.c:1303
msgid "Exchange data - Orage"
msgstr "Správa datových souborů - Orage"
#: ../src/main.c:193
-#, fuzzy, c-format
+#, c-format
msgid ""
"\tThis is %s version %s\n"
"\n"
msgstr ""
-"\tToto je %s verze %s pro prostředí Xfce %s\n"
+"\tToto je %s verze %s\n"
"\n"
#: ../src/main.c:195
@@ -1677,9 +1717,7 @@ msgstr "--preferences (-p) \tzobrazí formulář možnosti\n"
#: ../src/main.c:236
#, c-format
msgid "--toggle (-t) \t\tmake orage visible/unvisible\n"
-msgstr ""
-"--toggle (-t) \t\tpřepne aplikaci orage do viditelného nebo neviditelného "
-"stavu\n"
+msgstr "--toggle (-t) \t\tpřepne aplikaci orage do viditelného nebo neviditelného stavu\n"
#: ../src/main.c:237
#, c-format
@@ -1703,12 +1741,8 @@ msgstr "\tv aplikace orage nebyla sestavena s podporou dbus. \n"
#: ../src/main.c:243
#, c-format
-msgid ""
-"\twithout dbus [files] and foreign file options(-a & -r) can only be used "
-"when starting orage \n"
-msgstr ""
-"\tbez podpory dbus se mohou [soubory] a volby externích souborů (-a a -r) "
-"použít pouze při spouštění aplikace orage \n"
+msgid "\twithout dbus [files] and foreign file options(-a & -r) can only be used when starting orage \n"
+msgstr "\tbez podpory dbus se mohou [soubory] a volby externích souborů (-a a -r) použít pouze při spouštění aplikace orage \n"
#: ../src/main.c:387
#, c-format
@@ -1743,9 +1777,8 @@ msgid "Select _Today"
msgstr "_Přejít na dnešní den"
#: ../src/mainbox.c:323
-#, fuzzy
msgid "Show _Globaltime"
-msgstr "Globální čas"
+msgstr "Zobrazit _globální čas"
#. Help menu
#: ../src/mainbox.c:327
@@ -1803,7 +1836,6 @@ msgid "<b>Events for %s - %s:</b>"
msgstr "<b>Události pro %s - %s:</b>"
#: ../src/parameters.c:492
-#, fuzzy
msgid "Main settings"
msgstr "Hlavní nastavení"
@@ -1836,9 +1868,8 @@ msgid "This command is given to shell to make sound in alarms."
msgstr "Tento příkaz je předán shellu za účelem přehrání zvuku výstrah."
#: ../src/parameters.c:579
-#, fuzzy
msgid "Display settings"
-msgstr "Zobrazené"
+msgstr "Zobrazit nastavení"
#: ../src/parameters.c:587
msgid "Calendar main window"
@@ -1878,12 +1909,11 @@ msgstr "0 = nezobrazovat seznam událostí"
#: ../src/parameters.c:650
msgid "Show on all desktops"
-msgstr ""
+msgstr "Zobrazit na všech pracovních plochách"
#: ../src/parameters.c:657
-#, fuzzy
msgid "Keep on top"
-msgstr "Nastavit \"Vždy nahoře\""
+msgstr "Vždy navrchu"
#: ../src/parameters.c:664
msgid "Show in taskbar"
@@ -1914,23 +1944,20 @@ msgid "Minimized"
msgstr "Minimalizovaný"
#: ../src/parameters.c:767
-#, fuzzy
msgid "Extra settings"
msgstr "Další nastavení"
#: ../src/parameters.c:775
-#, fuzzy
msgid "On Calendar Window Open"
-msgstr "Hlavní okno kalendáře"
+msgstr "Při otevření okna kalendáře"
#: ../src/parameters.c:794
-#, fuzzy
msgid "Select Today's Date"
-msgstr "_Přejít na dnešní den"
+msgstr "Vybrat dnešní datum"
#: ../src/parameters.c:807
msgid "Select Previously Selected Date"
-msgstr ""
+msgstr "Vybrat předchozí zvolené datum"
#: ../src/parameters.c:824
msgid "Use dynamic tray icon"
@@ -1965,12 +1992,8 @@ msgid "Number of extra days to show in event list"
msgstr "Počet zbývajících dní ke zobrazení v seznau událostí"
#: ../src/parameters.c:894
-msgid ""
-"This is just the default value, you can change it in the actual eventlist "
-"window."
-msgstr ""
-"Toto je pouze výchozí hodnota, kterou můžete změnit v okně seznamu "
-"aktuálních událostí."
+msgid "This is just the default value, you can change it in the actual eventlist window."
+msgstr "Toto je pouze výchozí hodnota, kterou můžete změnit v okně seznamu aktuálních událostí."
#: ../src/parameters.c:911
msgid "Orage Preferences"
@@ -2014,7 +2037,8 @@ msgstr "Stiskněte <Spustit> pro opětovné připomenutí po zadaném čase:"
msgid "Next active alarms:"
msgstr "Následující aktivní výstrahy:"
-#: ../src/reminder.c:1074 ../src/reminder.c:1079
+#: ../src/reminder.c:1074
+#: ../src/reminder.c:1079
#, c-format
msgid ""
"\n"
diff --git a/po/de.po b/po/de.po
index 487981a..2fef2b5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
# Fabian Nowak <timystery at arcor.de>, 2005-2008, 2010.
# Nico Schümann <nico at prog.nico22.de>, 2007.
# Simon Schneider <simon at schneiderimtal.de>, 2009
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: Orage 4.5.9.6-svn\n"
@@ -54,10 +54,8 @@ msgid "adjust to change hour"
msgstr "Einstellen, um Stunde zu ändern"
#: ../globaltime/globaltime.c:496
-msgid ""
-"adjust to change minute. Click arrows with button 2 to change only 1 minute."
-msgstr ""
-"Minuten einstellen. Klicken Sie die Pfeile mit Taste 2 an, um nur 1 Minute "
+msgid "adjust to change minute. Click arrows with button 2 to change only 1 minute."
+msgstr "Minuten einstellen. Klicken Sie die Pfeile mit Taste 2 an, um nur 1 Minute "
#: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
msgid "NEW"
@@ -69,7 +67,7 @@ msgstr "NEUE KOPIE"
#: ../globaltime/gt_prefs.c:310
msgid "Not possible to delete the last clock."
-msgstr "Es ist unmöglich, die letzte Uhr zu löschen."
+msgstr "Die letzte Uhr kann nicht gelöscht werden."
#: ../globaltime/gt_prefs.c:516
msgid "update this clock"
@@ -81,7 +79,7 @@ msgstr "Neue, leere Uhr hinzufügen"
#: ../globaltime/gt_prefs.c:526
msgid "add new clock using this clock as model"
-msgstr "Neue Uhr nach Vorlage dieser Uhr erstellen"
+msgstr "Neue Uhr auf Basis dieser Uhr erstellen"
#: ../globaltime/gt_prefs.c:531
msgid "delete this clock"
@@ -89,7 +87,7 @@ msgstr "Diese Uhr löschen"
#: ../globaltime/gt_prefs.c:539
msgid "move this clock first"
-msgstr "Diese Uhr zuerst verschieben"
+msgstr "Diese Uhr an die erste Position verschieben"
#: ../globaltime/gt_prefs.c:544
msgid "move this clock left"
@@ -101,11 +99,11 @@ msgstr "Diese Uhr nach rechts verschieben"
#: ../globaltime/gt_prefs.c:554
msgid "move this clock last"
-msgstr "Diese Uhr zuletzt verschieben"
+msgstr "Diese Uhr an die letzte Position verschieben"
#: ../globaltime/gt_prefs.c:562
msgid "set the timezone of this clock to be local timezone"
-msgstr "Zeitzohne dieser Uhr auf Lokalzeit setzen"
+msgstr "Zeitzone dieser Uhr auf Lokalzeit setzen"
#: ../globaltime/gt_prefs.c:568 ../globaltime/gt_prefs.c:1042
msgid "close window and exit"
@@ -466,19 +464,8 @@ msgid "fix time after suspend/hibernate"
msgstr "Zeit korrigieren nach Ruhemodus/Tiefschlaf"
#: ../panel-plugin/oc_config.c:415
-msgid ""
-"You only need this if you do short term (less than 5 hours) suspend or "
-"hibernate and your visible time does not include seconds. Under these "
-"circumstances it is possible that Orageclock shows time inaccurately unless "
-"you have this selected. (Selecting this prevents cpu and interrupt saving "
-"features from working.)"
-msgstr ""
-"Sie benötigen dies nur, wenn Sie für eine relativ kurze Zeitspanne (weniger "
-"als 5 Stunden) in den Ruhemodus oder Tiefschlaf gehen und Ihre sichtbare "
-"Zeit keine Sekunden enthält. Unter diesen Umständen ist es nämlich möglich, "
-"dass die Uhr von Orage die Zeit etwas verfälscht wiedergibt, wenn Sie dies "
-"nicht ausgewählt haben. (Wählt man dies aus, werden einige Fähigkeiten der "
-"CPU und das Vermeiden von Interrupts nicht mehr funktionieren.)"
+msgid "You only need this if you do short term (less than 5 hours) suspend or hibernate and your visible time does not include seconds. Under these circumstances it is possible that Orageclock shows time inaccurately unless you have this selected. (Selecting this prevents cpu and interrupt saving features from working.)"
+msgstr "Sie benötigen dies nur, wenn Sie für eine relativ kurze Zeitspanne (weniger als 5 Stunden) in den Ruhemodus oder Tiefschlaf gehen und Ihre sichtbare Zeit keine Sekunden enthält. Unter diesen Umständen ist es nämlich möglich, dass die Uhr von Orage die Zeit etwas verfälscht wiedergibt, wenn Sie dies nicht ausgewählt haben. (Wählt man dies aus, werden einige Fähigkeiten der CPU und das Vermeiden von Interrupts nicht mehr funktionieren.)"
#: ../panel-plugin/oc_config.c:432
msgid ""
@@ -492,8 +479,7 @@ msgid ""
"\t%X = local time\t\t\t%x = local date"
msgstr ""
"Diese Programm verwendet die Funktion »strftime«, um die Zeit zu erhalten.\n"
-"Verwenden Sie beliebigen gültigen Code, um die Zeit in dem Format zu "
-"erhalten, das Sie bevorzugen.\n"
+"Verwenden Sie beliebigen gültigen Code, um die Zeit in dem Format zu erhalten, das Sie bevorzugen.\n"
"Einige häufig verwendete Codes sind:\n"
"\t%A = Wochentag\t\t\t%B = Monat\n"
"\t%c = Datum und Zeit\t\t%R = Stunde und Minuten\n"
@@ -514,7 +500,7 @@ msgstr "Uhrzeiteinstellungen für Orage"
#. * %B : full month name
#. * %Y : four digit year
#. * %V : ISO week number
-#.
+#.
#: ../panel-plugin/xfce4-orageclock-plugin.c:623
msgid "%A %d %B %Y/%V"
msgstr "%A, %d. %B %Y (KW %V)"
@@ -582,8 +568,7 @@ msgstr "Dieser Termin existiert nicht."
#: ../src/appointment.c:1644
msgid "It was probably removed, please refresh your screen."
-msgstr ""
-"Er wurde wahrscheinlich entfernt, bitte klicken Sie auf »Aktualisieren«."
+msgstr "Er wurde wahrscheinlich entfernt, bitte klicken Sie auf »Aktualisieren«."
#: ../src/appointment.c:1945
msgid "Current categories"
@@ -752,12 +737,8 @@ msgid "Categories"
msgstr "Rubriken"
#: ../src/appointment.c:2729
-msgid ""
-"This is special category, which can be used to color this appointment in "
-"list views."
-msgstr ""
-"Dies ist die besondere Kategorie, die dazu genutzt werden kann, diesen "
-"Termin in der Listenansicht farbig zu hinterlegen."
+msgid "This is special category, which can be used to color this appointment in list views."
+msgstr "Dies ist die besondere Kategorie, die dazu genutzt werden kann, diesen Termin in der Listenansicht farbig zu hinterlegen."
#: ../src/appointment.c:2734
msgid "update colors for categories."
@@ -782,8 +763,7 @@ msgid ""
"\n"
"These are converted only later when they are seen:\n"
" <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
msgstr ""
"Diese Kurzbefehle haben sofortige Auswirkung:\n"
" <D> fügt das aktuelle Datum im Ortszeitformat ein\n"
@@ -792,8 +772,7 @@ msgstr ""
"\n"
"Diese werden nur dann später konvertiert, wenn auf sie gestoßen wird:\n"
" <&Ynnnn> wird übersetzt in das aktuelle Jahr minus nnnn.\n"
-"(Dies kann z.B. bei Geburtstagserinnerungen eingesetzt werden, um das Alter "
-"der Person zu ermitteln.)"
+"(Dies kann z.B. bei Geburtstagserinnerungen eingesetzt werden, um das Alter der Person zu ermitteln.)"
#: ../src/appointment.c:2840
msgid "Before Start"
@@ -837,12 +816,8 @@ msgid "Persistent alarm"
msgstr "Beständige Erinnerung"
#: ../src/appointment.c:2885
-msgid ""
-"Select this if you want Orage to remind you even if it has not been active "
-"when the alarm happened."
-msgstr ""
-"Wählen Sie diese Option, wenn Orage Sie erinnern soll, auch wenn es zum "
-"Zeitpunkt der Erinnerung nicht aktiv war."
+msgid "Select this if you want Orage to remind you even if it has not been active when the alarm happened."
+msgstr "Wählen Sie diese Option, wenn Orage Sie erinnern soll, auch wenn es zum Zeitpunkt der Erinnerung nicht aktiv war."
#. **** Audio Alarm ****
#: ../src/appointment.c:2894
@@ -913,9 +888,7 @@ msgstr "Anwendung"
#: ../src/appointment.c:3021
msgid "Select this if you want procedure or script alarm"
-msgstr ""
-"Wählen Sie dies aus, um eine Anwendung oder ein Skript bei der Erinnerung "
-"auszuführen."
+msgstr "Wählen Sie dies aus, um eine Anwendung oder ein Skript bei der Erinnerung auszuführen."
#: ../src/appointment.c:3027
msgid ""
@@ -935,8 +908,7 @@ msgstr "<b>Standarderinnerung</b>"
#: ../src/appointment.c:3054
msgid "Store current settings as default alarm"
-msgstr ""
-"Die aktuellen Einstellungen als Standard für zukünfige Erinnerungen speichern"
+msgstr "Die aktuellen Einstellungen als Standard für zukünfige Erinnerungen speichern"
#: ../src/appointment.c:3059
msgid "Set current settings from default alarm"
@@ -1091,25 +1063,17 @@ msgid "TODO base"
msgstr "Basis für Aufgaben"
#: ../src/appointment.c:3297
-msgid ""
-"TODO reoccurs regularly starting on start time and repeating after each "
-"interval no matter when it was last completed"
-msgstr ""
-"Aufgabe tritt regelmäßig auf. Beginnend mit der Startzeit und wiederholt "
-"nach jedem Intervall unabhängig davon, wann sie zuletzt beendet wurde"
+msgid "TODO reoccurs regularly starting on start time and repeating after each interval no matter when it was last completed"
+msgstr "Aufgabe tritt regelmäßig auf. Beginnend mit der Startzeit und wiederholt nach jedem Intervall unabhängig davon, wann sie zuletzt beendet wurde"
#: ../src/appointment.c:3299
msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
msgstr ""
-"Wiederauftreten der Aufgabe hängt von der Zeit der letzten Beendung ab und "
-"wiederholt sich ein Intervall nach der letzten Beendung.\n"
+"Wiederauftreten der Aufgabe hängt von der Zeit der letzten Beendung ab und wiederholt sich ein Intervall nach der letzten Beendung.\n"
"\n"
-"(Beachten Sie, dass Sie nichts über den vergangenen Verlauf der Aufgabe "
-"sagen können, da das Wiederauftreten sich nach jeder Beendigung ändert.)"
+"(Beachten Sie, dass Sie nichts über den vergangenen Verlauf der Aufgabe sagen können, da das Wiederauftreten sich nach jeder Beendigung ändert.)"
#. exceptions
#: ../src/appointment.c:3306
@@ -1119,14 +1083,11 @@ msgstr "Ausnahmen"
#: ../src/appointment.c:3319
msgid ""
"Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
"Remove by clicking the data."
msgstr ""
-"Mehr Ausnahmetermine hinzufügen, indem die Kalendertage unten angeklickt "
-"werden.\n"
-"Eine Ausnahme ist entweder Ausschluss (-) oder Einschluss (+) abhängig von "
-"der auswahl.\n"
+"Mehr Ausnahmetermine hinzufügen, indem die Kalendertage unten angeklickt werden.\n"
+"Eine Ausnahme ist entweder Ausschluss (-) oder Einschluss (+) abhängig von der auswahl.\n"
"Entfernen über Anklicken der Daten."
#: ../src/appointment.c:3324
@@ -1135,20 +1096,15 @@ msgstr "Ausnahmen hinzufügen"
#: ../src/appointment.c:3326
msgid "Excluded days are full days where this appointment is not happening"
-msgstr ""
-"Ausgeschlossene Tage sind ganze Tage, an denen der Termin nicht zutrifft"
+msgstr "Ausgeschlossene Tage sind ganze Tage, an denen der Termin nicht zutrifft"
#: ../src/appointment.c:3332
msgid "Add included time (+)"
msgstr "Eingeschlossene Zeit hinzufügen (+)"
#: ../src/appointment.c:3334
-msgid ""
-"Included times have same timezone than start time, but they may have "
-"different time"
-msgstr ""
-"Eingeschlossene Zeiten haben die gleiche Zeitzone wie die Startzeit, aber "
-"sie dürfen eine andere Uhrzeit haben"
+msgid "Included times have same timezone than start time, but they may have different time"
+msgstr "Eingeschlossene Zeiten haben die gleiche Zeitzone wie die Startzeit, aber sie dürfen eine andere Uhrzeit haben"
#. calendars showing the action days
#: ../src/appointment.c:3351
@@ -1358,17 +1314,12 @@ msgstr "Standarderinnerung"
#: ../src/ical-code.c:2934
#, c-format
msgid "Build alarm list: Added %d alarms. Processed %d events."
-msgstr ""
-"Benachrichtigungsliste: %d Benachrichtigungen hinzugefügt. %d Ereignisse "
-"bearbeitet."
+msgstr "Benachrichtigungsliste: %d Benachrichtigungen hinzugefügt. %d Ereignisse bearbeitet."
#: ../src/ical-code.c:2936
#, c-format
-msgid ""
-"\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
-msgstr ""
-"\t%d Benachrichtigungen, von denen %d aktiv sind, gefunden (%d "
-"wiederkehrende Benachrichtigungen wurden durchsucht)."
+msgid "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
+msgstr "\t%d Benachrichtigungen, von denen %d aktiv sind, gefunden (%d wiederkehrende Benachrichtigungen wurden durchsucht)."
#: ../src/ical-expimp.c:141
msgid "Starting import file preprocessing"
@@ -1573,16 +1524,11 @@ msgstr "Nur-Lesen"
#: ../src/interface.c:1289
msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
msgstr ""
-"Aktivieren Sie dies, wenn Sie sichergehen wollen, dass diese Datei nie von "
-"Orage geändert wird.\n"
-"Beachten Sie, dass eine Fremddatei unter Umständen nicht mehr mit dem "
-"ursprünglich verwendeten Programm funktioniert, wenn Sie das Verändern von "
-"Fremddateien erlauben!"
+"Aktivieren Sie dies, wenn Sie sichergehen wollen, dass diese Datei nie von Orage geändert wird.\n"
+"Beachten Sie, dass eine Fremddatei unter Umständen nicht mehr mit dem ursprünglich verwendeten Programm funktioniert, wenn Sie das Verändern von Fremddateien erlauben!"
#: ../src/interface.c:1303
msgid "Exchange data - Orage"
@@ -1600,8 +1546,7 @@ msgstr ""
#: ../src/main.c:195
#, c-format
msgid "\tReleased under the terms of the GNU General Public License.\n"
-msgstr ""
-"\tUnter den Bedingungen der GNU General Public License veröffentlicht.\n"
+msgstr "\tUnter den Bedingungen der GNU General Public License veröffentlicht.\n"
#: ../src/main.c:196
#, c-format
@@ -1709,12 +1654,8 @@ msgstr "\tD-Bus wird nicht mit Orage mitgeliefert. \n"
#: ../src/main.c:243
#, c-format
-msgid ""
-"\twithout dbus [files] and foreign file options(-a & -r) can only be used "
-"when starting orage \n"
-msgstr ""
-"\tkann ohne D-Bus [Dateien] und Fremddateioptionen (-a, -r) nur beim Start "
-"benutzt werden \n"
+msgid "\twithout dbus [files] and foreign file options(-a & -r) can only be used when starting orage \n"
+msgstr "\tkann ohne D-Bus [Dateien] und Fremddateioptionen (-a, -r) nur beim Start benutzt werden \n"
#: ../src/main.c:387
#, c-format
@@ -1829,9 +1770,7 @@ msgstr "(0 = keine Archivierung)"
#: ../src/parameters.c:539
msgid "Archiving is used to save time and space when handling events."
-msgstr ""
-"Die Archivierung wird verwendet, um Zeit und Platz beim Bearbeiten von "
-"Terminen zu sparen."
+msgstr "Die Archivierung wird verwendet, um Zeit und Platz beim Bearbeiten von Terminen zu sparen."
#: ../src/parameters.c:548
msgid "Sound command"
@@ -1839,8 +1778,7 @@ msgstr "Befehl zur Tonwiedergabe"
#: ../src/parameters.c:563
msgid "This command is given to shell to make sound in alarms."
-msgstr ""
-"Dieser Befehl wird verwendet, um einen Klang bei Erinnerungen abzuspielen."
+msgstr "Dieser Befehl wird verwendet, um einen Klang bei Erinnerungen abzuspielen."
#: ../src/parameters.c:579
msgid "Display settings"
@@ -1964,16 +1902,11 @@ msgstr "Ereignisliste"
#: ../src/parameters.c:882
msgid "Number of extra days to show in event list"
-msgstr ""
-"Anzahl zusätzlicher Tage, die in der Ereignisliste angezeigt werden sollen"
+msgstr "Anzahl zusätzlicher Tage, die in der Ereignisliste angezeigt werden sollen"
#: ../src/parameters.c:894
-msgid ""
-"This is just the default value, you can change it in the actual eventlist "
-"window."
-msgstr ""
-"Dies ist der Standardwert, Sie können ihn im jeweiligen Ereignisfenster "
-"ändern."
+msgid "This is just the default value, you can change it in the actual eventlist window."
+msgstr "Dies ist der Standardwert, Sie können ihn im jeweiligen Ereignisfenster ändern."
#: ../src/parameters.c:911
msgid "Orage Preferences"
@@ -2011,8 +1944,7 @@ msgstr "Nach gewisser Zeit wieder erinnern"
#. Note that this goes to the main area. Temporary for the version
#: ../src/reminder.c:795
msgid "Press <Execute> to remind me again after the specified time:"
-msgstr ""
-"Drücken Sie <Ausführen>, um nach der angegebenen Zeit erinnert zu werden:"
+msgstr "Drücken Sie <Ausführen>, um nach der angegebenen Zeit erinnert zu werden:"
#: ../src/reminder.c:1032
msgid "Next active alarms:"
@@ -3656,12 +3588,8 @@ msgstr "Orage-Kalender"
#~ msgid "Select always today"
#~ msgstr "Immer den heutigen Tag wählen"
-#~ msgid ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
-#~ msgstr ""
-#~ "Wenn die Hauptseite des Kalenders gezeigt wird, wird entweder der zuletzt "
-#~ "markierte oder der aktuelle Tag markiert."
+#~ msgid "When showing main calendar, set pointer to either previously selected day or always to current day."
+#~ msgstr "Wenn die Hauptseite des Kalenders gezeigt wird, wird entweder der zuletzt markierte oder der aktuelle Tag markiert."
#~ msgid "Ending time adjustment mode"
#~ msgstr "Beende Zeitanpassungsmodus"
@@ -3691,17 +3619,11 @@ msgstr "Orage-Kalender"
#~ msgid "Modify Preferences"
#~ msgstr "Einstellungen bearbeiten"
-#~ msgid ""
-#~ "Enter local timezone. (it is used to show if time is on previous(-) or "
-#~ "next date(+) by adding a +/- after the time)"
-#~ msgstr ""
-#~ "Lokale Zeitzone eingeben. (Zeigt an, ob die Zeit am vorigen(-)oder "
-#~ "nächsten(+) Datum ist, indem +/- an die Zeit anhängt wird)"
+#~ msgid "Enter local timezone. (it is used to show if time is on previous(-) or next date(+) by adding a +/- after the time)"
+#~ msgstr "Lokale Zeitzone eingeben. (Zeigt an, ob die Zeit am vorigen(-)oder nächsten(+) Datum ist, indem +/- an die Zeit anhängt wird)"
#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
-#~ msgstr ""
-#~ "Geben Sie eine gültige Zeitone (TZ) ein oder wählen Sie eine aus der "
-#~ "Liste."
+#~ msgstr "Geben Sie eine gültige Zeitone (TZ) ein oder wählen Sie eine aus der Liste."
#~ msgid "show line _1:"
#~ msgstr "Zeige Zeile _1:"
@@ -3733,14 +3655,8 @@ msgstr "Orage-Kalender"
#~ msgid "(0 = use static icon)"
#~ msgstr "(0 = Statisches Symbole verwenden)"
-#~ msgid ""
-#~ "Dynamic icon shows current day and month. It is visible only in tray. If "
-#~ "tray is too small for dynamic icon size, Orage switches automatically "
-#~ "back to static icon."
-#~ msgstr ""
-#~ "Das dynamische Symbol zeigt den Tag und den Monat. Es ist nur in der "
-#~ "Systemleiste sichtbar. Sollte diese für das dynamische Symbol zu klein "
-#~ "sein, zeigt Orage automatisch das statische Symbol an."
+#~ msgid "Dynamic icon shows current day and month. It is visible only in tray. If tray is too small for dynamic icon size, Orage switches automatically back to static icon."
+#~ msgstr "Das dynamische Symbol zeigt den Tag und den Monat. Es ist nur in der Systemleiste sichtbar. Sollte diese für das dynamische Symbol zu klein sein, zeigt Orage automatisch das statische Symbol an."
#~ msgid "Calendar Settings"
#~ msgstr "Kalendereinstellungen"
@@ -3748,9 +3664,7 @@ msgstr "Orage-Kalender"
#~ msgid "Xfce 4 Calendar Settings"
#~ msgstr "Kalendereinstellungen"
-#~ msgid ""
-#~ "Set this if you want to make sure that this file is never modified by "
-#~ "Orage."
+#~ msgid "Set this if you want to make sure that this file is never modified by Orage."
#~ msgstr "Dies setzen, damit die Datei nie von Orage verändert wird."
#~ msgid "Not defined"
@@ -3847,7 +3761,5 @@ msgstr "Orage-Kalender"
#~ msgid "A time value is wrong."
#~ msgstr "Ein Zeitwert ist falsch."
-#~ msgid ""
-#~ "Time values must be written 'hh:mm', for instance '09:36' or '15:23'."
-#~ msgstr ""
-#~ "Zeitwerte müssen als 'hh:mm' eingegeben werden, z.B. '09:36' oder '15:23'."
+#~ msgid "Time values must be written 'hh:mm', for instance '09:36' or '15:23'."
+#~ msgstr "Zeitwerte müssen als 'hh:mm' eingegeben werden, z.B. '09:36' oder '15:23'."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2ebc478..7a9f2b2 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@
# Chris K. Zhang <plutino at gmail.com>, 2009.
# Aron Xu <aronmalache at 163.com>, 2009.
# Hunt Xu <huntxu at live.cn>, 2009.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: orage 4.3.90.2\n"
@@ -55,8 +55,7 @@ msgid "adjust to change hour"
msgstr "调整小时"
#: ../globaltime/globaltime.c:496
-msgid ""
-"adjust to change minute. Click arrows with button 2 to change only 1 minute."
+msgid "adjust to change minute. Click arrows with button 2 to change only 1 minute."
msgstr ""
#: ../globaltime/gt_prefs.c:265 ../globaltime/gt_prefs.c:266
@@ -292,46 +291,45 @@ msgstr "本地时区："
#: ../globaltime/timezone_selection.c:101
#: ../panel-plugin/timezone_selection.c:102 ../src/timezone_selection.c:102
msgid " Other"
-msgstr ""
+msgstr "其他"
#: ../globaltime/timezone_selection.c:156
#: ../panel-plugin/timezone_selection.c:157 ../src/timezone_selection.c:168
#, c-format
msgid "%d hour %d mins"
-msgstr ""
+msgstr "%d 小时 %d 分"
#: ../globaltime/timezone_selection.c:159
#: ../panel-plugin/timezone_selection.c:160 ../src/timezone_selection.c:171
-#, fuzzy, c-format
+#, c-format
msgid "%d hour"
-msgstr "小时"
+msgstr "%d 小时"
#: ../globaltime/timezone_selection.c:161
#: ../panel-plugin/timezone_selection.c:162 ../src/timezone_selection.c:173
-#, fuzzy, c-format
+#, c-format
msgid "%d mins"
-msgstr "分钟"
+msgstr "%d 分钟"
#: ../globaltime/timezone_selection.c:167
#: ../panel-plugin/timezone_selection.c:168 ../src/timezone_selection.c:179
msgid "backward"
-msgstr ""
+msgstr "后退"
#: ../globaltime/timezone_selection.c:170
#: ../panel-plugin/timezone_selection.c:171 ../src/timezone_selection.c:182
-#, fuzzy
msgid "forward"
msgstr "前进"
#: ../globaltime/timezone_selection.c:194
#: ../panel-plugin/timezone_selection.c:195 ../src/timezone_selection.c:206
msgid "not changed"
-msgstr ""
+msgstr "没有改变"
#: ../globaltime/timezone_selection.c:195
#: ../panel-plugin/timezone_selection.c:196 ../src/timezone_selection.c:207
msgid "not changing"
-msgstr ""
+msgstr "不改变"
#. location
#: ../globaltime/timezone_selection.c:247
@@ -345,17 +343,17 @@ msgstr "地点"
#: ../globaltime/timezone_selection.c:258
#: ../panel-plugin/timezone_selection.c:259 ../src/timezone_selection.c:270
msgid "GMT Offset"
-msgstr ""
+msgstr "GMT 偏移"
#: ../globaltime/timezone_selection.c:264
#: ../panel-plugin/timezone_selection.c:265 ../src/timezone_selection.c:276
msgid "Previous/Next Change"
-msgstr ""
+msgstr "上一个/下一个变化"
#: ../globaltime/timezone_selection.c:269
#: ../panel-plugin/timezone_selection.c:270 ../src/timezone_selection.c:281
msgid "Country"
-msgstr ""
+msgstr "国家"
#: ../globaltime/timezone_selection.c:299
#: ../globaltime/timezone_selection.c:309
@@ -371,7 +369,7 @@ msgstr "选取时区"
#: ../panel-plugin/timezone_selection.c:313 ../src/timezone_selection.c:314
#: ../src/timezone_selection.c:324
msgid "Change mode"
-msgstr ""
+msgstr "更改模式"
#: ../globaltime/timezone_selection.c:303
#: ../globaltime/timezone_selection.c:313
@@ -404,7 +402,7 @@ msgstr "Orage - 日历"
#: ../globaltime/globaltime.desktop.in.h:3
msgid "Show clocks from different countries"
-msgstr ""
+msgstr "显示不同国家的时钟"
#: ../panel-plugin/oc_config.c:224
msgid "Appearance"
@@ -432,7 +430,7 @@ msgstr "设置高度(_H):"
#: ../panel-plugin/oc_config.c:277
msgid "Note that you can not change the height of horizontal panels"
-msgstr ""
+msgstr "请注意你不能改变水平面板的高度"
#: ../panel-plugin/oc_config.c:282
msgid "set _width:"
@@ -440,7 +438,7 @@ msgstr "设置宽度(_W):"
#: ../panel-plugin/oc_config.c:293
msgid "Note that you can not change the width of vertical panels"
-msgstr ""
+msgstr "请注意您不能更改垂直面板的宽度"
#: ../panel-plugin/oc_config.c:316
msgid "Clock Options"
@@ -471,12 +469,7 @@ msgid "fix time after suspend/hibernate"
msgstr "挂起/休眠之后修正时间"
#: ../panel-plugin/oc_config.c:415
-msgid ""
-"You only need this if you do short term (less than 5 hours) suspend or "
-"hibernate and your visible time does not include seconds. Under these "
-"circumstances it is possible that Orageclock shows time inaccurately unless "
-"you have this selected. (Selecting this prevents cpu and interrupt saving "
-"features from working.)"
+msgid "You only need this if you do short term (less than 5 hours) suspend or hibernate and your visible time does not include seconds. Under these circumstances it is possible that Orageclock shows time inaccurately unless you have this selected. (Selecting this prevents cpu and interrupt saving features from working.)"
msgstr ""
"短期挂起或休眠(小于5小时)而且所显示的时间不包含秒的时候才需要这个选项。\n"
"这种情况下，除非你选了本选项，Orage 时钟显示的时间可能不准确。(本选项将\n"
@@ -502,9 +495,8 @@ msgstr ""
" %X = 本地时间 %x = 本地日期"
#: ../panel-plugin/oc_config.c:457
-#, fuzzy
msgid "Orage clock Preferences"
-msgstr "Orage 首选项"
+msgstr "Orage 时钟首选项"
#. no lines yet
#. TRANSLATORS: Use format characters from strftime(3)
@@ -515,7 +507,7 @@ msgstr "Orage 首选项"
#. * %B : full month name
#. * %Y : four digit year
#. * %V : ISO week number
-#.
+#.
#: ../panel-plugin/xfce4-orageclock-plugin.c:623
msgid "%A %d %B %Y/%V"
msgstr "%A %d %B %Y/%V"
@@ -525,9 +517,8 @@ msgid "Maintainer"
msgstr "维护者"
#: ../src/about-xfcalendar.c:47
-#, fuzzy
msgid "Manage your time with Orage"
-msgstr "用 Xfce4 管理您的时间"
+msgstr "用 Orage 管理您的时间"
#. if (gtk_toggle_button_get_active(
#. GTK_TOGGLE_BUTTON(apptw->Type_journal_rb)))
@@ -747,9 +738,7 @@ msgid "Categories"
msgstr "类别"
#: ../src/appointment.c:2729
-msgid ""
-"This is special category, which can be used to color this appointment in "
-"list views."
+msgid "This is special category, which can be used to color this appointment in list views."
msgstr "这个特殊类别可用来在列表浏览时将本约会显示为彩色"
#: ../src/appointment.c:2734
@@ -759,7 +748,7 @@ msgstr "更新类别的颜色"
#. priority
#: ../src/appointment.c:2740
msgid "Priority"
-msgstr ""
+msgstr "优先"
#. note
#: ../src/appointment.c:2750
@@ -775,8 +764,7 @@ msgid ""
"\n"
"These are converted only later when they are seen:\n"
" <&Ynnnn> is translated to current year minus nnnn.\n"
-"(This can be used for example in birthday reminders to tell how old the "
-"person will be.)"
+"(This can be used for example in birthday reminders to tell how old the person will be.)"
msgstr ""
#: ../src/appointment.c:2840
@@ -821,9 +809,7 @@ msgid "Persistent alarm"
msgstr "持续闹铃"
#: ../src/appointment.c:2885
-msgid ""
-"Select this if you want Orage to remind you even if it has not been active "
-"when the alarm happened."
+msgid "Select this if you want Orage to remind you even if it has not been active when the alarm happened."
msgstr "选这里，闹铃发生时即使还没有激活 Orage 也会提醒您。"
#. **** Audio Alarm ****
@@ -908,9 +894,8 @@ msgid "Test this alarm by raising it now"
msgstr ""
#: ../src/appointment.c:3046
-#, fuzzy
msgid "<b>Default alarm</b>"
-msgstr "默认闹铃"
+msgstr "<b> 默认闹铃 </b>"
#: ../src/appointment.c:3054
msgid "Store current settings as default alarm"
@@ -1064,30 +1049,24 @@ msgid "TODO base"
msgstr ""
#: ../src/appointment.c:3297
-msgid ""
-"TODO reoccurs regularly starting on start time and repeating after each "
-"interval no matter when it was last completed"
+msgid "TODO reoccurs regularly starting on start time and repeating after each interval no matter when it was last completed"
msgstr ""
#: ../src/appointment.c:3299
msgid ""
-"TODO reoccurrency is based on complete time and repeats after the interval "
-"counted from the last completed time.\n"
-"(Note that you can not tell anything about the history of the TODO since "
-"reoccurrence base changes after each completion.)"
+"TODO reoccurrency is based on complete time and repeats after the interval counted from the last completed time.\n"
+"(Note that you can not tell anything about the history of the TODO since reoccurrence base changes after each completion.)"
msgstr ""
#. exceptions
#: ../src/appointment.c:3306
-#, fuzzy
msgid "Exceptions"
-msgstr "选项"
+msgstr "例外"
#: ../src/appointment.c:3319
msgid ""
"Add more exception dates by clicking the calendar days below.\n"
-"Exception is either exclusion(-) or inclusion(+) depending on the "
-"selection.\n"
+"Exception is either exclusion(-) or inclusion(+) depending on the selection.\n"
"Remove by clicking the data."
msgstr ""
@@ -1104,9 +1083,7 @@ msgid "Add included time (+)"
msgstr ""
#: ../src/appointment.c:3334
-msgid ""
-"Included times have same timezone than start time, but they may have "
-"different time"
+msgid "Included times have same timezone than start time, but they may have different time"
msgstr ""
#. calendars showing the action days
@@ -1316,8 +1293,7 @@ msgstr "生成闹铃列表：添加 %d 个闹铃，处理 %d 个事件。"
#: ../src/ical-code.c:2936
#, c-format
-msgid ""
-"\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
+msgid "\tFound %d alarms of which %d are active. (Searched %d recurring alarms.)"
msgstr " 找到 %d 个闹铃，其中 %d 个已激活。(总共搜索了 %d 个重复闹铃)"
#: ../src/ical-expimp.c:141
@@ -1515,10 +1491,8 @@ msgstr "只读"
#: ../src/interface.c:1289
msgid ""
-"Set this if you want to make sure that this file is never modified by "
-"Orage.\n"
-"Note that modifying foreign files may make them incompatible with the "
-"original tool, where they came from!"
+"Set this if you want to make sure that this file is never modified by Orage.\n"
+"Note that modifying foreign files may make them incompatible with the original tool, where they came from!"
msgstr ""
"选了这个选项后 Orage 将不会修改该文件。注意：如果修改一个外部文件，该\n"
"文件的来源程序可能不能再使用它。"
@@ -1528,13 +1502,11 @@ msgid "Exchange data - Orage"
msgstr "交换数据 - Orage"
#: ../src/main.c:193
-#, fuzzy, c-format
+#, c-format
msgid ""
"\tThis is %s version %s\n"
"\n"
msgstr ""
-" Xfce %s 的 %s，版本 %s\n"
-"\n"
#: ../src/main.c:195
#, c-format
@@ -1647,11 +1619,8 @@ msgstr " orage 无法使用 D-Bus。\n"
#: ../src/main.c:243
#, c-format
-msgid ""
-"\twithout dbus [files] and foreign file options(-a & -r) can only be used "
-"when starting orage \n"
-msgstr ""
-" 没有 D-Bus， 文件和外部文件选项(-a 和 -r)只能在 orage 启动时使用。\n"
+msgid "\twithout dbus [files] and foreign file options(-a & -r) can only be used when starting orage \n"
+msgstr " 没有 D-Bus， 文件和外部文件选项(-a 和 -r)只能在 orage 启动时使用。\n"
#: ../src/main.c:387
#, c-format
@@ -1746,7 +1715,6 @@ msgid "<b>Events for %s - %s:</b>"
msgstr "<b>%s 的事件:</b>"
#: ../src/parameters.c:492
-#, fuzzy
msgid "Main settings"
msgstr "主设置"
@@ -1779,9 +1747,8 @@ msgid "This command is given to shell to make sound in alarms."
msgstr "这项命令将被传递给 shell 来放闹铃。"
#: ../src/parameters.c:579
-#, fuzzy
msgid "Display settings"
-msgstr "已显示"
+msgstr "显示设置"
#: ../src/parameters.c:587
msgid "Calendar main window"
@@ -1796,19 +1763,16 @@ msgid "Show menu"
msgstr "显示菜单"
#: ../src/parameters.c:606
-#, fuzzy
msgid "Show month and year"
-msgstr "在页面切换器中显示"
+msgstr "显示年月"
#: ../src/parameters.c:613
-#, fuzzy
msgid "Show day names"
-msgstr "显示边框(_F)"
+msgstr "显示日期名称"
#: ../src/parameters.c:620
-#, fuzzy
msgid "Show week numbers"
-msgstr "显示边框"
+msgstr "显示周数"
#: ../src/parameters.c:627
msgid "Show todo list"
@@ -1816,7 +1780,7 @@ msgstr "显示要做的事列表"
#: ../src/parameters.c:634
msgid "Number of days to show in event window"
-msgstr ""
+msgstr "在事件窗口显示天数"
#: ../src/parameters.c:640
msgid "0 = do not show event list at all"
@@ -1824,12 +1788,11 @@ msgstr ""
#: ../src/parameters.c:650
msgid "Show on all desktops"
-msgstr ""
+msgstr "在所有桌面显示"
#: ../src/parameters.c:657
-#, fuzzy
msgid "Keep on top"
-msgstr "总在最前"
+msgstr "置顶"
#: ../src/parameters.c:664
msgid "Show in taskbar"
@@ -1860,19 +1823,16 @@ msgid "Minimized"
msgstr "最小化"
#: ../src/parameters.c:767
-#, fuzzy
msgid "Extra settings"
msgstr "附加设置"
#: ../src/parameters.c:775
-#, fuzzy
msgid "On Calendar Window Open"
-msgstr "日历主窗口"
+msgstr "在日历窗口打开"
#: ../src/parameters.c:794
-#, fuzzy
msgid "Select Today's Date"
-msgstr "选择今天(_T)"
+msgstr "选择今天"
#: ../src/parameters.c:807
msgid "Select Previously Selected Date"
@@ -1880,16 +1840,15 @@ msgstr ""
#: ../src/parameters.c:824
msgid "Use dynamic tray icon"
-msgstr ""
+msgstr "使用动态托盘图标"
#: ../src/parameters.c:829
-#, fuzzy
msgid "Use dynamic icon"
-msgstr "动态图标尺寸"
+msgstr "使用动态图标"
#: ../src/parameters.c:835
msgid "Dynamic icon shows current month and day of the month."
-msgstr ""
+msgstr "动态图标显示当前月份和该月的一天"
#: ../src/parameters.c:844
msgid "Main Calendar double click shows"
@@ -1913,9 +1872,7 @@ msgid "Number of extra days to show in event list"
msgstr ""
#: ../src/parameters.c:894
-msgid ""
-"This is just the default value, you can change it in the actual eventlist "
-"window."
+msgid "This is just the default value, you can change it in the actual eventlist window."
msgstr ""
#: ../src/parameters.c:911
@@ -1949,12 +1906,12 @@ msgstr "提醒 － Orage"
#: ../src/reminder.c:792
msgid "Remind me again after the specified time"
-msgstr ""
+msgstr "在指定的时间再次提醒我"
#. Note that this goes to the main area. Temporary for the version
#: ../src/reminder.c:795
msgid "Press <Execute> to remind me again after the specified time:"
-msgstr ""
+msgstr "按 <Execute> 在指定的时间后再次提醒我:"
#: ../src/reminder.c:1032
msgid "Next active alarms:"
@@ -2315,7 +2272,6 @@ msgid "America/Cuiaba"
msgstr "美洲/库亚巴"
#: ../src/timezone_names.c:120
-#, fuzzy
msgid "America/Curacao"
msgstr "美洲/Curacao"
@@ -3556,14 +3512,12 @@ msgid "About Orage"
msgstr "关于 Orage"
#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:1
-#, fuzzy
msgid "Orage Panel Clock"
-msgstr "Orage 时钟"
+msgstr "Orage 面板时钟"
#: ../panel-plugin/xfce4-orageclock-plugin.desktop.in.in.h:2
-#, fuzzy
msgid "Show time and date?"
-msgstr "现在几月几号几点？"
+msgstr "显示时间和日期？"
#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:1
#: ../xfcalendar.desktop.in.h:1
@@ -3571,28 +3525,24 @@ msgid "Calendar"
msgstr "日历"
#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:2
-#, fuzzy
msgid "Orage Calendar Preferences"
-msgstr "Orage 首选项"
+msgstr "Orage 日历首选项"
#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:3
-#, fuzzy
msgid "Orage preferences"
msgstr "Orage 首选项"
#: ../plugin/xfce-xfcalendar-settings.desktop.in.h:4
-#, fuzzy
msgid "Settings for the Xfce 4 Calendar Application (Orage)"
-msgstr "Xfce 4日历程序设定"
+msgstr "Xfce 4 日历程序设定 (Orage)"
#: ../xfcalendar.desktop.in.h:2
msgid "Desktop calendar"
msgstr "桌面日历"
#: ../xfcalendar.desktop.in.h:3
-#, fuzzy
msgid "Orage Calendar"
-msgstr "Orage - 日历"
+msgstr "Orage 日历"
#~ msgid "Orage clock"
#~ msgstr "Orage 时钟"
@@ -3621,9 +3571,7 @@ msgstr "Orage - 日历"
#~ msgid "Select always today"
#~ msgstr "总显示今天"
-#~ msgid ""
-#~ "When showing main calendar, set pointer to either previously selected day "
-#~ "or always to current day."
+#~ msgid "When showing main calendar, set pointer to either previously selected day or always to current day."
#~ msgstr "显示日历时指向上次所选那天或者今天。"
#~ msgid "Ending time adjustment mode"
@@ -3654,9 +3602,7 @@ msgstr "Orage - 日历"
#~ msgid "Modify Preferences"
#~ msgstr "修改首选项"
-#~ msgid ""
-#~ "Enter local timezone. (it is used to show if time is on previous(-) or "
-#~ "next date(+) by adding a +/- after the time)"
+#~ msgid "Enter local timezone. (it is used to show if time is on previous(-) or next date(+) by adding a +/- after the time)"
#~ msgstr "输入本地时区(习惯上，时间之后跟 +/- 表示前一天(-)或者后一天(+))"
#~ msgid "Set any valid timezone (=TZ) value or pick one from the list."
@@ -3692,10 +3638,7 @@ msgstr "Orage - 日历"
#~ msgid "(0 = use static icon)"
#~ msgstr "(０＝使用静态图标)"
-#~ msgid ""
-#~ "Dynamic icon shows current day and month. It is visible only in tray. If "
-#~ "tray is too small for dynamic icon size, Orage switches automatically "
-#~ "back to static icon."
+#~ msgid "Dynamic icon shows current day and month. It is visible only in tray. If tray is too small for dynamic icon size, Orage switches automatically back to static icon."
#~ msgstr ""
#~ "动态图标显示现在日期，只在系统任务托盘可以看到。如果任务托盘太小，Orage\n"
#~ "自动切换到静态图标。"
@@ -3706,39 +3649,30 @@ msgstr "Orage - 日历"
#~ msgid "Xfce 4 Calendar Settings"
#~ msgstr "Xfce 4日历设定"
-#, fuzzy
#~ msgid "Monday"
#~ msgstr "今天"
-#, fuzzy
#~ msgid "Tuesday"
#~ msgstr "今天"
-#, fuzzy
#~ msgid "Wednesday"
#~ msgstr "每周"
-#, fuzzy
#~ msgid "Thursday"
#~ msgstr "今天"
-#, fuzzy
#~ msgid "Friday"
#~ msgstr "天"
-#, fuzzy
#~ msgid "Sunday"
#~ msgstr "声音"
-#, fuzzy
#~ msgid "Days"
#~ msgstr "天"
-#, fuzzy
#~ msgid "normal"
#~ msgstr "通常"
-#, fuzzy
#~ msgid "Calendar Files"
#~ msgstr "日历文件"
diff --git a/src/appointment.c b/src/appointment.c
index a029ecd..275f2b1 100644
--- a/src/appointment.c
+++ b/src/appointment.c
@@ -1765,7 +1765,8 @@ static gboolean category_fill_cb(GtkComboBox *cb, char *selection)
for (i = 0; cat_gourps[i] != NULL; i++) {
gtk_combo_box_append_text(cb, (const gchar *)cat_gourps[i]);
if (!found && selection && !strcmp(selection, cat_gourps[i])) {
- gtk_combo_box_set_active(cb, i);
+ /* +1 as we have _("Not set") there first */
+ gtk_combo_box_set_active(cb, i+1);
found = TRUE;
}
}
diff --git a/src/day-view.c b/src/day-view.c
index 089d5fb..b5f0846 100644
--- a/src/day-view.c
+++ b/src/day-view.c
@@ -424,7 +424,7 @@ static void on_arrow_right_press_event_cb(GtkWidget *widget
static void add_row(day_win *dw, xfical_appt *appt)
{
- gint row, start_row, end_row;
+ gint row, start_row, end_row, days;
gint col, start_col, end_col, first_col, last_col;
gint height, start_height, end_height;
gchar *tip, *start_date, *end_date, *tmp_title, *tmp_note;
@@ -438,6 +438,7 @@ static void add_row(day_win *dw, xfical_appt *appt)
tm_first = orage_icaltime_to_tm_time(dw->a_day, FALSE);
start_col = orage_days_between(&tm_first, &tm_start)+1;
end_col = orage_days_between(&tm_first, &tm_end)+1;
+ days = orage_days_between(&tm_start, &tm_end);
if (start_col < 1) {
col = 1;
@@ -456,7 +457,7 @@ static void add_row(day_win *dw, xfical_appt *appt)
lab = gtk_label_new(tmp_title);
gtk_container_add(GTK_CONTAINER(ev), lab);
- if (appt->starttimecur[8] != 'T') { /* whole day event */
+ if (appt->allDay) { /* whole day event */
gtk_widget_modify_bg(ev, GTK_STATE_NORMAL, &dw->bg2);
if (dw->header[col] == NULL) { /* first data */
hb = gtk_hbox_new(TRUE, 3);
@@ -468,8 +469,22 @@ static void add_row(day_win *dw, xfical_appt *appt)
* have more than 1 appointment here
*/
}
- tip = g_strdup_printf("%s\n%s - %s\n%s"
- , tmp_title, appt->starttimecur, appt->endtimecur, tmp_note);
+ /* we took the date in unnormalized format, so we need to do that now */
+ tm_start.tm_year -= 1900;
+ tm_start.tm_mon -= 1;
+ start_date = g_strdup(orage_tm_date_to_i18_date(&tm_start));
+ if (days == 0)
+ tip = g_strdup_printf("%s\n%s\n%s"
+ , tmp_title, start_date, tmp_note);
+ else {
+ tm_end.tm_year -= 1900;
+ tm_end.tm_mon -= 1;
+ end_date = g_strdup(orage_tm_date_to_i18_date(&tm_end));
+ tip = g_strdup_printf("%s\n%s - %s\n%s"
+ , tmp_title, start_date, end_date, tmp_note);
+ g_free(end_date);
+ }
+ g_free(start_date);
}
else {
if ((color = orage_category_list_contains(appt->categories)) != NULL)
@@ -486,7 +501,7 @@ static void add_row(day_win *dw, xfical_appt *appt)
* have more than 1 appointment here
*/
}
- if (orage_days_between(&tm_start, &tm_end) == 0)
+ if (days == 0)
tip = g_strdup_printf("%s\n%02d:%02d-%02d:%02d\n%s"
, tmp_title, tm_start.tm_hour, tm_start.tm_min
, tm_end.tm_hour, tm_end.tm_min, tmp_note);
@@ -522,7 +537,7 @@ static void add_row(day_win *dw, xfical_appt *appt)
/* and finally draw the line to show how long the appointment is,
* but only if it is Busy type event (=availability != 0)
* and it is not whole day event */
- if (appt->availability && appt->starttimecur[8] == 'T') {
+ if (appt->availability && !appt->allDay) {
height = dw->StartDate_button_req.height;
/*
* same_date = !strncmp(start_ical_time, end_ical_time, 8);
diff --git a/src/tz_zoneinfo_read.c b/src/tz_zoneinfo_read.c
index d7560e2..e7ea00f 100644
--- a/src/tz_zoneinfo_read.c
+++ b/src/tz_zoneinfo_read.c
@@ -23,7 +23,6 @@
#include <config.h>
#endif
-#include <error.h>
#include <errno.h>
/* errno */
@@ -56,6 +55,11 @@
#define __USE_GNU 1
#include <ftw.h>
/* nftw */
+#ifndef FTW_ACTIONRETVAL
+/* BSD systems lack FTW_ACTIONRETVAL, so we need to define needed
+ * things like FTW_CONTINUE locally */
+#define FTW_CONTINUE 0
+#endif
#define DEFAULT_OS_ZONEINFO_DIRECTORY "/usr/share/zoneinfo"
#define ZONETAB_FILE "zone.tab"
@@ -135,7 +139,7 @@ static void read_file(const char *file_name, const struct stat *file_stat)
if (debug > 1) {
printf("read_file: start\n");
- printf("\n***** size of file %s is %d bytes *****\n\n", file_name
+ printf("***** size of file %s is %d bytes *****\n", file_name
, (int)file_stat->st_size);
}
in_buf = malloc(file_stat->st_size);
@@ -323,7 +327,7 @@ static void process_gmt_table(void)
static int process_file(const char *file_name)
{
if (debug > 1)
- printf("\n\nprocess_file: start\n");
+ printf("process_file: start\n");
if (process_header()) {
if (debug > 0)
printf("File (%s) does not look like tz file. Skipping it.\n"
@@ -338,7 +342,7 @@ static int process_file(const char *file_name)
process_std_table();
process_gmt_table();
if (debug > 1)
- printf("\nprocess_file: end\n\n\n");
+ printf("process_file: end\n");
return(0); /* ok */
}
@@ -364,13 +368,13 @@ static void get_country(void)
/********** then search the country **********/
/* Need to search line, which starts with country code.
- * Note that it is not enough to search any country coed, but it really
+ * Note that it is not enough to search any country code, but it really
* needs to be the first two chars in the line */
cc[0] = '\n';
cc[1] = tz_array.cc[tz_array.count][0];
cc[2] = tz_array.cc[tz_array.count][1];
cc[3] = '\0';
- if (!(str = strstr(country_buf, cc)))
+ if (!country_buf || !(str = strstr(country_buf, cc)))
return; /* not found */
/* country name is after the country code and a single tab */
str += 4;
@@ -420,7 +424,7 @@ static int write_ical_file(const char *in_file_name
char s_next[101], s_prev[101];
if (debug > 1)
- printf("***** write_ical_file: start *****\n\n");
+ printf("***** write_ical_file: start *****\n");
tz_array.city[tz_array.count] = strdup(in_timezone_name);
@@ -525,7 +529,7 @@ static int write_ical_file(const char *in_file_name
tz_array.count++;
if (debug > 1)
- printf("\n***** write_ical_file: end *****\n\n\n");
+ printf("***** write_ical_file: end *****\n");
return(0);
}
@@ -536,7 +540,7 @@ static int file_call(const char *file_name, const struct stat *sb, int flags
int i;
if (debug > 1)
- printf("file_call: start\n");
+ printf("\nfile_call: start\n");
file_cnt++;
/* we are only interested about files and directories we can access */
if (flags == FTW_F) { /* we got file */
@@ -568,6 +572,7 @@ static int file_call(const char *file_name, const struct stat *sb, int flags
else if (flags == FTW_D) { /* this is directory */
if (debug > 0)
printf("\tfile_call: processing directory=(%s)\n", file_name);
+#ifdef FTW_ACTIONRETVAL
/* need to check if we have excluded directory */
for (i = 0; (i <= excl_dir_cnt) && excl_dir[i]; i++) {
if (strcmp(excl_dir[i], file_name+f->base) == 0) {
@@ -577,6 +582,12 @@ static int file_call(const char *file_name, const struct stat *sb, int flags
return(FTW_SKIP_SUBTREE);
}
}
+#else
+ /* not easy to do that in BSD, where we do not have FTW_ACTIONRETVAL
+ features. It can be done by checking differently */
+ if (debug > 0)
+ printf("FIXME: this directory should be skipped\n");
+#endif
}
else if (flags == FTW_SL) {
if (debug > 0) {
@@ -590,7 +601,7 @@ static int file_call(const char *file_name, const struct stat *sb, int flags
}
if (debug > 1)
- printf("file_call: end\n");
+ printf("file_call: end\n\n");
return(FTW_CONTINUE);
}
@@ -724,7 +735,7 @@ static int check_parameters(void)
}
if (debug > 1)
- printf("check_parameters: end\n");
+ printf("check_parameters: end\n\n\n");
return(0); /* continue */
}
@@ -788,21 +799,24 @@ static void read_countries(void)
struct stat country_file_stat;
/****** country=iso3166.tab file ******/
+ if (country_buf) { /* we have read it already */
+ return;
+ }
+
tz_dir = malloc(in_file_base_offset + zoneinfo_len + 1); /* '\0' */
strncpy(tz_dir, in_file, in_file_base_offset);
tz_dir[in_file_base_offset] = '\0';
+#ifdef __OpenBSD__
+ strcat(tz_dir, "misc/"); /* this is shorter than "zoneinfo" so it is safe */
+#else
strcat(tz_dir, "zoneinfo/"); /* now we have the base directory */
+#endif
country_file_name = malloc(strlen(tz_dir) + strlen(COUNTRY_FILE) + 1);
strcpy(country_file_name, tz_dir);
strcat(country_file_name, COUNTRY_FILE);
-
free(tz_dir);
- if (country_buf) {
- free(country_file_name);
- return;
- }
if (!(country_file = fopen(country_file_name, "r"))) {
printf("read_countries: iso3166.tab file open failed (%s)\n"
, country_file_name);
@@ -868,7 +882,11 @@ static void read_ical_timezones(void)
orage_timezone_array get_orage_timezones(int show_details, int ical)
{
+#ifdef FTW_ACTIONRETVAL
int tz_array_size = 1000; /* FIXME: this needs to be counted */
+#else
+ int tz_array_size = 2000; /* BSD can not skip unneeded directories */
+#endif
/*
icalarray *tz_array;
icaltimezone *l_tz;
@@ -889,7 +907,7 @@ orage_timezone_array get_orage_timezones(int show_details, int ical)
tz_array.cc = (char **)malloc(sizeof(char *)*(tz_array_size+2));
check_parameters();
if (debug > 0)
- printf("Processing %s files\n", in_file);
+ printf("Processing %s files\n\n\n", in_file);
if (details) {
read_os_timezones();
read_countries();
@@ -903,13 +921,19 @@ orage_timezone_array get_orage_timezones(int show_details, int ical)
}
/* nftw goes through the whole file structure and calls "file_call"
* with each file. It returns 0 when everything has been done and -1
- * if it run into an error. */
+ * if it run into an error.
+ * BSD lacks FTW_ACTIONRETVAL, so we only use it when available. */
+#ifdef FTW_ACTIONRETVAL
if (nftw(in_file, file_call, 10, FTW_PHYS | FTW_ACTIONRETVAL) == -1) {
+#else
+ if (nftw(in_file, file_call, 10, FTW_PHYS) == -1) {
+#endif
perror("nftw error in file handling");
exit(EXIT_FAILURE);
}
- printf("Orage: Processed %d timezone files from (%s)\n"
- , file_cnt, in_file);
+ if (debug > 0)
+ printf("Orage: Processed %d timezone files from (%s)\n"
+ , file_cnt, in_file);
free(in_file);
diff --git a/tz_convert/tz_convert.c b/tz_convert/tz_convert.c
index e09418a..b93bcdf 100644
--- a/tz_convert/tz_convert.c
+++ b/tz_convert/tz_convert.c
@@ -19,7 +19,6 @@
Boston, MA 02110-1301 USA
*/
-#include <error.h>
#include <errno.h>
/* errno */
@@ -53,6 +52,11 @@
#define __USE_GNU 1
#include <ftw.h>
/* nftw */
+#ifndef FTW_ACTIONRETVAL
+/* BSD systems lack FTW_ACTIONRETVAL, so we need to define needed
+ * things like FTW_CONTINUE locally */
+#define FTW_CONTINUE 0
+#endif
#define DEFAULT_ZONEINFO_DIRECTORY "/usr/share/zoneinfo"
#define DEFAULT_ZONETAB_FILE "/usr/share/zoneinfo/zone.tab"
@@ -1229,13 +1233,15 @@ int get_parameters_popt(int argc, const char **argv)
" You can give several directories with separate parameters."
" By default directories right and posix are excluded, but if"
" you use this parameter, you have to specify those also."
+ " *** NOTE: This does not work in BSD due to lack of"
+ " FTW_ACTIONRETVAL feature in nftw function ***"
, "directory"},
{"norrule", 'u', POPT_ARG_INT, &no_rrule, 11
, "do not use RRULE ical repeating rule, but use RDATE instead."
" Not all calendars are able to understand RRULE correctly"
" with timezones. "
" (Orage should work fine with RRULE)"
- " 0 = use RRULE 1 = do not use RRULE (0=default)."
+ " 0 = use RRULE 1 = do not use RRULE (0=default)."
, "level"},
POPT_AUTOHELP
{NULL, '\0', POPT_ARG_NONE, NULL, 0, NULL, NULL}
@@ -1467,6 +1473,7 @@ int file_call(const char *file_name, const struct stat *sb, int flags
else if (flags == FTW_D) { /* this is directory */
if (debug > 0)
printf("\tfile_call: processing directory=(%s)\n", file_name);
+#ifdef FTW_ACTIONRETVAL
if (only_one_level && f->level > 0) {
if (debug > 0)
printf("\t\tfile_call: skipping it, not on top level\n");
@@ -1481,6 +1488,12 @@ int file_call(const char *file_name, const struct stat *sb, int flags
return(FTW_SKIP_SUBTREE);
}
}
+#else
+ /* not easy to do that in BSD, where we do not have FTW_ACTIONRETVAL
+ * features. It can be done by checking differently */
+ if (debug > 0)
+ printf("FIXME: this directory should be skipped\n");
+#endif
create_ical_directory(file_name);
}
else if (flags == FTW_SL) {
@@ -1613,8 +1626,13 @@ int main(int argc, const char **argv)
/* nftw goes through the whole file structure and calls "file_call"
* with each file. It returns 0 when everything has been done and -1
- * if it run into an error. */
+ * if it run into an error.
+ * BSD lacks FTW_ACTIONRETVAL, so we only use it when available. */
+#ifdef FTW_ACTIONRETVAL
if (nftw(in_file, file_call, 10, FTW_PHYS | FTW_ACTIONRETVAL) == -1) {
+#else
+ if (nftw(in_file, file_call, 10, FTW_PHYS) == -1) {
+#endif
perror("nftw error in file handling");
exit(EXIT_FAILURE);
}
More information about the Xfce4-commits
mailing list