File 4_3_BRANCH.diff of Package kdeadmin4

Overview Repositories Revisions Requests Users Attributes Meta

File 4_3_BRANCH.diff of Package kdeadmin4 (Revision 0be1ec720c360fbdb539e0970ddaff33)

Currently displaying revision 0be1ec720c360fbdb539e0970ddaff33 , Show latest

package: kdeadmin-4.2.85.tar.bz2
kdemod: kdeadmin
--- BRANCH_STATUS
+++ BRANCH_STATUS
@@ -0,0 +1,2 @@
+current HEAD: 967879
+svn di between //tags/KDE/4.2.85/kdeadmin and //trunk/KDE/kdeadmin
--- ksysv/x-ksysv.desktop	
+++ ksysv/x-ksysv.desktop	
@@ -58,8 +58,8 @@
 Comment[uk]=Збережена конфігурація процесу Init
 Comment[vi]=Cấu hình Init đã lưu
 Comment[wa]=Apontiaedje d' enondaedje schapé
-Comment[x-test]=xxSaved Init Configurationxx
 Comment[xh]=Uqwalaselo olugciniweyo lwe Init
+Comment[x-test]=xxSaved Init Configurationxx
 Comment[zh_CN]=已保存的 Init 配置
 Comment[zh_HK]=已儲存 Init 設定
 Comment[zh_TW]=已儲存起始設定
--- kdat/kdat.desktop	
+++ kdat/kdat.desktop	
@@ -69,8 +69,8 @@
 GenericName[uk]=Засіб резервування на стрічку
 GenericName[vi]=Công cụ sao lưu băng
 GenericName[wa]=Usteye di copeyes di såvrité so bindes
-GenericName[x-test]=xxTape Backup Toolxx
 GenericName[xh]=Isixhobo Sokuncedisa Iteyipu
+GenericName[x-test]=xxTape Backup Toolxx
 GenericName[zh_CN]=磁带备份工具
 GenericName[zh_HK]=磁帶備份工具
 GenericName[zh_TW]=磁帶備份工具
--- strigi-analyzer/rpm/kfile_rpm.cpp	
+++ strigi-analyzer/rpm/kfile_rpm.cpp	
@@ -17,6 +17,8 @@
  *
  */
 
+#include "kfile_rpm.h"
+
 #include <kgenericfactory.h>
 #include <kdebug.h>
 #include <QFile>
@@ -28,8 +30,6 @@
 typedef unsigned int   uint32_t;
 #endif
 
-#include "kfile_rpm.h"
-
 typedef KGenericFactory<KRpmPlugin> RpmFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_rpm, RpmFactory( "kfile_rpm" ))
@@ -81,7 +81,7 @@
 
     file.seek(96); // Seek past old lead
 
