[rkward-cvs] SF.net SVN: rkward: [1867] branches/release_branch_0.4.7

tfry at users.sourceforge.net tfry at users.sourceforge.net
Mon May 7 10:55:39 UTC 2007


Revision: 1867
          http://svn.sourceforge.net/rkward/?rev=1867&view=rev
Author:   tfry
Date:     2007-05-07 03:55:39 -0700 (Mon, 07 May 2007)

Log Message:
-----------
Merging 1809, 1812, 1815, 1823, 1846, 1853, 1863-1866 from trunk

Modified Paths:
--------------
    branches/release_branch_0.4.7/ChangeLog
    branches/release_branch_0.4.7/admin/acinclude.m4.in
    branches/release_branch_0.4.7/configure.in.in
    branches/release_branch_0.4.7/po/tr.po
    branches/release_branch_0.4.7/rkward/plugin/rkcomponent.cpp
    branches/release_branch_0.4.7/rkward/plugin/rkcomponent.h
    branches/release_branch_0.4.7/rkward/plugin/rkcomponentcontext.h
    branches/release_branch_0.4.7/rkward/plugin/rkstandardcomponent.cpp
    branches/release_branch_0.4.7/rkward/plugins/plots/scatterplot.xml
    branches/release_branch_0.4.7/rkward/rbackend/rklocalesupport.cpp
    branches/release_branch_0.4.7/rkward/rbackend/rkpthreadsupport.cpp
    branches/release_branch_0.4.7/rkward/rkconsole.cpp
    branches/release_branch_0.4.7/rkward/rkconsole.h
    branches/release_branch_0.4.7/rkward/scriptbackends/phpbackend.cpp

Modified: branches/release_branch_0.4.7/ChangeLog
===================================================================
--- branches/release_branch_0.4.7/ChangeLog	2007-05-07 10:51:21 UTC (rev 1866)
+++ branches/release_branch_0.4.7/ChangeLog	2007-05-07 10:55:39 UTC (rev 1867)
@@ -1,3 +1,14 @@
+--- Version 0.4.7a - May-07-2007
+- add sanity check for the detected stack limits
+- fixed: one some systems rkward would crash or not compile due to missing fortran symbols
+- fixed: starting the scatterplot plugin in wizard mode would crash rkward
+- tab-completion in the console will do partial completion, if all potential completions have a common start
+- fixed: file-name completion would always assume the home directory as the current directory
+- update turkish translation
+- compilation fix for FreeBSD (thanks to Thierry Thomas)
+- fixed: when executing commands line by line from the script editor, line breaks would be omitted
+- Messages, warnings, and errors for plugin commands are shown in the output, instead of in a dialog
+
 --- Version 0.4.7 - Apr-11-2007
 - some fixes for GCC 4.3
 - fixed: the presence of user objects called "missing", "assign", or "get" would confuse some RKWard internals

Modified: branches/release_branch_0.4.7/admin/acinclude.m4.in
===================================================================
--- branches/release_branch_0.4.7/admin/acinclude.m4.in	2007-05-07 10:51:21 UTC (rev 1866)
+++ branches/release_branch_0.4.7/admin/acinclude.m4.in	2007-05-07 10:55:39 UTC (rev 1867)
@@ -1967,7 +1967,7 @@
 AC_MSG_CHECKING(whether we should link against libRlapack.so)
 if test -f "$R_HOMEDIR/lib/libRlapack.so"; then
    AC_MSG_RESULT(yes $R_HOMEDIR/lib/libRlapack.so exists)
-   R_LAPACK_FLAG="-lRlapack"
+   R_LAPACK_FLAG="-lRlapack -lgfortran"
 else
    AC_MSG_RESULT(no $R_HOMEDIR/lib/libRlapack.so does not exist)
    R_LAPACK_FLAG=""

Modified: branches/release_branch_0.4.7/configure.in.in
===================================================================
--- branches/release_branch_0.4.7/configure.in.in	2007-05-07 10:51:21 UTC (rev 1866)
+++ branches/release_branch_0.4.7/configure.in.in	2007-05-07 10:55:39 UTC (rev 1867)
@@ -1,6 +1,6 @@
 #MIN_CONFIG(3)
 
-AM_INIT_AUTOMAKE(rkward,0.4.7)
+AM_INIT_AUTOMAKE(rkward,0.4.7a)
 
 dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__
 dnl CFLAGS="$NOOPT_CFLAGS" dnl __kdevelop[noopt]__

Modified: branches/release_branch_0.4.7/po/tr.po
===================================================================
--- branches/release_branch_0.4.7/po/tr.po	2007-05-07 10:51:21 UTC (rev 1866)
+++ branches/release_branch_0.4.7/po/tr.po	2007-05-07 10:55:39 UTC (rev 1867)
@@ -1,18 +1,21 @@
-# translation of tr.po to Turkish
+# translation of yenitr.po to
+# translation of tr.po to
 # translation of rkward.po to
 # çevirisi of rkward.po to Türkçe
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Harun Hurma <h.hurma at gmail.com>, 2006, 2007.
+# Serdar Soytetir <tulliana at gmail.com>, 2007.
+# ertugrulerata <ertugrulerata at gmail.com>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: tr\n"
+"Project-Id-Version: yenitr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-11 12:56+0200\n"
-"PO-Revision-Date: 2007-01-28 15:02+0200\n"
-"Last-Translator: Harun Hurma <h.hurma at gmail.com>\n"
-"Language-Team: Turkish <tr at li.org>\n"
+"POT-Creation-Date: 2007-04-02 21:41+0200\n"
+"PO-Revision-Date: 2007-04-12 10:40+0300\n"
+"Last-Translator: ertugrulerata <ertugrulerata at gmail.com>\n"
+"Language-Team:  <tr at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -75,8 +78,7 @@
 msgid ""
 "Pastes the clipboard contents to actual position, but not beyond the table's "
 "boundaries"
-msgstr ""
-"Pano içeriklerini asıl yerlerine yapıştırır, fakat tablonun sınırlarını aşmaz"
+msgstr "Pano içeriklerini asıl yerlerine yapıştırır, fakat tablonun sınırlarını aşmaz"
 
 #: dataeditor/rkeditordataframepart.cpp:61
 msgid ""
@@ -130,9 +132,9 @@
 msgid "Format"
 msgstr "Biçim"
 
-#: dataeditor/twintable.cpp:66 plugin/rkvarslot.cpp:57 plugin/rkformula.cpp:74
-#: dialogs/rkloadlibsdialog.cpp:260 dialogs/rkloadlibsdialog.cpp:279
-#: dialogs/rkloadlibsdialog.cpp:463 dialogs/rkloadlibsdialog.cpp:613
+#: dataeditor/twintable.cpp:66 plugin/rkformula.cpp:74 plugin/rkvarslot.cpp:57
+#: dialogs/rkloadlibsdialog.cpp:257 dialogs/rkloadlibsdialog.cpp:276
+#: dialogs/rkloadlibsdialog.cpp:460 dialogs/rkloadlibsdialog.cpp:610
 #: misc/rkobjectlistview.cpp:53
 msgid "Name"
 msgstr "İsim"
@@ -165,33 +167,9 @@
 msgid "Delete this row (%1)"
 msgstr "Bu hücreyi (%1) sil "
 
-#: agents/rkquitagent.cpp:41
-msgid ""
-"Waiting for remaining R commands to finish. To quit immediately, press "
-"Cancel (WARNING: This may result in loss of data)"
-msgstr ""
-
-#: agents/rkquitagent.cpp:41
-msgid "Waiting for R to finish"
-msgstr ""
-
-#: agents/rkeditobjectagent.cpp:56
-msgid ""
-"The object '%1', could not be opened for editing. Either it does not exist, "
-"or RKWard does not support editing this type of object, yet."
-msgstr ""
-"Nesne '%1' düzenlemek için açılamadı. Ya dosya yok ya da RKWard bu nesneyi "
-"henüz düzenleyemiyor. "
-
-#: agents/rkeditobjectagent.cpp:56
-msgid "Cannot edit '%1'"
-msgstr "Düzenlenemez '%1'"
-
 #: agents/rksaveagent.cpp:60
-msgid ""
-"No filename given. Your data was NOT saved. Do you still want to proceed?"
-msgstr ""
-"Dosya ismi verilmemiş. Verileriniz KAYDEDİLMEDİ. Devam etmek istiyor musunuz?"
+msgid "No filename given. Your data was NOT saved. Do you still want to proceed?"
+msgstr "Dosya ismi verilmemiş. Verileriniz KAYDEDİLMEDİ. Devam etmek istiyor musunuz?"
 
 #: agents/rksaveagent.cpp:73
 msgid "Saving to file '%1' failed. What do you want to do?"
@@ -298,6 +276,30 @@
 msgid "Error loading workspace"
 msgstr "Çalışma alanı yükleme hatası"
 
+#: agents/rkquitagent.cpp:41
+msgid ""
+"Waiting for remaining R commands to finish. To quit immediately, press "
+"Cancel (WARNING: This may result in loss of data)"
+msgstr ""
+"Bitirmek için kalan R komutları bekleniyor. Hemen çıkmak için İptal "
+"düğmesine basın. (UYARI: İptal işlemi veri kaybetmenize neden olabilir.)"
+
+#: agents/rkquitagent.cpp:41
+msgid "Waiting for R to finish"
+msgstr "Bitirmek için R bekleniyor"
+
+#: agents/rkeditobjectagent.cpp:56
+msgid ""
+"The object '%1', could not be opened for editing. Either it does not exist, "
+"or RKWard does not support editing this type of object, yet."
+msgstr ""
+"Nesne '%1' düzenlemek için açılamadı. Ya dosya yok ya da RKWard bu nesneyi "
+"henüz düzenleyemiyor. "
+
+#: agents/rkeditobjectagent.cpp:56
+msgid "Cannot edit '%1'"
+msgstr "Düzenlenemez '%1'"
+
 #: core/rkmodificationtracker.cpp:50
 msgid ""
 "The object '%1' was removed from workspace or changed to a different type of "
@@ -324,8 +326,7 @@
 msgstr "Nesneyi sil?"
 
 #: core/rkmodificationtracker.cpp:62
