[ros-diffs] [dreimer] 49108: Merge r49107.
dreimer at svn.reactos.org
dreimer at svn.reactos.org
Sun Oct 10 23:30:06 UTC 2010
Author: dreimer
Date: Sun Oct 10 23:30:05 2010
New Revision: 49108
URL: http://svn.reactos.org/svn/reactos?rev=49108&view=rev
Log:
Merge r49107.
Modified:
branches/cmake-bringup/dll/shellext/deskmon/lang/en-US.rc
branches/cmake-bringup/dll/shellext/deskmon/lang/it-IT.rc
branches/cmake-bringup/dll/shellext/deskmon/lang/pl-PL.rc
branches/cmake-bringup/dll/win32/devmgr/lang/cs-CZ.rc
branches/cmake-bringup/dll/win32/devmgr/lang/el-GR.rc
branches/cmake-bringup/dll/win32/devmgr/lang/en-US.rc
branches/cmake-bringup/dll/win32/devmgr/lang/it-IT.rc
branches/cmake-bringup/dll/win32/devmgr/lang/no-NO.rc
branches/cmake-bringup/dll/win32/devmgr/lang/ru-RU.rc
branches/cmake-bringup/dll/win32/devmgr/lang/sk-SK.rc
Modified: branches/cmake-bringup/dll/shellext/deskmon/lang/en-US.rc
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/shellext/deskmon/lang/en-US.rc?rev=49108&r1=49107&r2=49108&view=diff
==============================================================================
--- branches/cmake-bringup/dll/shellext/deskmon/lang/en-US.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/shellext/deskmon/lang/en-US.rc [iso-8859-1] Sun Oct 10 23:30:05 2010
@@ -12,7 +12,7 @@
GROUPBOX "Monitor settings", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63
LTEXT "&Screen refresh rate:", IDS_REFRESHRATELABEL, 13, 73, 225, 8
COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT
- AUTOCHECKBOX "&Hide modes that this monitor can\'t display", IDC_PRUNINGCHECK, 13, 106, 225, 10
+ AUTOCHECKBOX "&Hide modes that this monitor can't display", IDC_PRUNINGCHECK, 13, 106, 225, 10
END
STRINGTABLE
Modified: branches/cmake-bringup/dll/shellext/deskmon/lang/it-IT.rc
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/shellext/deskmon/lang/it-IT.rc?rev=49108&r1=49107&r2=49108&view=diff
==============================================================================
--- branches/cmake-bringup/dll/shellext/deskmon/lang/it-IT.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/shellext/deskmon/lang/it-IT.rc [iso-8859-1] Sun Oct 10 23:30:05 2010
@@ -17,6 +17,6 @@
STRINGTABLE
BEGIN
- IDS_USEDEFFRQUENCY "Usare le impostazioni predefinite per l\'hardware"
+ IDS_USEDEFFRQUENCY "Usare le impostazioni predefinite per l'hardware"
IDS_FREQFMT "%u Hertz"
END
Modified: branches/cmake-bringup/dll/shellext/deskmon/lang/pl-PL.rc
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/shellext/deskmon/lang/pl-PL.rc?rev=49108&r1=49107&r2=49108&view=diff
==============================================================================
--- branches/cmake-bringup/dll/shellext/deskmon/lang/pl-PL.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/shellext/deskmon/lang/pl-PL.rc [iso-8859-1] Sun Oct 10 23:30:05 2010
@@ -18,7 +18,7 @@
GROUPBOX "Ustawienia monitora", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63
LTEXT "&Czêstotliwoœæi odœwie¿ania ekranu:", IDS_REFRESHRATELABEL, 13, 73, 225, 8
COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT
- AUTOCHECKBOX "&Ukryj tryby których monitor n\ie mo¿e wyœwietliæ", IDC_PRUNINGCHECK, 13, 106, 225, 10
+ AUTOCHECKBOX "&Ukryj tryby których monitor n ie mo¿e wyœwietliæ", IDC_PRUNINGCHECK, 13, 106, 225, 10
END
STRINGTABLE
Modified: branches/cmake-bringup/dll/win32/devmgr/lang/cs-CZ.rc
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/devmgr/lang/cs-CZ.rc?rev=49108&r1=49107&r2=49108&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/devmgr/lang/cs-CZ.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/devmgr/lang/cs-CZ.rc [iso-8859-1] Sun Oct 10 23:30:05 2010
@@ -75,7 +75,7 @@
IDS_DEV_FAILED_ADD "Toto zaøízení nepracuje správnì, protože $1 nepracuje správnì."
IDS_DEV_DISABLED_SERVICE "ReactOS nemùže nainstalovat ovladaèe tohoto zaøízení, protože nemá pøístup na disk nebo síové umístìní, na kterém se nacházejí instalaèní soubory."
IDS_DEV_TRANSLATION_FAILED "Toto zaøízení neodpovídá svému ovladaèi."
- IDS_DEV_NO_SOFTCONFIG "ReactOS nedokáže urèit nastavení tohoto zaøízení. Konzultujte manuál, který byl pøibalen k zaøízení a použijte záložku \"Zdroje\" k vybrání nastavení."
+ IDS_DEV_NO_SOFTCONFIG "ReactOS nedokáže urèit nastavení tohoto zaøízení. Konzultujte manuál, který byl pøibalen k zaøízení a použijte záložku ""Zdroje"" k vybrání nastavení."
IDS_DEV_BIOS_TABLE "Firmware tohoto poèítaèe nezahrnuje dost informací nutných pro správné nastavení a použití tohoto zaøízení.\nAby bylo možné použít toto zaøízení, kontaktujte výrobce poèítaèe k získání novìjší verze firmwaru nebo BIOSu."
IDS_DEV_IRQ_TRANSLATION_FAILED "Toto zaøízení požaduje PCI pøerušení, ale je konfigurováno pro ISA pøerušení (èi naopak).\nProsím, nastavte správnì pøerušení pro toto zaøízení."
IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS nemùže incializovat ovladaè zaøízení pro toto zaøízení."
Modified: branches/cmake-bringup/dll/win32/devmgr/lang/el-GR.rc
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/devmgr/lang/el-GR.rc?rev=49108&r1=49107&r2=49108&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/devmgr/lang/el-GR.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/devmgr/lang/el-GR.rc [iso-8859-1] Sun Oct 10 23:30:05 2010
@@ -43,7 +43,7 @@
IDS_DEV_FAILED_FILTER "Ïé ïäçãïß ãéá áõôÞ ôç óõóêåõÞ ðñÝðåé íá åðáíåãêáôáóôáèïýí."
IDS_DEV_DEVLOADER_NOT_FOUND "ÁõôÞ ç óõóêåõÞ äå ëåéôïõñãåß êáíïíéêÜ åðåéäÞ ôï ReactOS äå ìðïñåß íá öïñôþóåé ôï áñ÷åßï $1 ðïõ öïñôþíåé ôïõò ïäçãïýò ãéá ôç óõóêåõÞ."
IDS_DEV_DEVLOADER_NOT_FOUND2 "ÁõôÞ ç óõóêåõÞ äå ëåéôïõñãåß êáíïíéêÜ åðåéäÞ ôï áñ÷åßï $1 ðïõ öïñôþíåé ôïõò ïäçãïýò ãéá áõôÞ ôç óõóêåõÞ åßíáé ëáíèáóìÝíï."
- IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn\'t work, see your hardware documentation."
+ IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn't work, see your hardware documentation."
IDS_DEV_INVALID_DATA "This device is not working properly because the BIOS in your computer is reporting the resources for the device incorrectly."
IDS_DEV_INVALID_DATA2 "This device is not working properly because the BIOS in the device is reporting the resources for the device incorrectly. "
IDS_DEV_FAILED_START "This device is either not present, not working properly, or does not have all the drivers installed."
@@ -65,16 +65,16 @@
IDS_DEV_DEVICE_NOT_THERE "This device is either not present, not working properly, or does not have all the drivers installed."
IDS_DEV_MOVED "ReactOS is in the process of setting up this device."
IDS_DEV_TOO_EARLY "ReactOS is in the process of setting up this device."
- IDS_DEV_NO_VALID_LOG_CONF "ReactOS can\'t specify the resources for this device."
+ IDS_DEV_NO_VALID_LOG_CONF "ReactOS can't specify the resources for this device."
IDS_DEV_FAILED_INSTALL "The drivers for this device are not installed."
IDS_DEV_HARDWARE_DISABLED "This device is disabled because the BIOS for the device did not give it any resources."
IDS_DEV_CANT_SHARE_IRQ "This device is using an Interrupt Request (IRQ) resource that is in use by another device and cannot be shared.\nYou must change the conflicting setting or remove the real-mode driver causing the conflict."
IDS_DEV_FAILED_ADD "This device is not working properly because $1 is not working properly."
IDS_DEV_DISABLED_SERVICE "ReactOS cannot install the drivers for this device because it cannot access the drive or network location that has the setup files on it."
- IDS_DEV_TRANSLATION_FAILED "This device isn\'t responding to its driver."
+ IDS_DEV_TRANSLATION_FAILED "This device isn't responding to its driver."
IDS_DEV_NO_SOFTCONFIG "ReactOS cannot determine the settings for this device. Consult the documentation that came with this device and use the Resource tab to set the configuration."
- IDS_DEV_BIOS_TABLE "Your computer\'s system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update."
- IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer\'s system setup program to reconfigure the interrupt for this device."
+ IDS_DEV_BIOS_TABLE "Your computer's system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update."
+ IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer's system setup program to reconfigure the interrupt for this device."
IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS cannot initialize the device driver for this hardware."
IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS cannot load the device driver for this hardware because a previous instance of the device driver is still in memory."
IDS_DEV_DRIVER_FAILED_LOAD "ReactOS cannot load the device driver for this hardware. The driver may be corrupted or missing."
@@ -88,7 +88,7 @@
IDS_DEV_HELD_FOR_EJECT "ReactOS cannot use this hardware device because it has been prepared for safe removal, but it has not been removed from the computer"
IDS_DEV_DRIVER_BLOCKED "The software for this device has been blocked from starting because it is known to have problems with ReactOS. Contact the hardware vendor for a new driver."
IDS_DEV_REGISTRY_TOO_LARGE "ReactOS cannot start new hardware devices because the system hive is too large (exceeds the Registry Size Limit)."
- IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn\'t able to change the settings of this device."
+ IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn't able to change the settings of this device."
END
STRINGTABLE
Modified: branches/cmake-bringup/dll/win32/devmgr/lang/en-US.rc
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/devmgr/lang/en-US.rc?rev=49108&r1=49107&r2=49108&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/devmgr/lang/en-US.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/devmgr/lang/en-US.rc [iso-8859-1] Sun Oct 10 23:30:05 2010
@@ -43,7 +43,7 @@
IDS_DEV_FAILED_FILTER "The drivers for this device need to be reinstalled."
IDS_DEV_DEVLOADER_NOT_FOUND "This device is not working properly because ReactOS cannot load the file $1 that loads the drivers for the device."
IDS_DEV_DEVLOADER_NOT_FOUND2 "This device is not working properly because the file $1 that loads the drivers for this device is bad."
- IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn\'t work, see your hardware documentation."
+ IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn't work, see your hardware documentation."
IDS_DEV_INVALID_DATA "This device is not working properly because the BIOS in your computer is reporting the resources for the device incorrectly."
IDS_DEV_INVALID_DATA2 "This device is not working properly because the BIOS in the device is reporting the resources for the device incorrectly. "
IDS_DEV_FAILED_START "This device is either not present, not working properly, or does not have all the drivers installed."
@@ -65,16 +65,16 @@
IDS_DEV_DEVICE_NOT_THERE "This device is either not present, not working properly, or does not have all the drivers installed."
IDS_DEV_MOVED "ReactOS is in the process of setting up this device."
IDS_DEV_TOO_EARLY "ReactOS is in the process of setting up this device."
- IDS_DEV_NO_VALID_LOG_CONF "ReactOS can\'t specify the resources for this device."
+ IDS_DEV_NO_VALID_LOG_CONF "ReactOS can't specify the resources for this device."
IDS_DEV_FAILED_INSTALL "The drivers for this device are not installed."
IDS_DEV_HARDWARE_DISABLED "This device is disabled because the BIOS for the device did not give it any resources."
IDS_DEV_CANT_SHARE_IRQ "This device is using an Interrupt Request (IRQ) resource that is in use by another device and cannot be shared.\nYou must change the conflicting setting or remove the real-mode driver causing the conflict."
IDS_DEV_FAILED_ADD "This device is not working properly because $1 is not working properly."
IDS_DEV_DISABLED_SERVICE "ReactOS cannot install the drivers for this device because it cannot access the drive or network location that has the setup files on it."
- IDS_DEV_TRANSLATION_FAILED "This device isn\'t responding to its driver."
+ IDS_DEV_TRANSLATION_FAILED "This device isn't responding to its driver."
IDS_DEV_NO_SOFTCONFIG "ReactOS cannot determine the settings for this device. Consult the documentation that came with this device and use the Resource tab to set the configuration."
- IDS_DEV_BIOS_TABLE "Your computer\'s system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update."
- IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer\'s system setup program to reconfigure the interrupt for this device."
+ IDS_DEV_BIOS_TABLE "Your computer's system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update."
+ IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer's system setup program to reconfigure the interrupt for this device."
IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS cannot initialize the device driver for this hardware."
IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS cannot load the device driver for this hardware because a previous instance of the device driver is still in memory."
IDS_DEV_DRIVER_FAILED_LOAD "ReactOS cannot load the device driver for this hardware. The driver may be corrupted or missing."
@@ -88,7 +88,7 @@
IDS_DEV_HELD_FOR_EJECT "ReactOS cannot use this hardware device because it has been prepared for safe removal, but it has not been removed from the computer"
IDS_DEV_DRIVER_BLOCKED "The software for this device has been blocked from starting because it is known to have problems with ReactOS. Contact the hardware vendor for a new driver."
IDS_DEV_REGISTRY_TOO_LARGE "ReactOS cannot start new hardware devices because the system hive is too large (exceeds the Registry Size Limit)."
- IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn\'t able to change the settings of this device."
+ IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn't able to change the settings of this device."
END
STRINGTABLE
Modified: branches/cmake-bringup/dll/win32/devmgr/lang/it-IT.rc
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/devmgr/lang/it-IT.rc?rev=49108&r1=49107&r2=49108&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/devmgr/lang/it-IT.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/devmgr/lang/it-IT.rc [iso-8859-1] Sun Oct 10 23:30:05 2010
@@ -43,7 +43,7 @@
IDS_DEV_FAILED_FILTER "Il driver di questo dispositivo deve essere reinstallato."
IDS_DEV_DEVLOADER_NOT_FOUND "Questo dispositivo non funziona regolarmente perchè ReactOS non può caricare il file $1 che carica i driver per questo dispositivo."
IDS_DEV_DEVLOADER_NOT_FOUND2 "Questo dispositivo non funziona regolarmente perchè il file $1 che carica i driver per questo dispositivo è sbagliato."
- IDS_DEV_DEVLOADER_NOT_FOUND3 "Anomalia del dispositivo: Prova a cambiare il driver. Se non ha effetto verifica la documentazione dell\'hardware."
+ IDS_DEV_DEVLOADER_NOT_FOUND3 "Anomalia del dispositivo: Prova a cambiare il driver. Se non ha effetto verifica la documentazione dell'hardware."
IDS_DEV_INVALID_DATA "Questo dispositivo non funziona regolarmente perchè il BIOS del computer indica in modo errato le risorse per il dispositivo."
IDS_DEV_INVALID_DATA2 "Questo dispositivo non funziona regolarmente perchè il BIOS del dispositivo indica in modo errato le risorse per il dispositivo. "
IDS_DEV_FAILED_START "Il dispositivo può essere assente, malfunzionante o non ha tutti i driver necessari."
@@ -68,22 +68,22 @@
IDS_DEV_NO_VALID_LOG_CONF "ReactOS non può indicare le risorse per questo dispositivo."
IDS_DEV_FAILED_INSTALL "I driver non sono installati."
IDS_DEV_HARDWARE_DISABLED "Disabilitato perchè il BIOS del dispositivo non ha assegnato nessuna risorsa."
- IDS_DEV_CANT_SHARE_IRQ "Questo dispositivo usa un Interrupt Request (IRQ) che è già in uso e non può essere condiviso.\nDevi cambiare l'impostazione in conflitto o togliere il driver \"real-mode\" che provoca il conflitto."
+ IDS_DEV_CANT_SHARE_IRQ "Questo dispositivo usa un Interrupt Request (IRQ) che è già in uso e non può essere condiviso.\nDevi cambiare l'impostazione in conflitto o togliere il driver ""real-mode"" che provoca il conflitto."
IDS_DEV_FAILED_ADD "Non funziona regolarmente a causa di $1 ."
IDS_DEV_DISABLED_SERVICE "ReactOS non può installare i driver del dispositivo perchè non è possibile accedere al disco o alla rete dove si trovano i file di setup."
IDS_DEV_TRANSLATION_FAILED "Il dispositivo non risponde ai suoi driver."
IDS_DEV_NO_SOFTCONFIG "ReactOS non può individuare le impostazioni necessarie. Verificate la documentazione e usate il tab Risorse per impostare la configurazione."
- IDS_DEV_BIOS_TABLE "Your computer\'s system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update."
- IDS_DEV_IRQ_TRANSLATION_FAILED "E\' necessario un Interrupt PCI ma è configurato uno ISA o viceversa. \nUsate il setup di sistema del computer per riconfigurare l\'Interrupt."
+ IDS_DEV_BIOS_TABLE "Your computer's system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update."
+ IDS_DEV_IRQ_TRANSLATION_FAILED "E' necessario un Interrupt PCI ma è configurato uno ISA o viceversa. \nUsate il setup di sistema del computer per riconfigurare l'Interrupt."
IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS non può inizializzare il driver di questo hardware."
IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS non puo' caricare il driver perchè si trova in memoria una attivazione precedente."
IDS_DEV_DRIVER_FAILED_LOAD "ReactOS non puo' caricare il driver, potrebbe essere corrotto o assente."
IDS_DEV_DRIVER_SERVICE_KEY_INVALID "ReactOS non può accedere a questo hardware perchè le informazioni nel registry sono mancanti o memorizzate in modo errato."
- IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS ha caricato regolarmente il driver ma non ha rilevato l\'hardware."
+ IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS ha caricato regolarmente il driver ma non ha rilevato l'hardware."
IDS_DEV_DUPLICATE_DEVICE "ReactOS non puo' caricare il driver perchè si trova nel sistema un suo duplicato già attivo."
IDS_DEV_FAILED_POST_START "ReactOS ha fermato il driver perchè sono stati rileveti dei problemi."
IDS_DEV_HALTED "Una applicazione o un servizio ha disattivato il dispositivo hardware."
- IDS_DEV_PHANTOM "Al momento l\'hardware non è collegato al computer."
+ IDS_DEV_PHANTOM "Al momento l'hardware non è collegato al computer."
IDS_DEV_SYSTEM_SHUTDOWN "ReactOS Non può accede a questo hardware perchè il sistema operativo si stà spegnendo."
IDS_DEV_HELD_FOR_EJECT "ReactOS non può accedere al dispositivo perchè è stato predisposto per la rimozione ma non è ancora stato rimosso"
IDS_DEV_DRIVER_BLOCKED "Il software per questo dispositivo non può essere avviato perchè è noto che ha problemi con ReactOS. Contate il venditore hardware per un aggiornamento del driver."
Modified: branches/cmake-bringup/dll/win32/devmgr/lang/no-NO.rc
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/devmgr/lang/no-NO.rc?rev=49108&r1=49107&r2=49108&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/devmgr/lang/no-NO.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/devmgr/lang/no-NO.rc [iso-8859-1] Sun Oct 10 23:30:05 2010
@@ -65,16 +65,16 @@
IDS_DEV_DEVICE_NOT_THERE "Denne enheten er heller ikke valgt, eller vil ikke fungere riktig, eller så har den ikke alle driverene som trengs."
IDS_DEV_MOVED "ReactOS starter prosessen for å setter opp denne enheten."
IDS_DEV_TOO_EARLY "ReactOS er i prosessen for å setter opp denne enheten."
- IDS_DEV_NO_VALID_LOG_CONF "ReactOS kan\ ikke spesifisere ressursen for denne enheten."
+ IDS_DEV_NO_VALID_LOG_CONF "ReactOS kan ikke spesifisere ressursen for denne enheten."
IDS_DEV_FAILED_INSTALL "Driveren for denne enheten er ikke installert."
IDS_DEV_HARDWARE_DISABLED "Denne enheten er deaktivert fordi BIOS for enheten gir ikke andre ressurser."
IDS_DEV_CANT_SHARE_IRQ "Denne enheten bruker en Interrupt Request (IRQ) ressurs som er i bruk av en annen enhet og kan ikke bli delt.\nDu må endre konflikt innstillingen eller fjerne ekte-modus driver som forårsaker konflikten."
IDS_DEV_FAILED_ADD "Denne enheten vil ikke fungere som den skal fordi $1 vil ikke fungere som den skal."
IDS_DEV_DISABLED_SERVICE "ReactOS kan ikke installere driveren for denne enheten, fordi den får ikke tilgang til driveren eller nettverks plasseringen som har installering filen."
- IDS_DEV_TRANSLATION_FAILED "Denne enheten vil\ ikke svare på grunn av driveren."
+ IDS_DEV_TRANSLATION_FAILED "Denne enheten vil ikke svare på grunn av driveren."
IDS_DEV_NO_SOFTCONFIG "ReactOS kan ikke oppdage innstillingene for denne enheten. Ta hensyn til dokumentasjon som kommer med denne enheten og bruker ressursen tab for å sette konfigurasjonen."
- IDS_DEV_BIOS_TABLE "Din datamaskin\ system firmware følger ikke med nok informasjon til å riktig konfigurere og bruke denne enheten. \nFor å bruke denne enheten, kontakt din datamaskin fabrikant for å få en firmware eller BIOS oppdatering."
- IDS_DEV_IRQ_TRANSLATION_FAILED "Denne enheten trenger en PCI interrupt men den er konfigurert for en ISA interrupt (eller vice versa). \nVennligst bruk datamaskinens\'s system installering program for å rekonfigurere interrupt for denne enheten."
+ IDS_DEV_BIOS_TABLE "Din datamaskin system firmware følger ikke med nok informasjon til å riktig konfigurere og bruke denne enheten. \nFor å bruke denne enheten, kontakt din datamaskin fabrikant for å få en firmware eller BIOS oppdatering."
+ IDS_DEV_IRQ_TRANSLATION_FAILED "Denne enheten trenger en PCI interrupt men den er konfigurert for en ISA interrupt (eller vice versa). \nVennligst bruk datamaskinens's system installering program for å rekonfigurere interrupt for denne enheten."
IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS kan ikke initialise enhetsdriveren for denne maskinvaren."
IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS kan ikke laste enhetsdriveren for denne maskinvaren fordi en forrige tilfelle av enhetsdriveren er fremdeles i minnet."
IDS_DEV_DRIVER_FAILED_LOAD "ReactOS kan ikke laste enhetsdriveren for denne maskinvaren. Driveren kan være korrupt eller mangler."
Modified: branches/cmake-bringup/dll/win32/devmgr/lang/ru-RU.rc
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/devmgr/lang/ru-RU.rc?rev=49108&r1=49107&r2=49108&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/devmgr/lang/ru-RU.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/devmgr/lang/ru-RU.rc [iso-8859-1] Sun Oct 10 23:30:05 2010
@@ -41,7 +41,7 @@
IDS_DEV_FAILED_FILTER "Äðàéâåðû äëÿ ýòîãî óñòðîéñòâà äîëæíû áûòü ïåðåóñòàíîâëåíû."
IDS_DEV_DEVLOADER_NOT_FOUND "This device is not working properly because ReactOS cannot load the file $1 that loads the drivers for the device."
IDS_DEV_DEVLOADER_NOT_FOUND2 "This device is not working properly because the file $1 that loads the drivers for this device is bad."
- IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn\'t work, see your hardware documentation."
+ IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn't work, see your hardware documentation."
IDS_DEV_INVALID_DATA "This device is not working properly because the BIOS in your computer is reporting the resources for the device incorrectly."
IDS_DEV_INVALID_DATA2 "This device is not working properly because the BIOS in the device is reporting the resources for the device incorrectly. "
IDS_DEV_FAILED_START "This device is either not present, not working properly, or does not have all the drivers installed."
@@ -69,10 +69,10 @@
IDS_DEV_CANT_SHARE_IRQ "This device is using an Interrupt Request (IRQ) resource that is in use by another device and cannot be shared.\nYou must change the conflicting setting or remove the real-mode driver causing the conflict."
IDS_DEV_FAILED_ADD "This device is not working properly because $1 is not working properly."
IDS_DEV_DISABLED_SERVICE "ReactOS cannot install the drivers for this device because it cannot access the drive or network location that has the setup files on it."
- IDS_DEV_TRANSLATION_FAILED "This device isn\'t responding to its driver."
+ IDS_DEV_TRANSLATION_FAILED "This device isn't responding to its driver."
IDS_DEV_NO_SOFTCONFIG "ReactOS cannot determine the settings for this device. Consult the documentation that came with this device and use the Resource tab to set the configuration."
- IDS_DEV_BIOS_TABLE "Your computer\'s system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update."
- IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer\'s system setup program to reconfigure the interrupt for this device."
+ IDS_DEV_BIOS_TABLE "Your computer's system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update."
+ IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer's system setup program to reconfigure the interrupt for this device."
IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS íå ìîæåò èíèöèàëèçèðîâàòü äðàéâåð óñòðîéñòâà äëÿ äàííîãî îáîðóäîâàíèÿ."
IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS cannot load the device driver for this hardware because a previous instance of the device driver is still in memory."
IDS_DEV_DRIVER_FAILED_LOAD "ReactOS cannot load the device driver for this hardware. The driver may be corrupted or missing."
@@ -86,7 +86,7 @@
IDS_DEV_HELD_FOR_EJECT "ReactOS cannot use this hardware device because it has been prepared for safe removal, but it has not been removed from the computer"
IDS_DEV_DRIVER_BLOCKED "The software for this device has been blocked from starting because it is known to have problems with ReactOS. Contact the hardware vendor for a new driver."
IDS_DEV_REGISTRY_TOO_LARGE "ReactOS cannot start new hardware devices because the system hive is too large (exceeds the Registry Size Limit)."
- IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn\'t able to change the settings of this device."
+ IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn't able to change the settings of this device."
END
STRINGTABLE
Modified: branches/cmake-bringup/dll/win32/devmgr/lang/sk-SK.rc
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/devmgr/lang/sk-SK.rc?rev=49108&r1=49107&r2=49108&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/devmgr/lang/sk-SK.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/devmgr/lang/sk-SK.rc [iso-8859-1] Sun Oct 10 23:30:05 2010
@@ -46,7 +46,7 @@
IDS_DEV_FAILED_FILTER "The drivers for this device need to be reinstalled."
IDS_DEV_DEVLOADER_NOT_FOUND "This device is not working properly because ReactOS cannot load the file $1 that loads the drivers for the device."
IDS_DEV_DEVLOADER_NOT_FOUND2 "This device is not working properly because the file $1 that loads the drivers for this device is bad."
- IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn\'t work, see your hardware documentation."
+ IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn't work, see your hardware documentation."
IDS_DEV_INVALID_DATA "This device is not working properly because the BIOS in your computer is reporting the resources for the device incorrectly."
IDS_DEV_INVALID_DATA2 "This device is not working properly because the BIOS in the device is reporting the resources for the device incorrectly. "
IDS_DEV_FAILED_START "This device is either not present, not working properly, or does not have all the drivers installed."
@@ -68,16 +68,16 @@
IDS_DEV_DEVICE_NOT_THERE "This device is either not present, not working properly, or does not have all the drivers installed."
IDS_DEV_MOVED "ReactOS is in the process of setting up this device."
IDS_DEV_TOO_EARLY "ReactOS is in the process of setting up this device."
- IDS_DEV_NO_VALID_LOG_CONF "ReactOS can\'t specify the resources for this device."
+ IDS_DEV_NO_VALID_LOG_CONF "ReactOS can't specify the resources for this device."
IDS_DEV_FAILED_INSTALL "The drivers for this device are not installed."
IDS_DEV_HARDWARE_DISABLED "This device is disabled because the BIOS for the device did not give it any resources."
IDS_DEV_CANT_SHARE_IRQ "This device is using an Interrupt Request (IRQ) resource that is in use by another device and cannot be shared.\nYou must change the conflicting setting or remove the real-mode driver causing the conflict."
IDS_DEV_FAILED_ADD "This device is not working properly because $1 is not working properly."
IDS_DEV_DISABLED_SERVICE "ReactOS cannot install the drivers for this device because it cannot access the drive or network location that has the setup files on it."
- IDS_DEV_TRANSLATION_FAILED "This device isn\'t responding to its driver."
+ IDS_DEV_TRANSLATION_FAILED "This device isn't responding to its driver."
IDS_DEV_NO_SOFTCONFIG "ReactOS cannot determine the settings for this device. Consult the documentation that came with this device and use the Resource tab to set the configuration."
- IDS_DEV_BIOS_TABLE "Your computer\'s system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update."
- IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer\'s system setup program to reconfigure the interrupt for this device."
+ IDS_DEV_BIOS_TABLE "Your computer's system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update."
+ IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer's system setup program to reconfigure the interrupt for this device."
IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS cannot initialize the device driver for this hardware."
IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS cannot load the device driver for this hardware because a previous instance of the device driver is still in memory."
IDS_DEV_DRIVER_FAILED_LOAD "ReactOS cannot load the device driver for this hardware. The driver may be corrupted or missing."
@@ -91,7 +91,7 @@
IDS_DEV_HELD_FOR_EJECT "ReactOS cannot use this hardware device because it has been prepared for safe removal, but it has not been removed from the computer"
IDS_DEV_DRIVER_BLOCKED "The software for this device has been blocked from starting because it is known to have problems with ReactOS. Contact the hardware vendor for a new driver."
IDS_DEV_REGISTRY_TOO_LARGE "ReactOS cannot start new hardware devices because the system hive is too large (exceeds the Registry Size Limit)."
- IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn\'t able to change the settings of this device."
+ IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn't able to change the settings of this device."
END
STRINGTABLE
More information about the Ros-diffs
mailing list