Attachment 3823 Details for Bug 22899

[patch] Patch nochmal neu gezogen

univention-management-console-module-packages-2011_11_18.patch (text/plain), 5.13 KB, created by Frank Greif on 2011-11-18 11:19 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Frank Greif

Created: 2011-11-18 11:19 CET

Size: 5.13 KB

patch

obsolete

>Index: umc/de.po
>===================================================================
>--- umc/de.po	(revision 5075)
>+++ umc/de.po	(working copy)
>@@ -15,6 +15,6 @@
> msgid "Manage (install/deinstall) software packages on your machine"
> msgstr "Verwaltung der Software-Pakete auf dieser Maschine"
> 
>-msgid "Package Management"
>+msgid "Package management"
> msgstr "Paketverwaltung"
> 
>Index: umc/js/de.po
>===================================================================
>--- umc/js/de.po	(revision 5075)
>+++ umc/js/de.po	(working copy)
>@@ -33,7 +33,8 @@
> msgid "Close"
> msgstr "SchlieÃen"
> 
>-#: umc/js/packages.js:71 umc/js/packages.js:240
>+#: umc/js/packages.js:71
>+#: umc/js/packages.js:240
> msgid "Deinstall"
> msgstr "Deinstallieren"
> 
>@@ -49,12 +50,13 @@
> msgid "Do you really want to {verb} the '{id}' package?"
> msgstr "MÃ¶chten Sie wirklich das Paket '{id}' {verb}?"
> 
>-#: umc/js/packages.js:58 umc/js/packages.js:230
>+#: umc/js/packages.js:58
>+#: umc/js/packages.js:230
> msgid "Install"
> msgstr "Installieren"
> 
> #: umc/js/packages.js:110
>-msgid "Install Status"
>+msgid "Installation status"
> msgstr "Paketstatus"
> 
> #: umc/js/_packages/SearchForm.js:44
>@@ -73,7 +75,8 @@
> msgid "Is upgradeable"
> msgstr "aktualisierbar"
> 
>-#: umc/js/packages.js:338 umc/js/packages.js:396
>+#: umc/js/packages.js:338
>+#: umc/js/packages.js:396
> msgid "No"
> msgstr "Nein"
> 
>@@ -81,12 +84,11 @@
> msgid ""
> "On this page, you see all software packages available on your system, and "
> "you can install/deinstall them."
>-msgstr ""
>-"Auf dieser Seite sehen Sie alle verfÃ¼gbaren Software Pakete auf Ihrem "
>+msgstr "Auf dieser Seite sehen Sie alle verfÃ¼gbaren Software Pakete auf Ihrem "
> "System, und sie kÃ¶nnen sie installieren, deinstallieren oder aktualisieren."
> 
> #: umc/js/packages.js:115
>-msgid "Package Description"
>+msgid "Package description"
> msgstr "Paketbeschreibung"
> 
> #: umc/js/_packages/SearchForm.js:28
>@@ -101,11 +103,13 @@
> msgid "Package details"
> msgstr "Paketdetails"
> 
>-#: umc/js/packages.js:25 umc/js/packages.js:27
>+#: umc/js/packages.js:25
>+#: umc/js/packages.js:27
> msgid "Package management"
> msgstr "Paketverwaltung"
> 
>-#: umc/js/packages.js:101 umc/js/packages.js:305
>+#: umc/js/packages.js:101
>+#: umc/js/packages.js:305
> #: umc/js/_packages/SearchForm.js:56
> msgid "Package name"
> msgstr "Paketname"
>@@ -138,9 +142,10 @@
> msgid "Search key"
> msgstr "Suche nach"
> 
>-#: umc/js/packages.js:106 umc/js/packages.js:306
>+#: umc/js/packages.js:106
>+#: umc/js/packages.js:306
> msgid "Section"
>-msgstr "Sektion"
>+msgstr "Kategorie"
> 
> #: umc/js/packages.js:307
> msgid "Summary"
>@@ -150,7 +155,8 @@
> msgid "The current installer job is now finished."
> msgstr "Die aktuelle Installation ist abgeschlossen"
> 
>-#: umc/js/packages.js:84 umc/js/packages.js:250
>+#: umc/js/packages.js:84
>+#: umc/js/packages.js:250
> msgid "Upgrade"
> msgstr "Aktualisieren"
> 
>@@ -158,7 +164,8 @@
> msgid "View Details"
> msgstr "Details anzeigen"
> 
>-#: umc/js/packages.js:336 umc/js/packages.js:401
>+#: umc/js/packages.js:336
>+#: umc/js/packages.js:401
> msgid "Yes"
> msgstr "Ja"
> 
>@@ -185,3 +192,4 @@
> #: umc/js/packages.js:384
> msgid "upgrading"
> msgstr "aktualisiert"
>+
>Index: umc/js/packages.js
>===================================================================
>--- umc/js/packages.js	(revision 5075)
>+++ umc/js/packages.js	(working copy)
>@@ -135,12 +135,12 @@
> 			},
> 			{
> 				name:		'status',
>-				label:		this._("Install Status"),		// notinstalled/installed/upgradeable
>+				label:		this._("Installation status"),		// notinstalled/installed/upgradeable
> 				width:		'adjust'
> 			},
> 			{
> 				name:		'summary',
>-				label:		this._("Package Description")
>+				label:		this._("Package description")
> 			}
> 		];
> 
>Index: umc/js/_packages/SearchForm.js
>===================================================================
>--- umc/js/_packages/SearchForm.js	(revision 5075)
>+++ umc/js/_packages/SearchForm.js	(working copy)
>@@ -105,17 +105,12 @@
> 					{
> 						name:		'submit',
> 						label:		this._("Search")
>-					},
>-					{
>-						name:		'reset',
>-						label:		this._("Reset")
> 					}
> 				],
> 				layout:
> 				[
> 					[ 'section', 'installed' ],
>-					[ 'key', 'pattern' ],
>-					[ 'reset', 'submit']
>+					[ 'key', 'pattern', 'submit'],
> 				]
> 			});
> 		}
>@@ -127,19 +122,6 @@
> 		this.inherited(arguments);
> 	},
> 	
>-	// TODO What is the correct way start the form with a disabled 'submit' button?
>-	
>-//	buildRendering: function() {
>-//		
>-//		this.inherited(arguments);
>-//		this.allowSearchButton(false);	// as long as the combobox is not ready
>-//	},
>-	
>-//	startup: function() {
>-//		this.inherited(arguments);
>-//		this.allowSearchButton(false);	// as long as the combobox is not ready
>-//	},
>-	
> 	_check_submit_allow: function() {
> 		
> 		var allow = true;
>Index: umc/packages.xml
>===================================================================
>--- umc/packages.xml	(revision 5075)
>+++ umc/packages.xml	(working copy)
>@@ -1,7 +1,7 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <umc version="2.0">
>   <module id="packages" icon="apt" version="1.0">
>-	<name>Package Management</name>
>+	<name>Package management</name>
> 	<description>Manage (install/deinstall) software packages on your machine</description>
> 	<categories>
> 	  <category name="system"/>

Actions: View | Diff

Attachments on bug 22899: 3818 | 3823