-msgid ""
-"Do you really want to remove the object '%1'? There's no way to get it back."
+msgid "Do you really want to remove the object '%1'? There's no way to get it back."
 msgstr ""
 "Nesne '%1' gerçekten silmek istiyor musunuz? Silinmiş öğeler geri "
 "getirilemez."
@@ -390,112 +391,12 @@
 msgid "Class(es):"
 msgstr "Sınıf(lar): "
 
-#: windows/rkwindowcatcher.cpp:60
-msgid ""
-"You have created a new X11 device window in R. Usually, RKWard tries to "
-"detect such windows, to take control of them, and add a menu-bar to them. "
-"This time, however, RKWard failed to detect, which window was created, and "
-"so can not embed it.\n"
-"If you created the window on a different screen or X11 display, that is to "
-"be expected. You might want to consider changing options(\"display\"), "
-"then.\n"
-"If you can see the X11 window on the same screen as this message, then "
-"RKWard should do better. In this case, please contact us at rkward-"
-"devel at lists.sourceforge.net with details on your setup, so we can try to fix "
-"this in future versions of RKWard."
-msgstr ""
-"R içinde yeni bir X11 penceresi oluşturdunuz. Genellikle RKWard bu gibi "
-"pencereleri kontrol etmek için bulur ve onları menü çubuğuna ekler. Ancak şu "
-"an, RKWard oluşturulan pencereyi bulamadı ve ekleyemedi.\n"
-"Bu durum farklı bir ekran veya X11 üzerinde pencere oluşturduysanız meydana "
-"gelir. Daha sonra seçenekleri değiştirebilirsiniz (\"display\"),\n"
-"Bu mesaj gibi aynı ekranda X11 penceresi görebiliyorsanız RKWard daha "
-"iyisini yapabilir. Bu durumda lütfen ayarlarınızdaki detaylarla birlikte  "
-"rkward-devel at lists.sourceforge.net de bizimle iletişim kurunuz. RKWard'ın "
-"ileriki sürümlerine bunu düzeltmeye çalışacağız."
-
-#: windows/rkwindowcatcher.cpp:60
-msgid "Could not embed R X11 window"
-msgstr "R X11 penceresini içine koyamıyor"
-
-#: windows/rkwindowcatcher.cpp:93
-msgid "An error occurred"
-msgstr "Bazı hatalar oluştu"
-
-#: windows/rkwindowcatcher.cpp:193
-msgid "Specify fixed size"
-msgstr "Düzeltilmiş büyüklüğü belirt"
-
-#: windows/rkwindowcatcher.cpp:218
-msgid "Activate graphics device number %1"
-msgstr "Grafik aygıtı %1 i etkinleştir"
-
-#: windows/rkwindowcatcher.cpp:224
-msgid "Copy contents of graphics device number %1 to output"
-msgstr "Grafik aygıtı %1 in içeriğini çıktıya kopyala"
-
-#: windows/rkwindowcatcher.cpp:230
-msgid "Print contents of graphics device number %1"
-msgstr "Grafik aygıtı %1 için içeriğini yazdır"
-
-#: windows/rkwindowcatcher.cpp:237
-msgid "Specify R object"
-msgstr "R nesnesi belirt"
-
-#: windows/rkwindowcatcher.cpp:240
-msgid "Specify the R object name, you want to save the graph to"
-msgstr "R nesnesi ismi belirt, grafiği kaydetmek isterseniz"
-
-#: windows/rkwindowcatcher.cpp:251
-msgid "Save contents of graphics device number %1 to object '%2'"
-msgstr "Grafik aygıtı %1 in içeriğini nesne %2 ye kaydet"
-
-#: windows/rkwindowcatcher.cpp:260
-msgid "Duplicate graphics device number %1"
-msgstr "Grafik aygıtı %1 in kopyasını yap"
-
-#: windows/rkwindowcatcher.cpp:280
-msgid "Draw area follows size of window"
-msgstr "Çizim alanı pencerenin büyüklüğü kadardır"
-
-#: windows/rkwindowcatcher.cpp:282
-msgid "Set fixed size 500x500"
-msgstr "Büyüklüğü 500x500 olarak ayarla"
-
-#: windows/rkwindowcatcher.cpp:283
-msgid "Set fixed size 1000x1000"
-msgstr "Büyüklüğü 1000x1000 olarak ayarla"
-
-#: windows/rkwindowcatcher.cpp:284
-msgid "Set fixed size 2000x2000"
-msgstr "Büyüklüğü 2000x2000 olarak ayarla"
-
-#: windows/rkwindowcatcher.cpp:285
-msgid "Set specified fixed size..."
-msgstr "Belirtilen büyüklüğü ayarla..."
-
-#: windows/rkwindowcatcher.cpp:287
-msgid "Make active"
-msgstr "Etkin yap"
-
-#: windows/rkwindowcatcher.cpp:288
-msgid "Copy to output"
-msgstr "Çıktıya kopyala"
-
-#: windows/rkwindowcatcher.cpp:290
-msgid "Store as R object..."
-msgstr "R nesnesi olarak sakla..."
-
-#: windows/rkwindowcatcher.cpp:291
-msgid "Duplicate"
-msgstr "İkile"
-
 #: windows/rkcommandeditorwindowpart.cpp:51
 msgid "Run all"
 msgstr "Hepsini çalıştır"
 
-#: windows/rkcommandeditorwindowpart.cpp:52 windows/rkcommandlog.cpp:287
-#: windows/rkhtmlwindow.cpp:94 rkconsole.cpp:742
+#: windows/rkcommandeditorwindowpart.cpp:52 windows/rkhtmlwindow.cpp:94
+#: windows/rkcommandlog.cpp:287 rkconsole.cpp:742
 msgid "Run selection"
 msgstr "Seçileni çalıştır"
 
@@ -507,158 +408,6 @@
 msgid "&Function reference"
 msgstr "&Fonksiyon başvuru"
 
-#: windows/rkhelpsearchwindow.cpp:55
-msgid "Find:"
-msgstr "Bul:"
-
-#: windows/rkhelpsearchwindow.cpp:58
-msgid "Fields:"
-msgstr "Alanlar:"
-
-#: windows/rkhelpsearchwindow.cpp:71 windows/rkhelpsearchwindow.cpp:82
-#: robjectbrowser.cpp:219
-msgid "All"
-msgstr "Hepsi"
-
-#: windows/rkhelpsearchwindow.cpp:72
-msgid "All but keywords"
-msgstr "Hepsi fakat anahtar kelimeler"
-
-#: windows/rkhelpsearchwindow.cpp:73
-msgid "Keywords"
-msgstr "Anahtar kelimeler"
-
-#: windows/rkhelpsearchwindow.cpp:74 windows/rkhelpsearchwindow.cpp:99
-#: dialogs/rkloadlibsdialog.cpp:261
-msgid "Title"
-msgstr "Başlık"
-
-#: windows/rkhelpsearchwindow.cpp:77
-msgid "Package:"
-msgstr "Paket:"
-
-#: windows/rkhelpsearchwindow.cpp:86
-msgid "Case sensitive"
-msgstr "Büyük/küçük harf duyarlı"
-
-#: windows/rkhelpsearchwindow.cpp:88
-msgid "Fuzzy matching"
-msgstr "Bulanık karşılaştırma"
-
-#: windows/rkhelpsearchwindow.cpp:92
-msgid "Find"
-msgstr "Bul"
-
-#: windows/rkhelpsearchwindow.cpp:98
-msgid "Topic"
-msgstr "Konu"
-
-#: windows/rkhelpsearchwindow.cpp:100
-msgid "Package"
-msgstr "Paket"
-
-#: windows/rkhelpsearchwindow.cpp:106
-msgid "Help search"
-msgstr "Yardım ara"
-
-#: windows/rkhelpsearchwindow.cpp:212
-msgid ""
-"No help found on '%1'. Maybe the corresponding package is not installed/"
-"loaded, or maybe you mistyped the command. Try using Help->Search R Help for "
-"more options."
-msgstr ""
-"'%1' de yardım bulunamadı. Uygun paket kurulmamış/yüklenmemiş olabilir  veya "
-"komut doğru yazılmamış. Yardım->Daha fazla R yardımı kullanmayı deneyin."
-
-#: windows/rkhelpsearchwindow.cpp:212
-msgid "No help found"
-msgstr "Yardım bulunamadı"
-
-#: windows/rkcommandeditorwindow.cpp:130 windows/rkcommandeditorwindow.cpp:224
-msgid " [modified]"
-msgstr " [değiştirilmiş]"
-
-#: windows/rkcommandeditorwindow.cpp:143
-msgid "The document \"%1\" has been modified. Close it anyway?"
-msgstr "Dosya \"%1\"değişmiş. Yine de kapatılsın mı?"
-
-#: windows/rkcommandeditorwindow.cpp:143
-msgid "File not saved"
-msgstr "Dosya kaydedilmedi"
-
-#: windows/rkcommandeditorwindow.cpp:223
-msgid "Unnamed"
-msgstr "İsimsiz"
-
-#: windows/rkcommandlog.cpp:54 settings/rksettingsmodulewatch.cpp:277
-msgid "Command log"
-msgstr "Komut kayıtları"
-
-#: windows/rkcommandlog.cpp:173
-msgid "Incomplete statement.\n"
-msgstr "Tamamlanmamış ifade.\n"
-
-#: windows/rkcommandlog.cpp:175
-msgid "Syntax error.\n"
-msgstr "Sözdizimi hatası.\n"
-
-#: windows/rkcommandlog.cpp:177
-msgid "An unspecified error occurred while running the command.\n"
-msgstr "Komut çalışırken belirlenemeyen bir hata oluştu.\n"
-
-#: windows/rkworkplaceview.cpp:58
-#, fuzzy
-msgid "Window Left"
-msgstr "&Pencereler"
-
-#: windows/rkworkplaceview.cpp:62
-#, fuzzy
-msgid "Window Right"
-msgstr "&Pencereler"
-
-#: windows/rkworkplace.cpp:144
-msgid "Unable to open \"%1\""
-msgstr "\"%1\" açılamıyor"
-
-#: windows/rkworkplace.cpp:144
-msgid "Could not open command file"
-msgstr "Komut dosyası açılmadı"
-
-#: windows/rkworkplace.cpp:240
-msgid ""
-"You are about to edit object \"%1\", which is very large (%2 fields). RKWard "
-"is not optimized to handle very large objects in the built in data editor. "
-"This will use a lot of memory, and - depending on your system - might be "
-"very slow. For large objects it is generally recommended to edit using "
-"command line means or to split into smaller chunks before editing. On the "
-"other hand, if you have enough memory, or the data is simple enough (numeric "
-"data is easier to handle, than factor), editing may not be a problem at all. "
-"You can configure / turn of this warning under Settings->Configure RKWard-"
-">General.\n"
-"Really edit object?"
-msgstr ""
-
-#: windows/rkworkplace.cpp:240
-msgid "About to edit very large object"
-msgstr ""
-
-#: windows/rkworkplace.cpp:349
-msgid "Save Workplace layout"
-msgstr "Çalışma alanı düzenini kaydet"
-
-#: windows/rkworkplace.cpp:356
-msgid "Restore Workplace layout"
-msgstr "ÇAlışma alanı düzenini geri koy"
-
-#: windows/rkworkplace.cpp:426
-msgid "Previous Window"
-msgstr ""
-
-#: windows/rkworkplace.cpp:430
-#, fuzzy
-msgid "Next Window"
-msgstr "&Pencereler"
-
 #: windows/rkhtmlwindow.cpp:168
 msgid ""
 "The url you are trying to open ('%1') is not a local file. Do you want to "
