Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
  • 5 commits
  • 7 files changed
  • 0 comments
  • 2 contributors
Mar 26, 2011
Christian Stimming [20481] Bug #645640: Online transfer must not allow to change amount …
…in second window

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/branches/2.4@20485 57a11ea4-9604-0410-9ed3-97b8803252fd
ed7b00e
[20487]Windows nightly build: fix webserver directory creation hack
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/branches/2.4@20488 57a11ea4-9604-0410-9ed3-97b8803252fd
8a3a375
Christian Stimming [20491] Fix glade message with unintended whitespaces.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/branches/2.4@20492 57a11ea4-9604-0410-9ed3-97b8803252fd
a9202b7
Christian Stimming Update German translation - now on the correct branch.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/branches/2.4@20493 57a11ea4-9604-0410-9ed3-97b8803252fd
f85298f
Christian Stimming Updated Spanish translation by Francisco Javier.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/branches/2.4@20494 57a11ea4-9604-0410-9ed3-97b8803252fd
e60310a
22  packaging/win32/build_package.sh
@@ -7,10 +7,11 @@
7 7
 #
8 8
 
9 9
 set -e
  10
+LOG_DIR=build-logs
10 11
 
11 12
 function on_error() {
12 13
   if [ `hostname` = "gnucash-win32" ]; then
13  
-    scp -p ${LOGFILE} upload@code.gnucash.org:public_html/win32/build-logs
  14
+    scp -p ${LOGFILE} upload@code.gnucash.org:public_html/win32/$LOG_DIR
14 15
   fi
15 16
   exit
16 17
 }
@@ -38,11 +39,11 @@ _OUTPUT_DIR=`unix_path $OUTPUT_DIR`
38 39
 LOGFILE=${_OUTPUT_DIR}/${LOGFILENAME}
39 40
 mkdir -p ${_OUTPUT_DIR}
40 41
 
  42
+# Small hack to create $LOG_DIR on the webserver if it doesn't exist yet
41 43
 if [ `hostname` = "gnucash-win32" ]; then
42  
-  # Small hack to create the build-logs directory if it doesn't exist yet
43  
-  mkdir "$TMP_DIR/build-logs"
44  
-  scp -r "$TMP_DIR/build-logs" upload@code.gnucash.org:public_html/win32
45  
-  rmdir "$TMP_DIR/build-logs"
  44
+  mkdir "$_OUTPUT_DIR/$LOG_DIR"
  45
+  scp -r "$_OUTPUT_DIR/$LOG_DIR" upload@code.gnucash.org:public_html/win32
  46
+  rmdir "$_OUTPUT_DIR/$LOG_DIR"
46 47
 fi
47 48
 
48 49
 set +e
@@ -91,13 +92,12 @@ if [ -n "${tag}" ] ; then
91 92
 fi
92 93
 
93 94
 # If we're running on the build server then upload the files
94  
-# Note: change this target if you're building a different branch
95 95
 if [ `hostname` = "gnucash-win32" ]; then
96  
-  # Small hack to create the target directory if it doesn't exist yet
97  
-  mkdir "$TMP_DIR/$TARGET_DIR"
98  
-  scp -r "$TMP_DIR/$TARGET_DIR" upload@code.gnucash.org:public_html/win32
99  
-  rmdir "$TMP_DIR/$TARGET_DIR"
  96
+  # Small hack to create the $TARGET_DIR on the webserver if it doesn't exist yet
  97
+  mkdir "$_OUTPUT_DIR/$TARGET_DIR"
  98
+  scp -r "$_OUTPUT_DIR/$TARGET_DIR" upload@code.gnucash.org:public_html/win32
  99
+  rmdir "$_OUTPUT_DIR/$TARGET_DIR"
100 100
   # Copy the files to the chosen target directory
101  
-  scp -p ${LOGFILE} upload@code.gnucash.org:public_html/win32/build-logs
  101
+  scp -p ${LOGFILE} upload@code.gnucash.org:public_html/win32/$LOG_DIR
102 102
   scp -p ${_OUTPUT_DIR}/${SETUP_FILENAME} upload@code.gnucash.org:public_html/win32/$TARGET_DIR