-    for (pass = 0; pass < 2; pass++) { // RPMs have two headers
+    for (pass = 0; pass < 2; ++pass) { // RPMs have two headers
 	uint32_t storepos, entries, size, reserved;
 	unsigned char version;
 	char magic[3];
--- kuser/kuser.desktop	
+++ kuser/kuser.desktop	
@@ -79,8 +79,8 @@
 GenericName[uz@cyrillic]=Фойдаланувчилар бошқарувчиси
 GenericName[vi]=Bộ quản lý người dùng
 GenericName[wa]=Manaedjeu d' uzeus
-GenericName[x-test]=xxUser Managerxx
 GenericName[xh]=Umphathi We Calendar
+GenericName[x-test]=xxUser Managerxx
 GenericName[zh_CN]=用户管理程序
 GenericName[zh_HK]=用戶管理員
 GenericName[zh_TW]=使用者管理程式
--- lilo-config/kde/lilo.desktop	
+++ lilo-config/kde/lilo.desktop	
@@ -69,8 +69,8 @@
 Name[uk]=Менеджер завантаження (LILO)
 Name[vi]=Bộ quản lý khởi động (LILO)
 Name[wa]=Apontiaedje del enondrece (LILO)
-Name[x-test]=xxBoot Manager (LILO)xx
 Name[xh]=Umphathi wesiNgxobo (LILO)
+Name[x-test]=xxBoot Manager (LILO)xx
 Name[zh_CN]=引导管理器(LILO)
 Name[zh_HK]=開機管理員（LILO）
 Name[zh_TW]=開機啟動管理程式(LILO)
@@ -133,8 +133,8 @@
 Comment[uk]=Налаштувати LILO (менеджер завантаження Linux)
 Comment[vi]=Cấu hình LILO (bộ quản lý khởi động Linux)
 Comment[wa]=Chal vos ploz apontyî LILO (l' enondrece Linux)
-Comment[x-test]=xxConfigure LILO (the Linux boot manager)xx
 Comment[xh]=Qwalalsela LILO (umphathi we boot ye Linux)
+Comment[x-test]=xxConfigure LILO (the Linux boot manager)xx
 Comment[zh_CN]=配置 LILO (Linux 引导管理程序)
 Comment[zh_HK]=設定 LILO (Linux 的開機管理員)
 Comment[zh_TW]=你可在此設定 LILO (Linux 的開機管理程式)
--- lilo-config/common/lilo.cc	
+++ lilo-config/common/lilo.cc	
@@ -565,7 +565,7 @@
 	s+='\n';
 	for(liloimages::const_iterator it=images.begin(); it!=images.end(); it++) {
 		s+=*it;
-		s+="\n";	//krazy:exclude=duoblequote_chars
+		s+="\n";	//krazy:exclude=doublequote_chars
 	}
 	return s;
 }
--- lilo-config/common/Config.cc	
+++ lilo-config/common/Config.cc	
@@ -40,14 +40,14 @@
 		if(quote)
 			insert(end(), prefix + key + "=\"" + value + "\"");	//krazy:exclude=duoblequote_char
 		else
-			insert(end(), prefix + key + "=" + value);
+			insert(end(), prefix + key + '=' + value);
 	} else {
 		for(iterator it=begin(); it!=end(); it++)
 			if(!(*it).regex(re).empty()) {
 				if(quote)
 					(*it)=prefix + key + "=\"" + value +"\"";	//krazy:exclude=duoblequote_char
 				else
-					(*it)=prefix + key + "=" + value;
+					(*it)=prefix + key + '=' + value;
 				break;
 			}
 	}
--- lilo-config/common/String.cc	
+++ lilo-config/common/String.cc	
@@ -28,10 +28,10 @@
 */
 
 #define _GNU_SOURCE 1
+#include "String.h"
 #include <features.h>
 #include <string.h>
 #include <string>
-#include "String.h"
 #include <stdio.h>
 #include <regex.h>
 #include <stdlib.h>
--- kpackage/kpackage.desktop	
+++ kpackage/kpackage.desktop	
@@ -12,8 +12,8 @@
 Name[sv]=Kpackage
 Name[ta]=கே தொகுப்பு
 Name[th]=จัดการแพ็กเกจ K
-Name[x-test]=xxKPackagexx
 Name[xh]=UdibanisolweK
+Name[x-test]=xxKPackagexx
 GenericName=Package Manager
 GenericName[af]=Paket Bestuurder
 GenericName[be]=Кіраванне пакетамі
@@ -73,8 +73,8 @@
 GenericName[uk]=Менеджер пакунків
 GenericName[vi]=Bộ quản lý gói
 GenericName[wa]=Manaedjeu di pacaedjes
-GenericName[x-test]=xxPackage Managerxx
 GenericName[xh]=Umphathi Wokudityaniswe kunye
+GenericName[x-test]=xxPackage Managerxx
 GenericName[zh_CN]=软件包管理器
 GenericName[zh_HK]=套件管理程式
 GenericName[zh_TW]=套件管理程式
--- system-config-printer-kde/system-config-printer-kde.desktop	
+++ system-config-printer-kde/system-config-printer-kde.desktop	
@@ -17,6 +17,7 @@
 Name[el]=Ρυθμίσεις εκτυπωτή
 Name[et]=Printeri seadistamine
 Name[nds]=Druckerinstellen
+Name[nl]=Printerconfiguratie
 Name[nn]=Skrivaroppsett
 Name[pt]=Configuração da Impressora
 Name[pt_BR]=Configuração da impressora
@@ -33,6 +34,7 @@
 Comment[el]=Ρύθμιση τοπικών και απομακρυσμένων εκτυπωτών
 Comment[et]=Kohalike ja võrguprinterite seadistamine
 Comment[nds]=Lokaal un feern Druckers instellen
+Comment[nl]=Lokale printers en die op afstand instellen
 Comment[nn]=Set opp lokale og nettverksskrivarar
 Comment[pt]=Configurar as impressoras locais e remotas
 Comment[pt_BR]=Configurar impressoras locais e remotas
--- knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop	
+++ knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop	
@@ -117,7 +117,7 @@
 Name[pl]=Ustawienia sieci
 Name[pt]=Configuração da Rede
 Name[pt_BR]=Configurações de rede
-Name[ro]=Setări rețea
+Name[ro]=Configurări rețea
 Name[ru]=Настройка сети
 Name[se]=Fierpmádatheivehusat
 Name[sk]=Sieťové nastavenia

Property changes on: .
___________________________________________________________________
Added: svn:externals
   +

Places

File 4_3_BRANCH.diff of Package kdeadmin4 (Revision 0be1ec720c360fbdb539e0970ddaff33)

Places