@@ -751,7 +500,7 @@
 
 #: windows/rkhtmlwindow.cpp:570
 msgid "Technical details"
-msgstr ""
+msgstr "Teknik detaylar"
 
 #: windows/rkhtmlwindow.cpp:647
 msgid "R Reference on '%1'"
@@ -823,14 +572,299 @@
 msgid "Open (Waiting)"
 msgstr "Aç (Bekleniyor)"
 
+#: windows/rkcommandeditorwindow.cpp:130 windows/rkcommandeditorwindow.cpp:224
+msgid " [modified]"
+msgstr " [değiştirilmiş]"
+
+#: windows/rkcommandeditorwindow.cpp:143
+msgid "The document \"%1\" has been modified. Close it anyway?"
+msgstr "Dosya \"%1\"değişmiş. Yine de kapatılsın mı?"
+
+#: windows/rkcommandeditorwindow.cpp:143
+msgid "File not saved"
+msgstr "Dosya kaydedilmedi"
+
+#: windows/rkcommandeditorwindow.cpp:223
+msgid "Unnamed"
+msgstr "İsimsiz"
+
 #: windows/detachedwindowcontainer.cpp:39
 msgid "Attach to main window"
 msgstr "Ana pencereye ekle"
 
+#: windows/rkworkplaceview.cpp:58
+msgid "Window Left"
+msgstr "Sol Pencere"
+
+#: windows/rkworkplaceview.cpp:62
+msgid "Window Right"
+msgstr "Sağ Pencere"
+
+#: windows/rkworkplace.cpp:144
+msgid "Unable to open \"%1\""
+msgstr "\"%1\" açılamıyor"
+
+#: windows/rkworkplace.cpp:144
+msgid "Could not open command file"
+msgstr "Komut dosyası açılmadı"
+
+#: windows/rkworkplace.cpp:240
+msgid ""
+"You are about to edit object \"%1\", which is very large (%2 fields). RKWard "
+"is not optimized to handle very large objects in the built in data editor. "
+"This will use a lot of memory, and - depending on your system - might be "
+"very slow. For large objects it is generally recommended to edit using "
+"command line means or to split into smaller chunks before editing. On the "
+"other hand, if you have enough memory, or the data is simple enough (numeric "
+"data is easier to handle, than factor), editing may not be a problem at all. "
+"You can configure / turn of this warning under Settings->Configure RKWard-"
+">General.\n"
+"Really edit object?"
+msgstr ""
+
+#: windows/rkworkplace.cpp:240
+msgid "About to edit very large object"
+msgstr "Çok geniş nesne düzenleme hakkında"
+
+#: windows/rkworkplace.cpp:349
+msgid "Save Workplace layout"
+msgstr "Çalışma alanı düzenini kaydet"
+
+#: windows/rkworkplace.cpp:356
+msgid "Restore Workplace layout"
+msgstr "Çalışma alanı düzenini geri koy"
+
+#: windows/rkworkplace.cpp:426
+msgid "Previous Window"
+msgstr "Önceki Pencere"
+
+#: windows/rkworkplace.cpp:430
+msgid "Next Window"
+msgstr "Yeni Pencere"
+
+#: windows/rkcommandlog.cpp:54 settings/rksettingsmodulewatch.cpp:277
+msgid "Command log"
+msgstr "Komut kayıtları"
+
+#: windows/rkcommandlog.cpp:173
+msgid "Incomplete statement.\n"
+msgstr "Tamamlanmamış ifade.\n"
+
+#: windows/rkcommandlog.cpp:175
+msgid "Syntax error.\n"
+msgstr "Sözdizimi hatası.\n"
+
+#: windows/rkcommandlog.cpp:177
+msgid "An unspecified error occurred while running the command.\n"
+msgstr "Komut çalışırken belirlenemeyen bir hata oluştu.\n"
+
+#: windows/rkwindowcatcher.cpp:60
+msgid ""
+"You have created a new X11 device window in R. Usually, RKWard tries to "
+"detect such windows, to take control of them, and add a menu-bar to them. "
+"This time, however, RKWard failed to detect, which window was created, and "
+"so can not embed it.\n"
+"If you created the window on a different screen or X11 display, that is to "
+"be expected. You might want to consider changing options(\"display\"), "
+"then.\n"
+"If you can see the X11 window on the same screen as this message, then "
+"RKWard should do better. In this case, please contact us at rkward-"
+"devel at lists.sourceforge.net with details on your setup, so we can try to fix "
+"this in future versions of RKWard."
+msgstr ""
+"R içinde yeni bir X11 penceresi oluşturdunuz. Genellikle RKWard bu gibi "
+"pencereleri kontrol etmek için bulur ve onları menü çubuğuna ekler. Ancak şu "
+"an, RKWard oluşturulan pencereyi bulamadı ve ekleyemedi.\n"
+"Bu durum farklı bir ekran veya X11 üzerinde pencere oluşturduysanız meydana "
+"gelir. Daha sonra seçenekleri değiştirebilirsiniz (\"display\"),\n"
+"Bu mesaj gibi aynı ekranda X11 penceresi görebiliyorsanız RKWard daha "
+"iyisini yapabilir. Bu durumda lütfen ayarlarınızdaki detaylarla birlikte  "
+"rkward-devel at lists.sourceforge.net de bizimle iletişim kurunuz. RKWard'ın "
+"ileriki sürümlerine bunu düzeltmeye çalışacağız."
+
+#: windows/rkwindowcatcher.cpp:60
+msgid "Could not embed R X11 window"
+msgstr "R X11 penceresini içine koyamıyor"
+
+#: windows/rkwindowcatcher.cpp:93
+msgid "An error occurred"
+msgstr "Bazı hatalar oluştu"
+
+#: windows/rkwindowcatcher.cpp:193
+msgid "Specify fixed size"
+msgstr "Düzeltilmiş büyüklüğü belirt"
+
+#: windows/rkwindowcatcher.cpp:218
+msgid "Activate graphics device number %1"
+msgstr "Grafik aygıtı %1 i etkinleştir"
+
+#: windows/rkwindowcatcher.cpp:224
+msgid "Copy contents of graphics device number %1 to output"
+msgstr "Grafik aygıtı %1 in içeriğini çıktıya kopyala"
+
+#: windows/rkwindowcatcher.cpp:230
+msgid "Print contents of graphics device number %1"
+msgstr "Grafik aygıtı %1 için içeriğini yazdır"
+
+#: windows/rkwindowcatcher.cpp:237
+msgid "Specify R object"
+msgstr "R nesnesi belirt"
+
+#: windows/rkwindowcatcher.cpp:240
+msgid "Specify the R object name, you want to save the graph to"
+msgstr "R nesnesi ismi belirt, grafiği kaydetmek isterseniz"
+
+#: windows/rkwindowcatcher.cpp:251
+msgid "Save contents of graphics device number %1 to object '%2'"
+msgstr "Grafik aygıtı %1 in içeriğini nesne %2 ye kaydet"
+
+#: windows/rkwindowcatcher.cpp:260
+msgid "Duplicate graphics device number %1"
+msgstr "Grafik aygıtı %1 in kopyasını yap"
+
+#: windows/rkwindowcatcher.cpp:280
+msgid "Draw area follows size of window"
+msgstr "Çizim alanı pencerenin büyüklüğü kadardır"
+
+#: windows/rkwindowcatcher.cpp:282
+msgid "Set fixed size 500x500"
+msgstr "Büyüklüğü 500x500 olarak ayarla"
+
+#: windows/rkwindowcatcher.cpp:283
+msgid "Set fixed size 1000x1000"
+msgstr "Büyüklüğü 1000x1000 olarak ayarla"
+
+#: windows/rkwindowcatcher.cpp:284
+msgid "Set fixed size 2000x2000"
+msgstr "Büyüklüğü 2000x2000 olarak ayarla"
+
+#: windows/rkwindowcatcher.cpp:285
+msgid "Set specified fixed size..."
+msgstr "Belirtilen büyüklüğü ayarla..."
+
+#: windows/rkwindowcatcher.cpp:287
+msgid "Make active"
+msgstr "Etkin yap"
+
+#: windows/rkwindowcatcher.cpp:288
+msgid "Copy to output"
+msgstr "Çıktıya kopyala"
+
+#: windows/rkwindowcatcher.cpp:290
+msgid "Store as R object..."
+msgstr "R nesnesi olarak sakla..."
+
+#: windows/rkwindowcatcher.cpp:291
+msgid "Duplicate"
+msgstr "İkile"
+
+#: windows/rkhelpsearchwindow.cpp:55
+msgid "Find:"
+msgstr "Bul:"
+
+#: windows/rkhelpsearchwindow.cpp:58
+msgid "Fields:"
+msgstr "Alanlar:"
+
+#: windows/rkhelpsearchwindow.cpp:71 windows/rkhelpsearchwindow.cpp:82
+#: robjectbrowser.cpp:219
+msgid "All"
+msgstr "Hepsi"
+
+#: windows/rkhelpsearchwindow.cpp:72
+msgid "All but keywords"
+msgstr "Hepsi fakat anahtar kelimeler"
+
+#: windows/rkhelpsearchwindow.cpp:73
+msgid "Keywords"
+msgstr "Anahtar kelimeler"
+
+#: windows/rkhelpsearchwindow.cpp:74 windows/rkhelpsearchwindow.cpp:99
+#: dialogs/rkloadlibsdialog.cpp:258
+msgid "Title"
+msgstr "Başlık"
+
+#: windows/rkhelpsearchwindow.cpp:77
+msgid "Package:"
+msgstr "Paket:"
+
+#: windows/rkhelpsearchwindow.cpp:86
+msgid "Case sensitive"
+msgstr "Büyük/küçük harf duyarlı"
+
+#: windows/rkhelpsearchwindow.cpp:88
+msgid "Fuzzy matching"
+msgstr "Bulanık karşılaştırma"
+
+#: windows/rkhelpsearchwindow.cpp:92
+msgid "Find"
+msgstr "Bul"
+
+#: windows/rkhelpsearchwindow.cpp:98
+msgid "Topic"
+msgstr "Konu"
+
+#: windows/rkhelpsearchwindow.cpp:100
+msgid "Package"
+msgstr "Paket"
+
+#: windows/rkhelpsearchwindow.cpp:106
+msgid "Help search"
+msgstr "Yardım ara"
+
+#: windows/rkhelpsearchwindow.cpp:212
+msgid ""
+"No help found on '%1'. Maybe the corresponding package is not installed/"
+"loaded, or maybe you mistyped the command. Try using Help->Search R Help for "
+"more options."
+msgstr ""
+"'%1' de yardım bulunamadı. Uygun paket kurulmamış/yüklenmemiş olabilir  veya "
+"komut doğru yazılmamış. Yardım->Daha fazla R yardımı kullanmayı deneyin."
+
+#: windows/rkhelpsearchwindow.cpp:212
+msgid "No help found"
+msgstr "Yardım bulunamadı"
+
 #: plugin/rkpluginspinbox.cpp:43
 msgid "Enter value:"
 msgstr "Değer girin:"
 