103 103
 fi
34  po/de.po
@@ -12,8 +12,8 @@ msgid ""
12 12
 msgstr ""
13 13
 "Project-Id-Version: gnucash-2.0\n"
14 14
 "Report-Msgid-Bugs-To: \n"
15  
-"POT-Creation-Date: 2011-02-24 21:42+0100\n"
16  
-"PO-Revision-Date: 2011-03-01 22:27+0100\n"
  15
+"POT-Creation-Date: 2011-03-26 13:55+0100\n"
  16
+"PO-Revision-Date: 2011-03-26 13:55+0100\n"
17 17
 "Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
18 18
 "Language-Team: GnuCash-de <gnucash-de@gnucash.org>\n"
19 19
 "MIME-Version: 1.0\n"
@@ -1039,7 +1039,10 @@ msgstr ""
1039 1039
 msgid ""
1040 1040
 "If active, extra toolbar buttons for common business functions are shown as "
1041 1041
 "well. Otherwise they are not shown."
1042  
-msgstr "Wenn aktiviert, werden zusätzliche Knöpfe in der Werkzeugleiste für häufig benutzte Geschäfts-Funktionen angezeigt. Andernfalls werden sie nicht angezeigt."
  1042
+msgstr ""
  1043
+"Wenn aktiviert, werden zusätzliche Knöpfe in der Werkzeugleiste für häufig "
  1044
+"benutzte Geschäfts-Funktionen angezeigt. Andernfalls werden sie nicht "
  1045
+"angezeigt."
1043 1046
 
1044 1047
 msgid ""
1045 1048
 "If checked, each invoice will be opened in its own top level window.  If "
@@ -10616,6 +10619,9 @@ msgstr "Entscheidungsschwelle für automatisches Hinzufügen"
10616 10619
 msgid "Auto-c_lear threshold"
10617 10620
 msgstr "Entscheidungsschwelle für automatisches Abgleichen"
10618 10621
 
  10622
+msgid "Automatically create new commodities"
  10623
+msgstr "Automatisch neue Wertpapiere/Währungen erstellen"
  10624
+
10619 10625
 msgid "Choose a format"
10620 10626
 msgstr "Wählen Sie das Export-Format"
10621 10627
 
@@ -10661,6 +10667,16 @@ msgid "Enable update match action"
10661 10667
 msgstr "»Abgleichen und Datenübernahme«-Aktion aktivieren"
10662 10668
 
10663 10669
 msgid ""
  10670
+"Enables the automatic creation of new commodities if any unknown commodity "
  10671
+"is encountered during import. Otherwise the user will be asked what to do "
  10672
+"with each unknown commodity."
  10673
+msgstr ""
  10674
+"Aktiviert die automatische Erstellung von neuen Wertpapieren/Währungen, "
  10675
+"sobald unbekannte Wertpapiere/Währungen beim Importieren gefunden werden. "
  10676
+"Andernfalls wird eine Rückfrage für jedes unbekannte Wertpapier/Währung "
  10677
+"angezeigt."
  10678
+
  10679
+msgid ""
10664 10680
 "For a new transaction, click on the \"Other Account\" entry to choose the "
10665 10681
 "other (destination) account of this transaction.\n"
10666 10682
 "For a transaction that is a duplicate of an existing one, click on the "
@@ -10958,6 +10974,7 @@ msgstr ""
10958 10974
 "Einträge aus Logdatei nach einem Programmabsturz abspielen. Dies kann nicht "
10959 10975
 "rückgängig gemacht werden."
10960 10976
 
  10977
+#. As we now have the commodity, select the account with that commodity.
10961 10978
 #. This string is a default account
10962 10979
 #. name. It MUST NOT contain the
10963 10980
 #. character ':' anywhere in it or
@@ -12219,6 +12236,13 @@ msgstr "Kann Datei %s nicht öffnen. Fehlermeldung: %s"
12219 12236
 msgid "There are no options for this report."
12220 12237
 msgstr "Es gibt für diesen Bericht keine Optionen."