+#: plugin/rkpluginbrowser.cpp:50
+msgid "Enter filename"
+msgstr "Dosya ismi girin"
+
+#: plugin/rkpluginbrowser.cpp:50
+msgid "Select"
+msgstr "Seç"
+
+#: plugin/rkformula.cpp:66
+msgid "Full Model"
+msgstr "T\xC3\xBCm Model"
+
+#: plugin/rkformula.cpp:67
+msgid "Main Effects only"
+msgstr "Sadece ana etkiler"
+
+#: plugin/rkformula.cpp:68
+msgid "Custom Model:"
+msgstr "Özel Model:"
+
+#: plugin/rkformula.cpp:90
+msgid "Main effects"
+msgstr "Ana etkiler"
+
+#: plugin/rkformula.cpp:95
+msgid "Level"
+msgstr "Düzey"
+
+#: plugin/rkformula.cpp:96
+msgid "Term"
+msgstr "Terim"
+
+#: plugin/rkformula.cpp:103
+msgid "Specify model"
+msgstr "Modeli belirle"
+
 #: plugin/rkstandardcomponent.cpp:74
 msgid ""
 "There has been an error while trying to parse the description of this plugin "
@@ -896,86 +930,50 @@
 msgid "Use Dialog"
 msgstr "Diyalog kullan"
 
+#: plugin/rkvarslot.cpp:45
+msgid "Variable:"
+msgstr "Değişken:"
+
+#: plugin/rkradio.cpp:42 plugin/rkdropdown.cpp:41
+msgid "Select one:"
+msgstr "Birini seç:"
+
+#: plugin/rkinput.cpp:49
+msgid "Enter text"
+msgstr "Metin girişi"
+
+#: plugin/rkcomponentmap.cpp:97 plugin/rkcomponentmap.cpp:248
+msgid "(no label)"
+msgstr "(başlık yok)"
+
 #: plugin/rkpreviewbox.cpp:47
 msgid "Preview"
-msgstr ""
+msgstr "Önizleme"
 
 #: plugin/rkpreviewbox.cpp:167
 msgid "Preview disabled"
-msgstr ""
+msgstr "Önizleme pasifleştirildi"
 
 #: plugin/rkpreviewbox.cpp:171
 msgid "Preview up to date"
-msgstr ""
+msgstr "Önizlemeyi güncelle"
 
 #: plugin/rkpreviewbox.cpp:173
 msgid "Preview updating"
-msgstr ""
+msgstr "Önizleme güncelleniyor"
 
 #: plugin/rkpreviewbox.cpp:176
 msgid "Preview not (yet) possible"
-msgstr ""
+msgstr "Önizleme henüz olanaklı değil"
 
-#: plugin/rkvarslot.cpp:45
-msgid "Variable:"
-msgstr "Değişken:"
-
-#: plugin/rkpluginbrowser.cpp:50
-msgid "Enter filename"
-msgstr "Dosya ismi girin"
-
-#: plugin/rkpluginbrowser.cpp:50
-msgid "Select"
-msgstr "Seç"
-
 #: plugin/rkpluginsaveobject.cpp:41 rkward.cpp:234
 msgid "my.data"
 msgstr "my.data"
 
 #: plugin/rkpluginsaveobject.cpp:41
 msgid "Save to:"
-msgstr ""
+msgstr "Farklı kaydet:"
 
-#: plugin/rkformula.cpp:66
-msgid "Full Model"
-msgstr "Tüm Model"
-
-#: plugin/rkformula.cpp:67
-msgid "Main Effects only"
-msgstr "Sadece ana etkiler"
-
-#: plugin/rkformula.cpp:68
-msgid "Custom Model:"
-msgstr "Özel Model:"
-
-#: plugin/rkformula.cpp:90
-msgid "Main effects"
-msgstr "Ana etkiler"
-
-#: plugin/rkformula.cpp:95
-msgid "Level"
-msgstr "Düzey"
-
-#: plugin/rkformula.cpp:96
-msgid "Term"
-msgstr "Terim"
-
-#: plugin/rkformula.cpp:103
-msgid "Specify model"
-msgstr "Modeli belirle"
-
-#: plugin/rkdropdown.cpp:41 plugin/rkradio.cpp:42
-msgid "Select one:"
-msgstr "Birini seç:"
-
-#: plugin/rkinput.cpp:49
-msgid "Enter text"
-msgstr "Metin girişi"
-
-#: plugin/rkcomponentmap.cpp:97 plugin/rkcomponentmap.cpp:248
-msgid "(no label)"
-msgstr "(başlık yok)"
-
 #: settings/rksettingsmoduleobjectbrowser.cpp:41
 msgid "Which objects should be shown by default?"
 msgstr "Hangi nesneler varsayılan olarak sütunlar gösterilsin?"
@@ -1022,8 +1020,7 @@
 
 #: settings/rksettingsmodulegeneral.cpp:49
 msgid "Settings marked with (*) do not take effect until you restart RKWard"
-msgstr ""
-"(*) ile işaretlenen ayarlar, RKWard yeniden başlatılıncaya kadar etkili olmaz"
+msgstr "(*) ile işaretlenen ayarlar, RKWard yeniden başlatılıncaya kadar etkili olmaz"
 
 #: settings/rksettingsmodulegeneral.cpp:53
 msgid "Directory where the logfiles should be kept (*)"
@@ -1085,12 +1082,11 @@
 msgid ""
 "Warn when editing objects with more than this number of fields (0 for no "
 "limit):"
-msgstr ""
+msgstr "Alanda kaç nesne düzenlenecek (Sınır koymamak için sıfır kullanın)"
 
 #: settings/rksettingsmodulegeneral.cpp:95
-#, fuzzy
 msgid "No limit"
-msgstr "Başlık Yok"
+msgstr "Sınır Yok"
 
 #: settings/rksettingsmodulegeneral.cpp:119
 msgid "General"
@@ -1119,16 +1115,15 @@
 
 #: settings/rksettingsmoduleplugins.cpp:67
 msgid "R syntax display (in dialogs)"
-msgstr ""
+msgstr "R sözdizimi görünümü "
 
 #: settings/rksettingsmoduleplugins.cpp:68
-#, fuzzy
 msgid "Code shown by default"
-msgstr "Hangi nesneler varsayılan olarak sütunlar gösterilsin?"
+msgstr "Hangi sütunlar varsayılan olarak gösterilsin?"
 
 #: settings/rksettingsmoduleplugins.cpp:73
 msgid "Default height of code display (pixels)"
-msgstr ""
+msgstr " Kod ekranının varsayılan yüksekliği(piksel)"
 
 #: settings/rksettingsmoduleplugins.cpp:81
 msgid "Select .pluginmap file(s)"
@@ -1322,7 +1317,7 @@
 
 #: settings/rksettingsmoduleconsole.cpp:71
 msgid "Command history is context sensitive by default"
-msgstr ""
+msgstr "Komut geçmişi öntanımlı olarak içinde bulunulan bağlama duyarlıdır."
 
 #: settings/rksettingsmoduleconsole.cpp:167
 msgid "Console"
@@ -1400,35 +1395,35 @@
 msgid "Always do this on startup"
 msgstr "Bu cevabı hatırla"
 
-#: dialogs/rkloadlibsdialog.cpp:53 rkward.cpp:327
+#: dialogs/rkloadlibsdialog.cpp:50 rkward.cpp:327
 msgid "Configure Packages"
 msgstr "Paketleri yapılandır"
 
-#: dialogs/rkloadlibsdialog.cpp:57
+#: dialogs/rkloadlibsdialog.cpp:54
 msgid "Local packages"
 msgstr "Yerel paketler"
 
-#: dialogs/rkloadlibsdialog.cpp:63 robjectbrowser.cpp:62
+#: dialogs/rkloadlibsdialog.cpp:60 robjectbrowser.cpp:62
 msgid "Update"
 msgstr "Güncelle"
 
-#: dialogs/rkloadlibsdialog.cpp:67
+#: dialogs/rkloadlibsdialog.cpp:64
 msgid "Install"
 msgstr "Kur"
 
-#: dialogs/rkloadlibsdialog.cpp:71
+#: dialogs/rkloadlibsdialog.cpp:68
 msgid "Configure Repositories"
 msgstr "Depoları yapılandır"
 
-#: dialogs/rkloadlibsdialog.cpp:208
+#: dialogs/rkloadlibsdialog.cpp:205
 msgid "Please stand by while installing selected packages"
 msgstr "Seçilen paketler kurulurken lütfen bekleyin."
 
-#: dialogs/rkloadlibsdialog.cpp:208
+#: dialogs/rkloadlibsdialog.cpp:205
 msgid "Installing packages"
 msgstr "Paketler kuruluyor"
 
-#: dialogs/rkloadlibsdialog.cpp:249
+#: dialogs/rkloadlibsdialog.cpp:246
 msgid ""
 "There are no safeguards against removing essential packages. For example, "
 "unloading \"rkward\" will prevent this application from running properly. "
@@ -1438,31 +1433,31 @@
 "boşaltmak bu uygulamanın uygun şekilde çalışmasını engelleyecek. Lütfen, "
 "çıkartma istediğiniz paketlere dikkat edin."
 
-#: dialogs/rkloadlibsdialog.cpp:258
+#: dialogs/rkloadlibsdialog.cpp:255
 msgid "Installed packages"
 msgstr "Kurulan paketler"
 
-#: dialogs/rkloadlibsdialog.cpp:262 dialogs/rkloadlibsdialog.cpp:614
+#: dialogs/rkloadlibsdialog.cpp:259 dialogs/rkloadlibsdialog.cpp:611
 msgid "Version"
 msgstr "Versiyon"
 
-#: dialogs/rkloadlibsdialog.cpp:263 dialogs/rkloadlibsdialog.cpp:464
+#: dialogs/rkloadlibsdialog.cpp:260 dialogs/rkloadlibsdialog.cpp:461
 msgid "Location"
 msgstr "Yer"
 
-#: dialogs/rkloadlibsdialog.cpp:268
+#: dialogs/rkloadlibsdialog.cpp:265
 msgid "Load"
 msgstr "Yükle"
 
-#: dialogs/rkloadlibsdialog.cpp:270
+#: dialogs/rkloadlibsdialog.cpp:267
 msgid "Unload"
 msgstr "Çıkar"
 
-#: dialogs/rkloadlibsdialog.cpp:277
+#: dialogs/rkloadlibsdialog.cpp:274
 msgid "Loaded packages"
 msgstr "Yüklenen paketler"
 
-#: dialogs/rkloadlibsdialog.cpp:399
+#: dialogs/rkloadlibsdialog.cpp:396
 msgid ""
 "There has been an error while trying to load / unload packages. See "
 "transcript below for details"
@@ -1470,11 +1465,11 @@
 "Paketler yükleme/çıkarmaya çalışılırken hata oluştu. Detaylar için aşağıya "
 "bakın"
 
-#: dialogs/rkloadlibsdialog.cpp:399
+#: dialogs/rkloadlibsdialog.cpp:396
 msgid "Error while handling packages"
 msgstr "Paketler elden geçirilirken hata"
 
-#: dialogs/rkloadlibsdialog.cpp:456
+#: dialogs/rkloadlibsdialog.cpp:453
 msgid ""
 "In order to find out, which of your installed packaged have an update "
 "available, click \"Fetch List\". This feature requires a working internet "
@@ -1483,41 +1478,41 @@
 "Kurulan paketlerden güncellemesi olanlarını bulabilmek için  \"Listeyi al\"."
 "düğmesine tıklayın. Bu özellik internet bağlantısı gerektirir."
 
-#: dialogs/rkloadlibsdialog.cpp:465
+#: dialogs/rkloadlibsdialog.cpp:462
 msgid "Local Version"
 msgstr "Yerel Sürüm"
 
-#: dialogs/rkloadlibsdialog.cpp:466
+#: dialogs/rkloadlibsdialog.cpp:463
 msgid "Online Version"
 msgstr "Online Sürüm"
 
-#: dialogs/rkloadlibsdialog.cpp:471 dialogs/rkloadlibsdialog.cpp:619
+#: dialogs/rkloadlibsdialog.cpp:468 dialogs/rkloadlibsdialog.cpp:616
 msgid "Fetch list"
 msgstr "Listeyi al"
 
-#: dialogs/rkloadlibsdialog.cpp:473
+#: dialogs/rkloadlibsdialog.cpp:470
 msgid "Update Selected"
 msgstr "Seçileni güncelle"
 
-#: dialogs/rkloadlibsdialog.cpp:475
+#: dialogs/rkloadlibsdialog.cpp:472
 msgid "Update All"
 msgstr "Hepsini güncelle"
 
-#: dialogs/rkloadlibsdialog.cpp:532
+#: dialogs/rkloadlibsdialog.cpp:529
 msgid "[No updates available]"
 msgstr "[Güncelleme yok]"
 
-#: dialogs/rkloadlibsdialog.cpp:581
+#: dialogs/rkloadlibsdialog.cpp:578
 msgid ""
 "Please stand by while determining, which packages have an update available "
 "online."
 msgstr "Online güncellemesi olan paketler belirlenirken lütfen bekleyin."
 
-#: dialogs/rkloadlibsdialog.cpp:581 dialogs/rkloadlibsdialog.cpp:710
+#: dialogs/rkloadlibsdialog.cpp:578 dialogs/rkloadlibsdialog.cpp:707
 msgid "Fetching list"
 msgstr "Listeyi alınıyor"
 
-#: dialogs/rkloadlibsdialog.cpp:607
+#: dialogs/rkloadlibsdialog.cpp:604
 msgid ""
 "Many packages are available on CRAN (Comprehensive R Archive Network), and "
 "other repositories (click \"Configure Repositories\" to add more sources). "
@@ -1529,19 +1524,19 @@
 "tıklayın). Uygun olan paketleri görmek için \"Listeyi Al\" 'a tıklayın. Bu "
 "özellik internet bağlantısı gerektirmektedir."
 
-#: dialogs/rkloadlibsdialog.cpp:621
+#: dialogs/rkloadlibsdialog.cpp:618
 msgid "Install Selected"
 msgstr "Seçileni kur"
 
-#: dialogs/rkloadlibsdialog.cpp:672
+#: dialogs/rkloadlibsdialog.cpp:669
 msgid "[No packages available]"
 msgstr "[Uygun paket yok]"
 
-#: dialogs/rkloadlibsdialog.cpp:710
+#: dialogs/rkloadlibsdialog.cpp:707
 msgid "Please stand by while downloading the list of available packages."
 msgstr "Varolan paketlerin listesi indirilirken lütfen bekleyin."
 
-#: dialogs/rkloadlibsdialog.cpp:730
+#: dialogs/rkloadlibsdialog.cpp:727
 msgid ""
 "The package requested by the backend (\"%1\") was not found in the package "
 "repositories. Maybe the package name was mis-spelled. Or maybe you need to "
@@ -1551,19 +1546,19 @@
 "bulunamadı. Paket ismi yanlış yazılmış olabilir. Veya \"Configure "
 "Repositories\"-tuşu ile ek paket depoları eklemeye ihtiyaç olabilir."
 
-#: dialogs/rkloadlibsdialog.cpp:730
+#: dialogs/rkloadlibsdialog.cpp:727
 msgid "Package not available"
 msgstr "Uygun paket yok"
 
-#: dialogs/rkloadlibsdialog.cpp:754
+#: dialogs/rkloadlibsdialog.cpp:751
 msgid "Install packages to:"
 msgstr "Paketleri kur:"
 
-#: dialogs/rkloadlibsdialog.cpp:759
+#: dialogs/rkloadlibsdialog.cpp:756
 msgid "Include dependencies"
 msgstr "İçeren bağımlılıklar"
 
-#: dialogs/rkloadlibsdialog.cpp:791
+#: dialogs/rkloadlibsdialog.cpp:788
 msgid ""
 "The directory you are trying to install to (%1) is not writable with your "
 "current user permissions. If you are the adminitstrator of this machine, you "
@@ -1579,27 +1574,25 @@
 "seçmelisiniz (eğer hiçbirine yazılamazsa büyük olasılıkla kullanıcı "
 "\"Configure Repositories\"-tuşu ile yazılabilir klasör ayarlayabilirsiniz.)."
 
-#: dialogs/rkloadlibsdialog.cpp:791
+#: dialogs/rkloadlibsdialog.cpp:788
 msgid "Selected library location not writable"
 msgstr "Seçilen kütüphane yeri yazılabilir değil"
 
-#: dialogs/rkloadlibsdialog.cpp:791
+#: dialogs/rkloadlibsdialog.cpp:788
 msgid "Become root"
 msgstr "Yetkili kullanıcı olun"
 
 #: dialogs/rkimportdialog.cpp:36
-#, fuzzy
 msgid "File format: "
-msgstr "Biçim"
+msgstr "Dosya biçemi: "
 
 #: dialogs/rkimportdialog.cpp:45
 msgid "No plugins defined for context '%1'"
-msgstr ""
+msgstr "'%1' durumu için bir eklenti tanımlanmamış"
 
 #: dialogs/rkimportdialog.cpp:50
-#, fuzzy
 msgid "All Files"
-msgstr "*|Bütün dosyalar"
+msgstr "Bütün Dosyalar"
 
 #: misc/xmlhelper.cpp:61
 msgid "Could not open file for reading"
@@ -1638,17 +1631,17 @@
 msgstr "Geçersiz nitelik değeri. Sadece gerçek sayılara izin verilir."
 
 #: misc/xmlhelper.cpp:219
-#, fuzzy
 msgid "Illegal attribute value. Allowed values are '%1' or '%2', only."