12221 12238
 
  12239
+msgid "GnuCash-Report"
  12240
+msgstr "GnuCash-Bericht"
  12241
+
  12242
+#. src/report/business-reports/invoice.scm
  12243
+msgid "Printable Invoice"
  12244
+msgstr "Druckbare Rechnung"
  12245
+
12222 12246
 #. * @}
12223 12247
 #. * @}
12224 12248
 msgid "<< _Remove"
@@ -13809,10 +13833,6 @@ msgstr "Rechnung in Bearbeitung..."
13809 13833
 msgid "Fancy Invoice"
13810 13834
 msgstr "Elegante Rechnung"
13811 13835
 
13812  
-#. src/report/business-reports/invoice.scm
13813  
-msgid "Printable Invoice"
13814  
-msgstr "Druckbare Rechnung"
13815  
-
13816 13836
 #. src/report/business-reports/job-report.scm
13817 13837
 #. src/report/business-reports/owner-report.scm
13818 13838
 msgid "Total Credit"
12,009  po/es.po
4965 additions, 7044 deletions not shown
6  src/gnome-utils/dialog-transfer.c
@@ -1176,6 +1176,12 @@ gnc_xfer_dialog_set_amount(XferDialog *xferData, gnc_numeric amount)
1176 1176
 
1177 1177
     gnc_amount_edit_set_amount (GNC_AMOUNT_EDIT (xferData->amount_edit), amount);
1178 1178
 }
  1179
+void gnc_xfer_dialog_set_amount_sensitive(XferDialog *xferData,
  1180
+                                          gboolean is_sensitive)
  1181
+{
  1182
+    g_assert(xferData);
  1183
+    gtk_widget_set_sensitive(gnc_amount_edit_gtk_entry(GNC_AMOUNT_EDIT (xferData->amount_edit)), is_sensitive);
  1184
+}
1179 1185
 
1180 1186
 
1181 1187
 /********************************************************************\
3  src/gnome-utils/dialog-transfer.h
@@ -99,6 +99,9 @@ void gnc_xfer_dialog_hide_to_account_tree(XferDialog *xferData );
99 99
  */
100 100
 void gnc_xfer_dialog_set_amount(XferDialog *xferData, gnc_numeric amount);
101 101
 
  102
+/** Set the "sensitive" state of the amount field to the given value */
  103
+void gnc_xfer_dialog_set_amount_sensitive(XferDialog *xferData, gboolean is_sensitive);
  104
+
102 105
 /**
103 106
  *   set the description in the given xfer dialog
104 107
  *
1  src/import-export/aqbanking/gnc-ab-transfer.c
@@ -226,6 +226,7 @@ gnc_ab_maketrans(GtkWidget *parent, Account *gnc_acc,
226 226
                      xaccAccountGetCommoditySCU(gnc_acc),
227 227
                      GNC_HOW_RND_ROUND_HALF_UP);
228 228
         gnc_xfer_dialog_set_amount(xfer_dialog, amount);
  229
+        gnc_xfer_dialog_set_amount_sensitive(xfer_dialog, FALSE);
229 230
 
230 231
         description = gnc_ab_description_to_gnc(ab_trans);
231 232
         gnc_xfer_dialog_set_description(xfer_dialog, description);
6  src/import-export/generic-import.glade
@@ -942,11 +942,7 @@ click "OK".</property>
942 942
             <property name="visible">True</property>
943 943
             <property name="can_focus">True</property>
944 944
             <property name="receives_default">False</property>
945  
-            <property name="tooltip" translatable="yes">Enables the
946  
-            automatic creation of new commodities if any
947  
-        unknown commodity is encountered during import. Otherwise
948  
-        the user will be asked what to do with each unknown
949  
-        commodity.</property>
  945
+            <property name="tooltip" translatable="yes">Enables the automatic creation of new commodities if any unknown commodity is encountered during import. Otherwise the user will be asked what to do with each unknown commodity.</property>
950 946
             <property name="draw_indicator">True</property>
951 947
           </widget>
952 948
           <packing>

No commit comments for this range

Something went wrong with that request. Please try again.