-msgstr "Geçersiz nitelik değeri. İzin verilen değerler sadece '%1' in biridir."
+msgstr ""
+"Geçersiz nitelik değeri. İzin verilen değerler sadece '%1' ya da '%2' "
+"değerleridir."
 
 #: misc/xmlhelper.cpp:230
 msgid "XML-parsing '%1' "
 msgstr "XML-inceleme '%1'"
 
 #: misc/rkprogresscontrol.cpp:203
-msgid ""
-"<b>There have been errors and / or warnings! See below for a transcript</b>"
+msgid "<b>There have been errors and / or warnings! See below for a transcript</b>"
 msgstr "<b>Hatalar veya uyarılar var! Bir kopyası için aşağıya bakın</b>"
 
 #: misc/rkprogresscontrol.cpp:213
@@ -1675,19 +1668,6 @@
 msgid "Errors / Warnings:"
 msgstr "Hatalar/Uyarılar:"
 
-#: misc/rksaveobjectchooser.cpp:39
-msgid "Object name to save to"
-msgstr "Kaydetmek için dosya adı"
-
-#: misc/rksaveobjectchooser.cpp:83
-#, fuzzy
-msgid "Overwrite? (The given object name already exists)"
-msgstr "Verilen simge zaten var"
-
-#: misc/rksaveobjectchooser.cpp:87
-msgid "Overwrite?"
-msgstr "Üzerine yazılsın mı?"
-
 #: misc/rkerrordialog.cpp:121
 msgid "Syntax error"
 msgstr "Söz dizimi hatası"
@@ -1748,11 +1728,23 @@
 msgid "Hidden Objects"
 msgstr "Gizli Nesneler"
 
+#: misc/rksaveobjectchooser.cpp:39
+msgid "Object name to save to"
+msgstr "Kaydetmek için dosya adı"
+
+#: misc/rksaveobjectchooser.cpp:83
+msgid "Overwrite? (The given object name already exists)"
+msgstr "Üzerine yazılsın mı? (Verilen nesne adı zaten var)"
+
+#: misc/rksaveobjectchooser.cpp:87
+msgid "Overwrite?"
+msgstr "Üzerine yazılsın mı?"
+
 #: scriptbackends/phpbackend.cpp:61
 msgid ""
 "The support file \"%1\" could not be found or is not readable. Please check "
 "your installation."
-msgstr ""
+msgstr "Destek dosyası \"%1\" bulunamadı veya okunamıyor. Kurulumunuzu kontrol ediniz."
 
 #: scriptbackends/phpbackend.cpp:61 scriptbackends/phpbackend.cpp:78
 #: scriptbackends/phpbackend.cpp:242 scriptbackends/phpbackend.cpp:302
@@ -1815,18 +1807,20 @@
 "below:\n"
 "%1"
 msgstr ""
+"R backend  bir problemle sonlandı. Oluşan hatalar şunlar:\n"
+"%1"
 
 #: scriptbackends/phpbackend.cpp:317
 msgid "PHP Process exited"
-msgstr ""
+msgstr "PHP İşleminden çıkıldı"
 
-#: rbackend/rinterface.cpp:190
+#: rbackend/rinterface.cpp:188
 msgid ""
 "There was a problem starting the R backend. The following error(s) "
 "occurred:\n"
 msgstr "R backend başlarken bir problem oldu. Oluşan hatalar şunlar:\n"
 
-#: rbackend/rinterface.cpp:192
+#: rbackend/rinterface.cpp:190
 msgid ""
 "\t- The 'rkward' R-library could not be loaded. This library is needed for "
 "communication between R and RKWard and many things will not work properly if "
@@ -1842,7 +1836,7 @@
 "ayarlanmış olmalı. Lütfen tekrar 'make install' komutunu deneyin ve "
 "hataları  kontrol edin. RKWard programı şimdi kapatılmalı.\n"
 
-#: rbackend/rinterface.cpp:195
+#: rbackend/rinterface.cpp:193
 msgid ""
 "\t-There was a problem opening the files needed for communication with R. "
 "Most likely this is due to an incorrect setting for the location of these "
@@ -1855,7 +1849,7 @@
 "yapılandırmadığınızı kontrol ediniz. (Ayarlar->Yapılandırma Ayarları-"
 ">KayıtDosyaları) ve RKWard'ı yeniden başlatınız.\n"
 
-#: rbackend/rinterface.cpp:198
+#: rbackend/rinterface.cpp:196
 msgid ""
 "\t-An unspecified error occurred that is not yet handled by RKWard. Likely "
 "RKWard will not function properly. Please check your setup.\n"
@@ -1863,11 +1857,11 @@
 "\t-RKWard tarafından henüz elden geçirilmeyen belirlenmemiş bir hata oluştu. "
 "RKWard düzgün çalışmayabilir. Lütfen kurulumunuzu kontrol edin.\n"
 
-#: rbackend/rinterface.cpp:200
+#: rbackend/rinterface.cpp:198
 msgid "Error starting R"
 msgstr "R başlarken hata"
 
-#: rbackend/rinterface.cpp:336
+#: rbackend/rinterface.cpp:334
 msgid ""
 "The R-backend has indicated that in order to carry out the current task it "
 "needs the package '%1', which is not currently installed. We will open the "
@@ -1878,11 +1872,11 @@
 "olan paketi '%1' gösterdi. Paket-yönetim aracı ihtiyaç duyulan paketi "
 "bulmanız ve kurmanız için açılacak."
 
-#: rbackend/rinterface.cpp:336
+#: rbackend/rinterface.cpp:334
 msgid "Require package '%1'"
 msgstr "'%1' Gereken paket"
 
-#: rbackend/rinterface.cpp:365
+#: rbackend/rinterface.cpp:363
 msgid ""
 "A command in the R backend is trying to change the character encoding. While "
 "RKWard offers support for this, and will try to adjust to the new locale, "
@@ -1895,24 +1889,23 @@
 "windows, save, and retry."
 msgstr ""
 
-#: rbackend/rinterface.cpp:365
-#, fuzzy
+#: rbackend/rinterface.cpp:363
 msgid "Locale change"
 msgstr "Yerel paketler"
 
-#: rbackend/rinterface.cpp:383
+#: rbackend/rinterface.cpp:381
 msgid "Message from the R backend"
 msgstr "R backend'den mesaj"
 
-#: rbackend/rinterface.cpp:387
+#: rbackend/rinterface.cpp:385
 msgid "R backend requests information"
 msgstr "R backend bilgiye ihtiyaç duyar"
 
-#: rbackend/rinterface.cpp:415
+#: rbackend/rinterface.cpp:413
 msgid "The R engine has encountered a fatal error:\n"
 msgstr "R engine ciddi bir hata ile karşılaştı:\n"
 
-#: rbackend/rinterface.cpp:416
+#: rbackend/rinterface.cpp:414
 msgid ""
 "It will be shut down immediately. This means, you can not use any more "
 "functions that rely on the R backend. I.e. you can do hardly anything at "
@@ -1926,15 +1919,15 @@
 "dosyasını kurtarmak ya da açık veri düzenleyicilerin dışına veriyi "
 "kopyalamaktır. Bundan sonra RKWard'ı kapatın. Üzgünüz!"
 
-#: rbackend/rinterface.cpp:417 rbackend/rinterface.cpp:422
+#: rbackend/rinterface.cpp:415 rbackend/rinterface.cpp:420
 msgid "R engine has died"
 msgstr "R engine durmuş"
 
-#: rbackend/rinterface.cpp:420
+#: rbackend/rinterface.cpp:418
 msgid "The R engine has shut down with status: "
 msgstr "R engine kapatılmış durumda"
 
-#: rbackend/rinterface.cpp:421
+#: rbackend/rinterface.cpp:419
 msgid ""
 "\n"
 "It will be shut down immediately. This means, you can not use any more "
@@ -1959,6 +1952,59 @@
 msgid "R Startup"
 msgstr "R Başlangıç"
 
+#. i18n: file rkconsolepart.rc line 11
+#. i18n: file rkwardui.rc line 32
+#: rc.cpp:3 rc.cpp:27
+#, no-c-format
+msgid "&Run"
+msgstr "&Çalıştır"
+
+#. i18n: file rkwardui.rc line 5
+#: rc.cpp:12
+#, no-c-format
+msgid "&New"
+msgstr "&Yeni"
+
+#. i18n: file rkwardui.rc line 12
+#: rc.cpp:15
+#, no-c-format
+msgid "&Import"
+msgstr "&İçeri Aktar"
+
+#. i18n: file rkwardui.rc line 22
+#: rc.cpp:18
+#, no-c-format
+msgid "&Workspace"
+msgstr "&Çalışma alanı"
+
+#. i18n: file rkwardui.rc line 36
+#: rc.cpp:30
+#, no-c-format
+msgid "&Windows"
+msgstr "&Pencereler"
+
+#. i18n: file rkwardui.rc line 43
+#: rc.cpp:33
+#, no-c-format
+msgid "&Activate"
+msgstr "&Etkinleştir"
+
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+"Çevirenlerin isimleri \n"
+"Harun Hurma"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+"_: Çevirenlerin posta adresleri\n"
+"h.hurma at gmail.com"
+
 #: main.cpp:70 main.cpp:82
 msgid "RKWard"
 msgstr "RKWARD"
@@ -1972,29 +2018,24 @@
 msgstr "Hata ayıklama mesajının gösterimi (0-5)"
 
 #: main.cpp:76
-#, fuzzy
 msgid "Mask for components to debug (see debug.h)"
-msgstr "İkili bir sayı olarak hata ayıklama unsurları için maske"
+msgstr "İkili bir sayı olarak hata ayıklama unsurları için maske "
 
 #: main.cpp:83
-#, fuzzy
 msgid "Project leader / main developer"
-msgstr "Proje lideri"
+msgstr "Proje lideri / ana geliştirici"
 
 #: main.cpp:84
-#, fuzzy
 msgid "C++ coder since 0.2.9"
-msgstr "0.2.9'dan beri  çekirdek kodlayıcı"
+msgstr "0.2.9 sürümünden beri C++ kod yazarı"
 
 #: main.cpp:85
-#, fuzzy
 msgid "Many plugins, suggestions, marketing, translations"
-msgstr "Çeşitli eklentiler, öneriler ve pazarlama"
+msgstr "Çeşitli eklentiler, öneriler ve tanıtım, yerelleştirme"
 
 #: main.cpp:86
-#, fuzzy
 msgid "Many plugins, suggestions"
-msgstr "Çeşitli eklentiler, öneriler ve pazarlama"
+msgstr "Çeşitli eklentiler, öneriler ve tanıtım, yerelleştirme"
 
 #: main.cpp:88
 msgid "Several helpful comments and discussions"
@@ -2021,9 +2062,8 @@
 msgstr "\xC3\x87eşitli değerli yorumlar, ipuçları ve yamalar"
 
 #: main.cpp:94
-#, fuzzy
 msgid "Translation, Suggestions, plugins"
-msgstr "Çeşitli eklentiler, öneriler ve pazarlama"
+msgstr "Çeşitli eklentiler, Öneriler, eklentiler"
 
 #: main.cpp:95
 msgid "Many comments, useful suggestions, and bug reports"
@@ -2031,7 +2071,7 @@
 
 #: main.cpp:96
 msgid "Some patches"
-msgstr ""
+msgstr "Bazı yamalar"
 
 #: main.cpp:97
 msgid "Many more people on rkward-devel at lists.sourceforge.net"
@@ -2044,7 +2084,6 @@
 "benimle iletişim kurunuz"
 
 #: rkward.cpp:195
-#, fuzzy
 msgid ""
 "RKWard has made great progress in the past few months and it is already "
 "helpful for many tasks, but some features may be lacking. You can help us by "
@@ -2098,7 +2137,7 @@
 
 #: rkward.cpp:314
 msgid "Import Data"
-msgstr ""
+msgstr "İçeriye Veri Aktar"
 
 #: rkward.cpp:317
 msgid "Open Workspace"
@@ -2129,33 +2168,28 @@
 msgstr "&Çıktıyı Göster"
 
 #: rkward.cpp:338
-#, fuzzy
 msgid "Show/Hide Workspace Browser"
-msgstr "Çalışma alanını farklı kaydet"
+msgstr "Çalışma alanını göster/gizle"
 
 #: rkward.cpp:339
-#, fuzzy
 msgid "Show/Hide Command Log"
-msgstr "Komut kayıtları"
+msgstr "Komut kayıtlarını göster/gizle"
 
 #: rkward.cpp:340
-#, fuzzy
 msgid "Show/Hide Pending Jobs"
-msgstr "Bekleyen işler"
+msgstr "Bekleyen işleri göster/gizle"
 
 #: rkward.cpp:341
-#, fuzzy
 msgid "Show/Hide Console"
-msgstr "R konsol"
+msgstr "R konsol göster/gizle"
 
 #: rkward.cpp:342
-#, fuzzy
 msgid "Show/Hide R Help Search"
-msgstr "R yardım arama penceresini gösterir/gizler"
+msgstr "R yardım arama penceresini göster/gizle"
 
 #: rkward.cpp:343
 msgid "Activate Document view"
-msgstr ""
+msgstr "Belge görünümünü etkinleştir."
 
 #: rkward.cpp:345
 msgid "Configure RKWard"
@@ -2167,7 +2201,7 @@
 
 #: rkward.cpp:350
 msgid "Import data from a variety of file formats"
-msgstr ""
+msgstr "Değişik dosya biçemlerindeki verileri içeri aktar"
 
 #: rkward.cpp:351
 msgid "Opens an existing document"
@@ -2429,8 +2463,7 @@
 msgid ""
 "An object named '%1' already exists in the GlobalEnv. Created the copy as '%"
 "2' instead."
-msgstr ""
-"Nesne ismi '%1 GlobalEnv'de zaten var. '%2' olarak kopyası oluşturuldu."
+msgstr "Nesne ismi '%1 GlobalEnv'de zaten var. '%2' olarak kopyası oluşturuldu."
 
 #: robjectbrowser.cpp:141
 msgid "Name already in use"
@@ -2456,66 +2489,3 @@
 msgid "Show Hidden Objects"
 msgstr "Gizli Nesneleri Göster"
 
-#. i18n: file rkconsolepart.rc line 11
-#. i18n: file rkwardui.rc line 32
-#: rc.cpp:3 rc.cpp:27
-#, no-c-format
-msgid "&Run"
-msgstr "&Çalıştır"
-
-#. i18n: file rkwardui.rc line 5
-#: rc.cpp:12
-#, no-c-format
-msgid "&New"
-msgstr "&Yeni"
-
-#. i18n: file rkwardui.rc line 12
-#: rc.cpp:15
-#, no-c-format
-msgid "&Import"
-msgstr ""
-
-#. i18n: file rkwardui.rc line 22
-#: rc.cpp:18
-#, no-c-format
-msgid "&Workspace"
-msgstr "&Çalışma alanı"
-
-#. i18n: file rkwardui.rc line 36
-#: rc.cpp:30
-#, no-c-format
-msgid "&Windows"
-msgstr "&Pencereler"
-
-#. i18n: file rkwardui.rc line 43
-#: rc.cpp:33
-#, no-c-format
-msgid "&Activate"
-msgstr ""
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr ""
-"Çevirenlerin isimleri \n"
-"Harun Hurma"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr ""
-"_: Çevirenlerin posta adresleri\n"
-"h.hurma at gmail.com"
-
-#~ msgid "Directory, where the PHP support files are located"
-#~ msgstr "PHP destek dosyalarının bulunduğu klasör"
-
-#~ msgid "## Clean up\n"
-#~ msgstr "## Temizle\n"
-
-#~ msgid "Illegal attribute value. Allowed values are 'true' or 'false', only."
-#~ msgstr ""
-#~ "Geçersiz nitelik değeri. İzin verilen değerler sadece 'true' ya da "
-#~ "'false'."

Modified: branches/release_branch_0.4.7/rkward/plugin/rkcomponent.cpp
===================================================================
--- branches/release_branch_0.4.7/rkward/plugin/rkcomponent.cpp	2007-05-07 10:51:21 UTC (rev 1866)
+++ branches/release_branch_0.4.7/rkward/plugin/rkcomponent.cpp	2007-05-07 10:55:39 UTC (rev 1867)
@@ -60,6 +60,7 @@
 
 void RKComponentBase::setPropertyValues (QMap<QString, QString> *list) {
 	RK_TRACE (PLUGIN);
+	// TODO: visibility enabledness and requiredness should be excluded, as those are not directly user settable. Perhaps even mark up all properties as user settable or not.
 
 	for (QMap<QString, QString>::const_iterator it = list->constBegin (); it != list->constEnd (); ++it) {
 		QString mod;

Modified: branches/release_branch_0.4.7/rkward/plugin/rkcomponent.h
===================================================================
--- branches/release_branch_0.4.7/rkward/plugin/rkcomponent.h	2007-05-07 10:51:21 UTC (rev 1866)
+++ branches/release_branch_0.4.7/rkward/plugin/rkcomponent.h	2007-05-07 10:55:39 UTC (rev 1867)
@@ -58,10 +58,11 @@
 		ComponentPreviewBox = 2014,
 		ComponentSaveObject = 2015,
 		ComponentStandard = 2100,
+		ComponentContextHandler = 2900,
 		ComponentUser = 3000	/**< for user expansion */
 	};
 /** for RTTI. see RKComponentBase::RKComponentTypes */
-	virtual int type () { return ComponentBase; };
+	virtual int type () = 0;
 /** tries to locate a component (or property) described by identifier as a child (of any generation) of this RKComponentBase. If found, a pointer to this is returned. Also, the modifier parameter is set to hold any remaining modifier contained in the identifier.
 @param identifier The identifier string to look for (including a potential modifier suffix).
 @param remainder If a non null pointer to QString is given, this will be set to the value of the remaining modifier

Modified: branches/release_branch_0.4.7/rkward/plugin/rkcomponentcontext.h
===================================================================
--- branches/release_branch_0.4.7/rkward/plugin/rkcomponentcontext.h	2007-05-07 10:51:21 UTC (rev 1866)
+++ branches/release_branch_0.4.7/rkward/plugin/rkcomponentcontext.h	2007-05-07 10:55:39 UTC (rev 1867)
@@ -66,6 +66,7 @@
 friend class RKContextMap;
 public:
 	void invokeComponent (RKComponentHandle *handle);
+	int type () { return ComponentContextHandler; };
 protected:
 /** constructor. Protected. Use RKContextMap::makeContextHandler() instead. */
 	RKContextHandler (QObject *parent, const QDomDocument &gui_xml, const QString &id);

Modified: branches/release_branch_0.4.7/rkward/plugin/rkstandardcomponent.cpp
===================================================================
--- branches/release_branch_0.4.7/rkward/plugin/rkstandardcomponent.cpp	2007-05-07 10:51:21 UTC (rev 1866)
+++ branches/release_branch_0.4.7/rkward/plugin/rkstandardcomponent.cpp	2007-05-07 10:55:39 UTC (rev 1867)
@@ -195,16 +195,14 @@
 	} else if (force_mode == 1) {
 		build_wizard = false;
 		if (dialog_element.isNull ()) {
+			build_wizard = true;
 			xml->displayError (&doc_element, "Dialog mode forced, but no dialog element given", DL_INFO);
-			deleteLater ();
-			return false;
 		}
 	} else if (force_mode == 2) {
 		build_wizard = true;
 		if (wizard_element.isNull ()) {
+			build_wizard = false;
 			xml->displayError (&doc_element, "Wizard mode forced, but no wizard element given", DL_INFO);
-			deleteLater ();
-			return false;
 		}
 	}
 

Modified: branches/release_branch_0.4.7/rkward/plugins/plots/scatterplot.xml
===================================================================
--- branches/release_branch_0.4.7/rkward/plugins/plots/scatterplot.xml	2007-05-07 10:51:21 UTC (rev 1866)
+++ branches/release_branch_0.4.7/rkward/plugins/plots/scatterplot.xml	2007-05-07 10:55:39 UTC (rev 1867)
@@ -102,9 +102,7 @@
 	<wizard label="Scatterplot">
 	<!-- This wizard is somewhat pointless, as all it's really just a copy of the dialog tabs, with one tab per page. But so what, maybe it still "looks" friendlier, while it does not really change anything -->
 		<copy id="variables_tab" copy_element_tag_name="page" />
-		<copy id="axes_tab" copy_element_tag_name="page" />
-		<copy id="type_tab" copy_element_tag_name="page" />
-		<copy id="names_tab" copy_element_tag_name="page" />
 		<copy id="options_tab" copy_element_tag_name="page" />
+		<copy id="further_options_tab" copy_element_tag_name="page" />
 	</wizard>
 </document>

Modified: branches/release_branch_0.4.7/rkward/rbackend/rklocalesupport.cpp
===================================================================
--- branches/release_branch_0.4.7/rkward/rbackend/rklocalesupport.cpp	2007-05-07 10:51:21 UTC (rev 1866)
+++ branches/release_branch_0.4.7/rkward/rbackend/rklocalesupport.cpp	2007-05-07 10:55:39 UTC (rev 1867)
@@ -17,9 +17,14 @@
 
 #include "rklocalesupport.h"
 
+// see https://sourceforge.net/tracker/?func=detail&atid=459009&aid=1698809&group_id=50231
+#ifdef __FreeBSD__
+# include <langinfo.h>
+#endif
+
 #include <qtextcodec.h>
 
-/* NOTE: This code in this file is an almost literal copy taken from setupLocaleMapper in qtextcodec.cpp in Qt 3.3.8 !*/
+/* NOTE: The code in this file is an almost literal copy taken from setupLocaleMapper in qtextcodec.cpp in Qt 3.3.8 !*/
 
 QTextCodec *checkForCodec(const char *name) {
     QTextCodec *c = QTextCodec::codecForName(name);

Modified: branches/release_branch_0.4.7/rkward/rbackend/rkpthreadsupport.cpp
===================================================================
--- branches/release_branch_0.4.7/rkward/rbackend/rkpthreadsupport.cpp	2007-05-07 10:51:21 UTC (rev 1866)
+++ branches/release_branch_0.4.7/rkward/rbackend/rkpthreadsupport.cpp	2007-05-07 10:55:39 UTC (rev 1867)
@@ -19,6 +19,9 @@
 
 #include "../../config.h"
 
+#include <qstring.h>
+#include "../debug.h"
+
 #include <pthread.h>
 #ifdef HAVE_PTHREAD_NP_H
 #	include <pthread_np.h>
@@ -63,4 +66,11 @@
 	if (base_direction != direction) {
 		*base = ((char *) *base) + (direction * ((unsigned long) *size));
 	}
+
+	// sanity check, as on some systems the stack direction is mis-detected somehow.
+	long usage = direction * ((unsigned long) (*base) - (unsigned long) (&dummy));
+	if ((usage < 0) || (unsigned long) usage > (unsigned long) (*size)) {
+		RK_DO (qDebug ("Stack boundaries detection produced bad results. Disabling stack checking."), RBACKEND, DL_WARNING);
+		*size = (unsigned long) -1;
+	}
 }

Modified: branches/release_branch_0.4.7/rkward/rkconsole.cpp
===================================================================
--- branches/release_branch_0.4.7/rkward/rkconsole.cpp	2007-05-07 10:51:21 UTC (rev 1866)
+++ branches/release_branch_0.4.7/rkward/rkconsole.cpp	2007-05-07 10:55:39 UTC (rev 1867)
@@ -17,6 +17,7 @@
 #include "rkconsole.h"
 
 #include <qfont.h>
+#include <qdir.h>
 #include <qstringlist.h>
 #include <qclipboard.h>
 #include <qapplication.h>
@@ -282,6 +283,14 @@
 	return true;
 }
 
+void RKConsole::insertCompletion (int line_num, int word_start, int word_end, const QString &completion) {
+	RK_TRACE (APP);
+
+	int offset = prefix.length ();
+	doc->removeText (line_num, offset + word_start, line_num, offset + word_end);
+	doc->insertText (line_num, offset + word_start, completion);
+}
+
 bool RKConsole::doTabCompletionHelper (int line_num, const QString &line, int word_start, int word_end, const QStringList &entries) {
 	RK_TRACE (APP);
 
@@ -290,10 +299,8 @@
 	if (!count) return false;
 
 	if (count == 1) {
-		int offset = prefix.length ();
 		it = entries.constBegin ();
-		doc->removeText (line_num, offset + word_start, line_num, offset + word_end);
-		doc->insertText (line_num, offset + word_start, *it);
+		insertCompletion (line_num, word_start, word_end, *it);
 	} else if (tab_key_pressed_before) {
 		int i=0;
 		for (it = entries.constBegin (); it != entries.constEnd (); ++it) {
@@ -308,6 +315,38 @@
 		cursorAtTheEnd ();
 	} else {
 		tab_key_pressed_before = true;
+
+		// do all entries have a common start?
+		QString common;
+		bool done = false;
+		unsigned int i = 0;
+		while (!done) {
+			bool ok = true;
+			QChar current;
+			for (it = entries.constBegin (); it != entries.constEnd (); ++it) {
+				if (it == entries.constBegin ()) {
+					current = (*it).at(i);
+				}
+				QChar dummy = (*it).at(i);
+				if (dummy.isNull ()) {
+					ok = false;
+					break;
+				} else if (dummy != current) {
+					ok = false;
+					break;
+				}
+			}
+			if (ok) common.append (current);
+			else break;
+			++i;
+		}
+		if (i > 0) {
+			if (common.length() > (word_end - word_start)) {		// more than there already is
+				insertCompletion (line_num, word_start, word_end, common);
+				return false;	// will beep to signal completion is not complete
+			}
+		}
+
 		return true;
 	}
 	tab_key_pressed_before = false;
@@ -350,6 +389,7 @@
 	
 			QString current_name = current_line.mid (quote_start + 1, quote_end - quote_start - 1);
 			KURLCompletion comp (KURLCompletion::FileCompletion);
+			comp.setDir (QDir::currentDirPath ());
 			QString test = comp.makeCompletion (current_name);
 	
 			if (doTabCompletionHelper (current_line_num, current_line, quote_start+1, quote_end, comp.allMatches ())) return;
@@ -792,7 +832,7 @@
 		current_command = command;
 		if (command_incomplete) {
 			RK_ASSERT (command_was_piped);
-			command_string.prepend (incomplete_command);
+			command_string.prepend (incomplete_command + '\n');
 			command->setCommand (command_string);
 		}
 		command_was_piped = true;

Modified: branches/release_branch_0.4.7/rkward/rkconsole.h
===================================================================
--- branches/release_branch_0.4.7/rkward/rkconsole.h	2007-05-07 10:51:21 UTC (rev 1866)
+++ branches/release_branch_0.4.7/rkward/rkconsole.h	2007-05-07 10:55:39 UTC (rev 1867)
@@ -92,6 +92,8 @@
 /** set syntax-highlighting for R */
 	void setRHighlighting ();
 	bool doTabCompletionHelper (int line_num, const QString &line, int word_start, int word_end, const QStringList &entries);
+/** a helper function to doTabCompletionHelper */
+	void insertCompletion (int line_num, int word_start, int word_end, const QString &completion);
 	QString incomplete_command;
 	bool command_incomplete;
 /** A list to store previous commands */

Modified: branches/release_branch_0.4.7/rkward/scriptbackends/phpbackend.cpp
===================================================================
--- branches/release_branch_0.4.7/rkward/scriptbackends/phpbackend.cpp	2007-05-07 10:51:21 UTC (rev 1866)
+++ branches/release_branch_0.4.7/rkward/scriptbackends/phpbackend.cpp	2007-05-07 10:55:39 UTC (rev 1867)
@@ -56,7 +56,7 @@
 
 	QDir files_path (RKCommonFunctions::getRKWardDataDir () + "phpfiles/");
 	QString common_php = files_path.filePath ("common.php", false);
-	QString php_ini = files_path.filePath ("php_ini", false);
+	QString php_ini = files_path.filePath ("php.ini", false);
 	if (!QFileInfo (common_php).isReadable ()) {
 		KMessageBox::error (0, i18n ("The support file \"%1\" could not be found or is not readable. Please check your installation.").arg (common_php), i18n ("PHP-Error"));
 		emit (haveError ());
@@ -68,7 +68,7 @@
 	*php_process << "-c" << php_ini;	// set correct options
 	*php_process << common_php;
 	
-	// we have to be connect at all times! Otherwise the connection will be gone for good.
+	// we have to be connected at all times! Otherwise the connection will be gone for good.
 	//connect (php_process, SIGNAL (receivedStderr (KProcess *, char*, int)), this, SLOT (gotError (KProcess *, char*, int)));
 	connect (php_process, SIGNAL (wroteStdin (KProcess *)), this, SLOT (doneWriting (KProcess* )));
 	connect (php_process, SIGNAL (receivedStdout (KProcess *, char*, int)), this, SLOT (gotOutput (KProcess *, char*, int)));
@@ -238,11 +238,11 @@
 	// pending data is always first in a stream, so process it first, too
 	if (have_data) {
 		if (!startup_done) {
-				php_process->detach ();
-				KMessageBox::error (0, i18n ("There has been an error\n(\"%1\")\nwhile starting up the PHP backend. Most likely this is due to either a bug in RKWard or an invalid setting for the location of the PHP support files. Check the settings (Settings->Configure Settings->PHP backend) and try again.").arg (output_raw_buffer.stripWhiteSpace ()), i18n ("PHP-Error"));
-				emit (haveError ());
-				destroy ();
-				return;
+			php_process->detach ();
+			KMessageBox::error (0, i18n ("There has been an error\n(\"%1\")\nwhile starting up the PHP backend. Most likely this is due to either a bug in RKWard or a problem with your PHP installation. Check the settings (Settings->Configure Settings->PHP backend) and try again.").arg (output_raw_buffer.stripWhiteSpace ()), i18n ("PHP-Error"));
+			emit (haveError ());
+			destroy ();
+			return;
 		}
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the rkward-tracker mailing list