Revision: 5505
http://winmerge.svn.sourceforge.net/winmerge/?rev=5505&view=rev
Author: kimmov
Date: 2008-06-22 05:41:31 -0700 (Sun, 22 Jun 2008)
Log Message:
-----------
PATCH: [ 1997236 ] New Slovenian translation for WinMerge
Submitted by Iztok Osredkar
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl
trunk/Installer/InnoSetup/Languages/Bulgarian.isl
trunk/Installer/InnoSetup/Languages/Catalan.isl
trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl
trunk/Installer/InnoSetup/Languages/Chinese_Traditional.isl
trunk/Installer/InnoSetup/Languages/Croatian.isl
trunk/Installer/InnoSetup/Languages/Czech.isl
trunk/Installer/InnoSetup/Languages/Danish.isl
trunk/Installer/InnoSetup/Languages/Dutch.isl
trunk/Installer/InnoSetup/Languages/English.isl
trunk/Installer/InnoSetup/Languages/French.isl
trunk/Installer/InnoSetup/Languages/German.isl
trunk/Installer/InnoSetup/Languages/Greek.isl
trunk/Installer/InnoSetup/Languages/Hungarian.isl
trunk/Installer/InnoSetup/Languages/Italian.isl
trunk/Installer/InnoSetup/Languages/Japanese.isl
trunk/Installer/InnoSetup/Languages/Korean.isl
trunk/Installer/InnoSetup/Languages/Norwegian.isl
trunk/Installer/InnoSetup/Languages/Polish.isl
trunk/Installer/InnoSetup/Languages/Portuguese.isl
trunk/Installer/InnoSetup/Languages/Romanian.isl
trunk/Installer/InnoSetup/Languages/Russian.isl
trunk/Installer/InnoSetup/Languages/Slovak.isl
trunk/Installer/InnoSetup/Languages/Spanish.isl
trunk/Installer/InnoSetup/Languages/Swedish.isl
trunk/Installer/InnoSetup/Languages/Turkish.isl
trunk/Installer/InnoSetup/Languages/Ukrainian.isl
trunk/Installer/InnoSetup/WinMerge.iss
Added Paths:
-----------
trunk/Installer/InnoSetup/Languages/Slovenian.isl
trunk/Src/Languages/Slovenian.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Docs/Users/ChangeLog.txt 2008-06-22 12:41:31 UTC (rev 5505)
@@ -11,6 +11,7 @@
BugFix: ISL file syntax highlighting starts comment with { (#1981326)
BugFix: Crash when starting a second instance (#1993835)
BugFix: Crash when starting WinMerge with only one path (#1994402)
+ New translation: Slovenian (#1997236)
Translation updates:
- Brazilian (#1994578)
Modified: trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -356,6 +356,7 @@
RomanianLanguage=Menus e di\xE1logos romenos
RussianLanguage=Menus e di\xE1logos russos
SlovakLanguage=Menus e di\xE1logos eslovacos
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Menus e di\xE1logos espanh\xF3is
SwedishLanguage=Menus e di\xE1logos suecos
TurkishLanguage=Menus e di\xE1logos turcos
Modified: trunk/Installer/InnoSetup/Languages/Bulgarian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Bulgarian.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Bulgarian.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -359,6 +359,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Catalan.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Catalan.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Catalan.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -342,6 +342,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Men\xFAs i di\xE0legs en Rus
SlovakLanguage=Men\xFAs i di\xE0legs en Eslovac
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Men\xFAs i di\xE0legs en Castell\xE0
SwedishLanguage=Men\xFAs i di\xE0legs en Suec
TurkishLanguage=Men\xFAs i di\xE0legs en Turc
Modified: trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Chinese_Simplified.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -349,6 +349,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Chinese_Traditional.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Chinese_Traditional.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Chinese_Traditional.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -356,6 +356,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Croatian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Croatian.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Croatian.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -352,6 +352,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Czech.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Czech.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Czech.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -357,6 +357,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Danish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Danish.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Danish.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -358,6 +358,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Dutch.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Dutch.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Dutch.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -336,6 +336,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/English.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/English.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/English.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -359,6 +359,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/French.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/French.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/French.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -351,6 +351,7 @@
RomanianLanguage=Menus et dialogues Roumain
RussianLanguage=Menus et dialogues Russe
SlovakLanguage=Menus et dialogues Slovaque
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Menus et dialogues Espagnol
SwedishLanguage=Menus et dialogues Su\xE9dois
TurkishLanguage=Menus et dialogues Turque
Modified: trunk/Installer/InnoSetup/Languages/German.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/German.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/German.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -348,6 +348,7 @@
RomanianLanguage=Rum\xE4nisch Men\xFCs und Dialoge
RussianLanguage=Russische Men\xFCs und Dialoge
SlovakLanguage=Slowakische Men\xFCs und Dialoge
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanische Men\xFCs und Dialoge
SwedishLanguage=Schwedische Men\xFCs und Dialoge
TurkishLanguage=T\xFCrkische Men\xFCs und Dialoge
Modified: trunk/Installer/InnoSetup/Languages/Greek.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Greek.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Greek.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -357,6 +357,7 @@
PortugueseLanguage=\xD0\xEF\xF1\xF4\xEF\xE3\xE1\xEB\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
RussianLanguage=\xD1\xF9\xF3\xF3\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
SlovakLanguage=\xD3\xEB\xEF\xE2\xE1\xEA\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=\xC9\xF3\xF0\xE1\xED\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
SwedishLanguage=\xD3\xEF\xF5\xE7\xE4\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
TurkishLanguage=\xD4\xEF\xF5\xF1\xEA\xE9\xEA\xDC \xE5\xF0\xE9\xEB\xEF\xE3\xDD\xF2 \xEA\xE1\xE9 \xE4\xE9\xDC\xEB\xEF\xE3\xEF\xE9
Modified: trunk/Installer/InnoSetup/Languages/Hungarian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Hungarian.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Hungarian.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -378,6 +378,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Orosz men\xFCk \xE9s p\xE1rbesz\xE9dablakok
SlovakLanguage=Szlov\xE1k men\xFCk \xE9s p\xE1rbesz\xE9dablakok
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanyol men\xFCk \xE9s p\xE1rbesz\xE9dablakok
SwedishLanguage=Sv\xE9d men\xFCk \xE9s p\xE1rbesz\xE9dablakok
TurkishLanguage=t\xF6r\xF6k men\xFCk \xE9s p\xE1rbesz\xE9dablakok
Modified: trunk/Installer/InnoSetup/Languages/Italian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Italian.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Italian.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -362,6 +362,7 @@
RomanianLanguage=Menu e finestre di dialogo in Romeno
RussianLanguage=Menu e finestre di dialogo in russo
SlovakLanguage=Menu e finestre di dialogo in slovacco
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Menu e finestre di dialogo in spagnolo
SwedishLanguage=Menu e finestre di dialogo in svedese
TurkishLanguage=Menu e finestre di dialogo in turco
Modified: trunk/Installer/InnoSetup/Languages/Japanese.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Japanese.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Japanese.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -351,6 +351,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Korean.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Korean.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Korean.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -363,6 +363,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Norwegian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Norwegian.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Norwegian.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -355,6 +355,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russiske menyer og dialoger
SlovakLanguage=Slovakiske menyer og dialoger
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanske menyer og dialoger
SwedishLanguage=Svenske menyer og dialoger
TurkishLanguage=T\xFCrk\xE7e menyer og dialoger
Modified: trunk/Installer/InnoSetup/Languages/Polish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Polish.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Polish.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -348,6 +348,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Rosyjski interfejs
SlovakLanguage=Slowacki interfejs
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Hiszpanski interfejs
SwedishLanguage=Szwedzki interfejs
TurkishLanguage=turecki interfejs
Modified: trunk/Installer/InnoSetup/Languages/Portuguese.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Portuguese.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Portuguese.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -340,6 +340,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Romanian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Romanian.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Romanian.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -359,6 +359,7 @@
RomanianLanguage=Meniuri si dialoguri \xEEn Rom\xE2na
RussianLanguage=Meniuri si dialoguri \xEEn Rusa
SlovakLanguage=Meniuri si dialoguri \xEEn Slovaca
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Meniuri si dialoguri \xEEn Spaniola
SwedishLanguage=Meniuri si dialoguri \xEEn Suedeza
TurkishLanguage=Meniuri si dialoguri \xEEn Turca
Modified: trunk/Installer/InnoSetup/Languages/Russian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Russian.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Russian.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -346,6 +346,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Slovak.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Slovak.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Slovak.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -287,6 +287,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Rusk\xE9 ponuky a dial\xF3gy
SlovakLanguage=Slovensk\xE9 ponuky a dial\xF3gy
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=\x8Apanielske ponuky a dial\xF3gy
SwedishLanguage=\x8Av\xE9dske ponuky a dial\xF3gy
TurkishLanguage=Tureck\xE9 ponuky a dial\xF3gy
Added: trunk/Installer/InnoSetup/Languages/Slovenian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Slovenian.isl (rev 0)
+++ trunk/Installer/InnoSetup/Languages/Slovenian.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -0,0 +1,374 @@
+; *** Inno Setup version 5.1.11+ Slovenian messages ***
+;
+; To download user-contributed translations of this file, go to:
+; http://www.jrsoftware.org/is3rdparty.php
+;
+; Note: When translating this text, do not add periods (.) to the end of
+; messages that didn't have them already, because on those messages Inno
+; Setup adds the periods automatically (appending a period would result in
+; two periods being displayed).
+;
+; Maintained by Miha Remec (mr...@gm...)
+;
+; $jrsoftware: issrc/Files/Languages/Slovenian.isl,v 1.14 2007/02/27 18:22:41 jr Exp $
+
+[LangOptions]
+LanguageName=Slovenski
+LanguageID=$0424
+LanguageCodePage=1250
+
+[Messages]
+
+; *** Application titles
+SetupAppTitle=Namestitev
+SetupWindowTitle=Namestitev - %1
+UninstallAppTitle=Odstranitev
+UninstallAppFullTitle=Odstranitev programa %1
+
+; *** Misc. common
+InformationTitle=Informacija
+ConfirmTitle=Potrditev
+ErrorTitle=Napaka
+
+; *** SetupLdr messages
+SetupLdrStartupMessage=V ra\xE8unalnik boste namestili program %1. \x8Eelite nadaljevati?
+LdrCannotCreateTemp=Ne morem ustvariti za\xE8asne datoteke. Namestitev je prekinjena
+LdrCannotExecTemp=Ne morem zagnati datoteke v za\xE8asni mapi. Namestitev je prekinjena
+
+; *** Startup error messages
+LastErrorMessage=%1.%n%nNapaka %2: %3
+SetupFileMissing=Manjka datoteka %1. Odpravite napako ali si priskrbite drugo kopijo programa.
+SetupFileCorrupt=Datoteke namestitvenega programa so okvarjene. Priskrbite si drugo kopijo programa.
+SetupFileCorruptOrWrongVer=Datoteke so okvarjene ali nezdru\x9Eljive s to razli\xE8ico namestitvenega programa. Odpravite napako ali si priskrbite drugo kopijo programa.
+NotOnThisPlatform=Program ni namenjen za uporabo v %1.
+OnlyOnThisPlatform=Program je namenjen za uporabo v %1.
+OnlyOnTheseArchitectures=Program lahko namestite le na razli\xE8icah MS Windows sistemov, ki so na\xE8rtovani za naslednje tipe procesorjev:%n%n%1
+MissingWOW64APIs=Razli\xE8ica MS Windows, ki jo uporabljate, ne vsebuje okolja, ki ga zahteva namestitveni program za izvedbo 64-bitne namestitve. Problem odpravite z namestitvijo servisnega paketa %1.
+WinVersionTooLowError=Ta program zahteva %1 razli\xE8ico %2 ali novej\x9Ao.
+WinVersionTooHighError=Tega programa ne morete namestiti v %1 razli\xE8ice %2 ali novej\x9Ae.
+AdminPrivilegesRequired=Namestitev programa lahko opravi le administrator.
+PowerUserPrivilegesRequired=Namestitev programa lahko opravi le administrator ali zahtevni uporabnik.
+SetupAppRunningError=Program %1 je trenutno odprt.%n%nZaprite program, nato kliknite V redu za nadaljevanje ali Prekini za izhod.
+UninstallAppRunningError=Program %1 je trenutno odprt.%n%nZaprite program, nato kliknite V redu za nadaljevanje ali Prekini za izhod.
+
+; *** Misc. errors
+ErrorCreatingDir=Namestitveni program ni mogel ustvariti mape "%1"
+ErrorTooManyFilesInDir=Namestitveni program ne more ustvariti nove datoteke v mapi "%1", ker vsebuje mapa preve\xE8 datotek
+
+; *** Setup common messages
+ExitSetupTitle=Prekini namestitev
+ExitSetupMessage=Namestitev ni kon\xE8ana. \xC8e jo boste prekinili, program ne bo name\x9A\xE8en.%n%nPonovno namestitev lahko izvedete kasneje.%n%n\x8Eelite prekiniti namestitev?
+AboutSetupMenuItem=&O namestitvenem programu...
+AboutSetupTitle=O namestitvenem programu
+AboutSetupMessage=%1 razli\xE8ica %2%n%3%n%n%1 doma\xE8a stran:%n%4
+AboutSetupNote=
+TranslatorNote=Slovenski prevod: Miha Remec%n(inn...@mi...)
+
+; *** Buttons
+ButtonBack=< Na&zaj
+ButtonNext=&Naprej >
+ButtonInstall=&Namesti
+ButtonOK=V redu
+ButtonCancel=Prekini
+ButtonYes=&Da
+ButtonYesToAll=Da za &vse
+ButtonNo=&Ne
+ButtonNoToAll=N&e za vse
+ButtonFinish=&Kon\xE8aj
+ButtonBrowse=&Prebrskaj...
+ButtonWizardBrowse=P&rebrskaj...
+ButtonNewFolder=&Ustvari novo mapo
+
+; *** "Select Language" dialog messages
+SelectLanguageTitle=Izbira jezika namestitve
+SelectLanguageLabel=Izberite jezik, ki ga \x9Eelite uporabljati med namestitvijo:
+
+; *** Common wizard text
+ClickNext=Kliknite Naprej za nadaljevanje namestitve ali Prekini za prekinitev namestitve.
+BeveledLabel=
+BrowseDialogTitle=Izbira mape
+BrowseDialogLabel=Izberite mapo s spiska, nato kliknite V redu.
+NewFolderName=Nova mapa
+
+; *** "Welcome" wizard page
+WelcomeLabel1=Dobrodo\x9Ali v namestitev programa [name].
+WelcomeLabel2=V ra\xE8unalnik boste namestili program [name/ver].%n%nPriporo\xE8ljivo je, da pred za\xE8etkom namestitve zaprete vse odprte programe.
+
+; *** "Password" wizard page
+WizardPassword=Geslo
+PasswordLabel1=Namestitev je za\x9A\xE8itena z geslom.
+PasswordLabel3=Vpi\x9Aite geslo, nato kliknite Naprej za nadaljevanje. Pri vpisu pazite na male in velike \xE8rke.
+PasswordEditLabel=&Geslo:
+IncorrectPassword=Geslo, ki ste ga vpisali, ni pravilno. Vpi\x9Aite pravilno geslo.
+
+; *** "License Agreement" wizard page
+WizardLicense=Licen\xE8na pogodba za uporabo programa
+LicenseLabel=Pred nadaljevanjem preberite licen\xE8no pogodbo za uporabo programa.
+LicenseLabel3=Preberite licen\xE8no pogodbo za uporabo programa. Program lahko namestite le, \xE8e se s pogodbo v celoti strinjate.
+LicenseAccepted=&Da, sprejemam vse pogoje licen\xE8ne pogodbe
+LicenseNotAccepted=N&e, pogojev licen\xE8ne pogodbe ne sprejmem
+
+; *** "Information" wizard pages
+WizardInfoBefore=Informacije
+InfoBeforeLabel=Pred nadaljevanjem preberite naslednje pomembne informacije.
+InfoBeforeClickLabel=Ko boste pripravljeni za nadaljevanje namestitve, kliknite Naprej.
+WizardInfoAfter=Informacije
+InfoAfterLabel=Pred nadaljevanjem preberite naslednje pomembne informacije.
+InfoAfterClickLabel=Ko boste pripravljeni za nadaljevanje namestitve, kliknite Naprej.
+
+; *** "User Information" wizard page
+WizardUserInfo=Podatki o uporabniku
+UserInfoDesc=Vpi\x9Aite svoje podatke.
+UserInfoName=&Ime:
+UserInfoOrg=&Podjetje:
+UserInfoSerial=&Serijska \x9Atevilka:
+UserInfoNameRequired=Vpis imena je obvezen.
+
+; *** "Select Destination Location" wizard page
+WizardSelectDir=Izbira ciljnega mesta
+SelectDirDesc=Kam \x9Eelite namestiti program [name]?
+SelectDirLabel3=Program [name] bo name\x9A\xE8en v naslednjo mapo.
+SelectDirBrowseLabel=Za nadaljevanje kliknite Naprej. \xC8e \x9Eelite izbrati drugo mapo, kliknite Prebrskaj.
+DiskSpaceMBLabel=Na disku mora biti vsaj [mb] MB prostora.
+ToUNCPathname=Programa ne morete namestiti v UNC pot. \xC8e \x9Eelite namestiti v omre\x9Eje, se morate povezati z omre\x9Enim pogonom.
+InvalidPath=Vpisati morate polno pot vklju\xE8no z oznako pogona. Primer:%n%nC:\PROGRAM%n%nali UNC pot v obliki:%n%n\\stre\x9Enik\mapa_skupne_rabe
+InvalidDrive=Izbrani pogon ali UNC skupna raba ne obstaja ali ni dostopna. Izberite drugega.
+DiskSpaceWarningTitle=Na disku ni dovolj prostora
+DiskSpaceWarning=Namestitev potrebuje vsaj %1 KB prostora, toda na izbranem pogonu je na voljo le %2 KB.%n%n\x8Eelite kljub temu nadaljevati?
+DirNameTooLong=Ime mape ali poti je predolgo.
+InvalidDirName=Ime mape ni veljavno.
+BadDirName32=Ime mape ne sme vsebovati naslednjih znakov:%n%n%1
+DirExistsTitle=Mapa \x9Ee obstaja
+DirExists=Mapa%n%n%1%n%n\x9Ee obstaja. \x8Eelite program vseeno namestiti v to mapo?
+DirDoesntExistTitle=Mapa ne obstaja
+DirDoesntExist=Mapa %n%n%1%n%nne obstaja. \x8Eelite ustvariti to mapo?
+
+; *** "Select Components" wizard page
+WizardSelectComponents=Izbira komponent
+SelectComponentsDesc=Katere komponente \x9Eelite namestiti?
+SelectComponentsLabel2=Ozna\xE8ite komponente, ki jih \x9Eelite namestiti; odzna\xE8ite komponente, ki jih ne \x9Eelite namestiti. Kliknite Naprej, ko boste pripravljeni za nadaljevanje.
+FullInstallation=Polna namestitev
+; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
+CompactInstallation=Osnovna namestitev
+CustomInstallation=Nastavljiva namestitev
+NoUninstallWarningTitle=Komponente \x9Ee obstajajo
+NoUninstallWarning=Namestitveni program je ugotovil, da so naslednje komponente \x9Ee name\x9A\xE8ene v ra\xE8unalniku:%n%n%1%n%nOdzna\xE8itev teh komponent \x9Ae ne pomeni tudi njihove odstranitve.%n%n\x8Eelite vseeno nadaljevati?
+ComponentSize1=%1 KB
+ComponentSize2=%1 MB
+ComponentsDiskSpaceMBLabel=Za izbrano namestitev potrebujete vsaj [mb] MB prostora na disku.
+
+; *** "Select Additional Tasks" wizard page
+WizardSelectTasks=Izbira dodatnih opravil
+SelectTasksDesc=Katera dodatna opravila \x9Eelite izvesti?
+SelectTasksLabel2=Izberite dodatna opravila, ki jih bo namestitveni program opravil med namestitvijo programa [name], nato kliknite Naprej.
+
+; *** "Select Start Menu Folder" wizard page
+WizardSelectProgramGroup=Izbira mape v meniju \xBBStart\xAB
+SelectStartMenuFolderDesc=Kje naj namestitveni program ustvari programske ikone?
+SelectStartMenuFolderLabel3=Namestitveni program bo ustvaril programske ikone v naslednji mapi v meniju \xBBStart\xAB.
+SelectStartMenuFolderBrowseLabel=Za nadaljevanje kliknite Naprej. \xC8e \x9Eelite izbrati drugo mapo, kliknite Prebrskaj.
+MustEnterGroupName=Ime skupine mora biti vpisano.
+GroupNameTooLong=Ime mape ali poti je predolgo.
+InvalidGroupName=Ime mape ni veljavno.
+BadGroupName=Ime skupine ne sme vsebovati naslednjih znakov:%n%n%1
+NoProgramGroupCheck2=&Ne ustvari mape v meniju \xBBStart\xAB
+
+; *** "Ready to Install" wizard page
+WizardReady=Pripravljen za namestitev
+ReadyLabel1=Namestitveni program je pripravljen za namestitev programa [name] v va\x9A ra\xE8unalnik.
+ReadyLabel2a=Kliknite Namesti za za\xE8etek name\x9A\xE8anja. Kliknite Nazaj, \xE8e \x9Eelite pregledati ali spremeniti katerokoli nastavitev.
+ReadyLabel2b=Kliknite Namesti za za\xE8etek name\x9A\xE8anja.
+ReadyMemoUserInfo=Podatki o uporabniku:
+ReadyMemoDir=Ciljno mesto:
+ReadyMemoType=Tip namestitve:
+ReadyMemoComponents=Izbrane komponente:
+ReadyMemoGroup=Mapa v meniju \xBBStart\xAB:
+ReadyMemoTasks=Dodatna opravila:
+
+; *** "Preparing to Install" wizard page
+WizardPreparing=Pripravljam za namestitev
+PreparingDesc=Namestitveni program je pripravljen za namestitev programa [name] v va\x9A ra\xE8unalnik.
+PreviousInstallNotCompleted=Namestitev/odstranitev prej\x9Anjega programa ni bila kon\xE8ana. Da bi jo dokon\xE8ali, morate ra\xE8unalnik ponovno zagnati.%n%nPo ponovnem zagonu ra\xE8unalnika ponovno odprite namestitveni program, da boste kon\xE8ali namestitev programa [name].
+CannotContinue=Namestitveni program ne more nadaljevati. Pritisnite Prekini za izhod.
+
+; *** "Installing" wizard page
+WizardInstalling=Name\x9A\xE8anje
+InstallingLabel=Po\xE8akajte, da bo program [name] name\x9A\xE8en v va\x9A ra\xE8unalnik.
+
+; *** "Setup Completed" wizard page
+FinishedHeadingLabel=Zaklju\xE8ek namestitve programa [name]
+FinishedLabelNoIcons=Program [name] je name\x9A\xE8en v va\x9A ra\xE8unalnik.
+FinishedLabel=Program [name] je name\x9A\xE8en v va\x9A ra\xE8unalnik. Program za\x9Eenete tako, da odprete pravkar ustvarjene programske ikone.
+ClickFinish=Kliknite tipko Kon\xE8aj za zaklju\xE8ek namestitve.
+FinishedRestartLabel=Za dokon\xE8anje namestitve programa [name] morate ra\xE8unalnik znova zagnati. Ali ga \x9Eelite znova zagnati zdaj?
+FinishedRestartMessage=Za dokon\xE8anje namestitve programa [name] morate ra\xE8unalnik znova zagnati. %n%nAli ga \x9Eelite znova zagnati zdaj?
+ShowReadmeCheck=\x8Eelim prebrati datoteko z navodili
+YesRadio=&Da, ra\xE8unalnik znova za\x9Eeni zdaj
+NoRadio=&Ne, ra\xE8unalnik bom znova zagnal pozneje
+
+; used for example as 'Run MyProg.exe'
+RunEntryExec=Odpri %1
+; used for example as 'View Readme.txt'
+RunEntryShellExec=Preberi %1
+
+; *** "Setup Needs the Next Disk" stuff
+ChangeDiskTitle=Namestitveni program potrebuje naslednjo disketo
+SelectDiskLabel2=Vstavite disketo %1 and kliknite V redu.%n%n\xC8e se datoteke s te diskete nahajajo v drugi mapi, kot je navedena spodaj, vpi\x9Aite pravilno pot ali kliknite Prebrskaj.
+PathLabel=&Pot:
+FileNotInDir2=Datoteke "%1" ni v mapi "%2". Vstavite pravilno disketo ali izberite drugo mapo.
+SelectDirectoryLabel=Vpi\x9Aite lokacijo naslednje diskete.
+
+; *** Installation phase messages
+SetupAborted=Namestitev ni bila kon\xE8ana.%n%nOdpravite te\x9Eavo in znova odprite namestitveni program.
+EntryAbortRetryIgnore=Kliknite Ponovi za ponovitev, Prezri za nadaljevanje kljub problemu, ali Prekini za prekinitev namestitve.
+
+; *** Installation status messages
+StatusCreateDirs=Ustvarjam mape...
+StatusExtractFiles=Raz\x9Airjam datoteke...
+StatusCreateIcons=Ustvarjam bli\x9Enjice...
+StatusCreateIniEntries=Vpisujem v INI datoteke...
+StatusCreateRegistryEntries=Vpisujem v register...
+StatusRegisterFiles=Registriram datoteke...
+StatusSavingUninstall=Zapisujem podatke za odstranitev programa...
+StatusRunProgram=Zaklju\xE8ujem namestitev...
+StatusRollback=Obnavljam prvotno stanje...
+
+; *** Misc. errors
+ErrorInternal2=Interna napaka: %1
+ErrorFunctionFailedNoCode=%1 ni uspel(a)
+ErrorFunctionFailed=%1 ni uspel(a); koda %2
+ErrorFunctionFailedWithMessage=%1 ni uspela; koda %2.%n%3
+ErrorExecutingProgram=Ne morem odpreti programa:%n%1
+
+; *** Registry errors
+ErrorRegOpenKey=Napaka pri odpiranju klju\xE8a v registru:%n%1\%2
+ErrorRegCreateKey=Napaka pri ustvarjanju klju\xE8a v registru:%n%1\%2
+ErrorRegWriteKey=Napaka pri pisanju klju\xE8a v registru:%n%1\%2
+
+; *** INI errors
+ErrorIniEntry=Napaka pri vpisu v INI datoteko "%1".
+
+; *** File copying errors
+FileAbortRetryIgnore=Kliknite Ponovi za ponovitev, Prezri za preskok datoteke (ni priporo\xE8ljivo) ali Prekini za prekinitev namestitve.
+FileAbortRetryIgnore2=Kliknite Ponovi za ponovitev, Prezri za nadaljevanje (ni priporo\xE8ljivo) ali Prekini za prekinitev namestitve.
+SourceIsCorrupted=Izvorna datoteka je okvarjena
+SourceDoesntExist=Izvorna datoteka "%1" ne obstaja
+ExistingFileReadOnly=Obstoje\xE8a datoteka je ozna\xE8ena samo za branje.%n%nPritisnite Ponovi za odstranitev te lastnosti in ponovni poskus, Prezri za preskok te datoteke, ali Prekini za prekinitev namestitve.
+ErrorReadingExistingDest=Pri branju obstoje\xE8e datoteke je pri\x9Alo do napake:
+FileExists=Datoteka \x9Ee obstaja.%n%n\x8Eelite, da jo namestitveni program prepi\x9Ae?
+ExistingFileNewer=V ra\xE8unalniku \x9Ee imate name\x9A\xE8eno novej\x9Ao datoteko. Priporo\xE8ljivo je, da obstoje\xE8o (novej\x9Ao) datoteko obdr\x9Eite.%n%n\x8Eelite obdr\x9Eati obstoje\xE8o (novej\x9Ao) datoteko?
+ErrorChangingAttr=Pri poskusu spremembe lastnosti datoteke je pri\x9Alo do napake:
+ErrorCreatingTemp=Pri ustvarjanju datoteke v ciljni mapi je pri\x9Alo do napake:
+ErrorReadingSource=Pri branju izvorne datoteke je pri\x9Alo do napake:
+ErrorCopying=Pri kopiranju datoteke je pri\x9Alo do napake:
+ErrorReplacingExistingFile=Pri poskusu zamenjave obstoje\xE8e datoteke je pri\x9Alo do napake:
+ErrorRestartReplace=RestartReplace failed:
+ErrorRenamingTemp=Pri poskusu preimenovanja datoteke v ciljni mapi je pri\x9Alo do napake:
+ErrorRegisterServer=Registracija DLL/OCX ni mo\x9Ena: %1
+ErrorRegSvr32Failed=RegSvr32 ni uspel s kodo napake %1
+ErrorRegisterTypeLib=Prijava vrste knji\x9Enice ni mogo\xE8a: %1
+
+; *** Post-installation errors
+ErrorOpeningReadme=Pri odpiranju datoteke README je pri\x9Alo do napake.
+ErrorRestartingComputer=Namestitveni program ni uspel znova zagnati ra\xE8unalnika. Ponovni zagon opravite ro\xE8no.
+
+; *** Uninstaller messages
+UninstallNotFound=Datoteka "%1" ne obstaja. Odstranitev ni mogo\xE8a.
+UninstallOpenError=Datoteke "%1" ne morem odpreti. Ne morem odstraniti
+UninstallUnsupportedVer=Dnevni\x9Aka datoteka "%1" je v obliki, ki je ta razli\xE8ica odstranitvenega programa ne razume. Programa ni mogo\xE8e odstraniti
+UninstallUnknownEntry=V dnevni\x9Aki datoteki je bil najden neznani vpis (%1)
+ConfirmUninstall=Ste prepri\xE8ani, da \x9Eelite v celoti odstraniti program %1 in pripadajo\xE8e komponente?
+UninstallOnlyOnWin64=To namestitev je mogo\xE8e odstraniti le v 64-bitni razli\xE8ici MS Windows.
+OnlyAdminCanUninstall=Ta program lahko odstrani le administrator.
+UninstallStatusLabel=Po\xE8akajte, da odstranim program %1 iz va\x9Aega ra\xE8unalnika.
+UninstalledAll=Program %1 je bil uspe\x9Ano odstranjen iz va\x9Aega ra\xE8unalnika.
+UninstalledMost=Odstranjevanje programa %1 je kon\xE8ano.%n%nNekateri deli niso bili odstranjeni in jih lahko odstranite ro\xE8no.
+UninstalledAndNeedsRestart=Za dokon\xE8anje odstranitve programa %1 morate ra\xE8unalnik znova zagnati.%n%nAli ga \x9Eelite znova zagnati zdaj?
+UninstallDataCorrupted=Datoteka "%1" je okvarjena. Odstranitev ni mo\x9Ena
+
+; *** Uninstallation phase messages
+ConfirmDeleteSharedFileTitle=\x8Eelite odstraniti datoteko v skupni rabi?
+ConfirmDeleteSharedFile2=Spodaj izpisane datoteke v skupni rabi ne uporablja ve\xE8 noben program. \x8Eelite odstraniti to datoteko?%n%n\xC8e jo uporablja katerikoli program in jo boste odstranili, tak program verjetno ne bo ve\xE8 deloval pravilno. \xC8e niste prepri\xE8ani, kliknite Ne. \xC8e boste datoteko ohranili v ra\xE8unalniku, ne bo ni\xE8 narobe.
+SharedFileNameLabel=Ime datoteke:
+SharedFileLocationLabel=Lokacija:
+WizardUninstalling=Odstranjevanje programa
+StatusUninstalling=Odstranjujem %1...
+
+[CustomMessages]
+
+NameAndVersion=%1 razli\xE8ica %2
+AdditionalIcons=Dodatne ikone:
+CreateDesktopIcon=Ustvari ikono na &namizju
+CreateQuickLaunchIcon=Ustvari ikono za &hitri zagon
+ProgramOnTheWeb=%1 na spletu
+UninstallProgram=Odstrani %1
+LaunchProgram=Odpri %1
+AssocFileExtension=&Pove\x9Ei %1 s pripono %2
+AssocingFileExtension=Povezujem %1 s pripono %2...
+
+;Things we can also localize
+CompanyName=Thingamahoochie Software
+
+;Types
+TypicalInstallation=Typical Installation
+FullInstallation=Full Installation
+CompactInstallation=Compact Installation
+CustomInstallation=Custom Installation
+
+;Components
+AppCoreFiles=WinMerge Core Files
+ApplicationRuntimes=Application Runtimes
+Filters=Filters
+Plugins=Plugins
+
+;Localization Components
+Languages=Languages
+BulgarianLanguage=Bulgarian menus and dialogs
+CatalanLanguage=Catalan menus and dialogs
+ChineseSimplifiedLanguage=Chinese (Simplified) menus and dialogs
+ChineseTraditionalLanguage=Chinese (Traditional) menus and dialogs
+CroatianLanguage=Croatian menus and dialogs
+CzechLanguage=Czech menus and dialogs
+DanishLanguage=Danish menus and dialogs
+DutchLanguage=Dutch menus and dialogs
+FrenchLanguage=French menus and dialogs
+GermanLanguage=German menus and dialogs
+GreekLanguage=Greek menus and dialogs
+HungarianLanguage=Hungarian menus and dialogs
+ItalianLanguage=Italian menus and dialogs
+JapaneseLanguage=Japanese menus and dialogs
+KoreanLanguage=Korean menus and dialogs
+NorwegianLanguage=Norwegian menus and dialogs
+PolishLanguage=Polish menus and dialogs
+PortugueseBrazilLanguage=Portuguese (Brazilian) menus and dialogs
+PortugueseLanguage=Portuguese menus and dialogs
+RomanianLanguage=Romanian menus and dialogs
+RussianLanguage=Russian menus and dialogs
+SlovakLanguage=Slovak menus and dialogs
+SlovenianLanguage=Slovenian menus and dialogs
+SpanishLanguage=Spanish menus and dialogs
+SwedishLanguage=Swedish menus and dialogs
+TurkishLanguage=Turkish menus and dialogs
+UkrainianLanguage=Ukrainian menus and dialogs
+
+;Tasks
+ExplorerContextMenu=&Enable Explorer context menu integration
+IntegrateTortoiseCVS=Integrate with &TortoiseCVS
+IntegrateTortoiseSVN=Integrate with T&ortoiseSVN
+IntegrateClearCase=Integrate with Rational &ClearCase
+IntegrateDelphi4=Borland\xAE Delphi &4 Binary File Support
+UpdatingCommonControls=Updating the System's Common Controls
+
+;Icon Labels
+ReadMe=Read Me
+UsersGuide=User's Guide
+UpdatingCommonControls=Updating the System's Common Controls
+ViewStartMenuFolder=&View the WinMerge Start Menu Folder
+PluginsText=Plugins
+
+;Code Dialogs
+DeletePreviousStartMenu=The installer has detected that you changed the location of your start menu from "%s" to "%s". Would you like to delete the previous start menu folder?
+
+; Project file description
+ProjectFileDesc=WinMerge Project file
+
Property changes on: trunk/Installer/InnoSetup/Languages/Slovenian.isl
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/Installer/InnoSetup/Languages/Spanish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Spanish.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Spanish.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -355,6 +355,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Swedish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Swedish.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Swedish.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -349,6 +349,7 @@
RomanianLanguage=Rum\xE4nska menyer och dialoger
RussianLanguage=Ryska menyer och dialoger
SlovakLanguage=Slovakiska menyer och dialoger
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanska menyer och dialoger
SwedishLanguage=Svenska menyer och dialoger
TurkishLanguage=Turkiska menyer och dialoger
Modified: trunk/Installer/InnoSetup/Languages/Turkish.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Turkish.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Turkish.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -351,6 +351,7 @@
RomanianLanguage=Romanian menus and dialogs
RussianLanguage=Russian menus and dialogs
SlovakLanguage=Slovak menus and dialogs
+SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=Spanish menus and dialogs
SwedishLanguage=Swedish menus and dialogs
TurkishLanguage=Turkish menus and dialogs
Modified: trunk/Installer/InnoSetup/Languages/Ukrainian.isl
===================================================================
--- trunk/Installer/InnoSetup/Languages/Ukrainian.isl 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/Languages/Ukrainian.isl 2008-06-22 12:41:31 UTC (rev 5505)
@@ -354,6 +354,7 @@
RomanianLanguage=\xCC\xE5\xED\xFE \xB3 \xE4\xB3\xE0\xEB\xEE\xE3\xEE\xE2\xB3 \xE2\xB3\xEA\xED\xE0 \xF0\xF3\xEC\xF3\xED\xF1\xFC\xEA\xEE\xFE \xEC\xEE\xE2\xEE\xFE
RussianLanguage=\xCC\xE5\xED\xFE \xB3 \xE4\xB3\xE0\xEB\xEE\xE3\xEE\xE2\xB3 \xE2\xB3\xEA\xED\xE0 \xF0\xEE\xF1\xB3\xE9\xF1\xFC\xEA\xEE\xFE \xEC\xEE\xE2\xEE\xFE
SlovakLanguage=\xCC\xE5\xED\xFE \xB3 \xE4\xB3\xE0\xEB\xEE\xE3\xEE\xE2\xB3 \xE2\xB3\xEA\xED\xE0 \xF1\xEB\xEE\xE2\xE0\xF6\xFC\xEA\xEE\xFE \xEC\xEE\xE2\xEE\xFE
+ SlovenianLanguage=Slovenian menus and dialogs
SpanishLanguage=\xCC\xE5\xED\xFE \xB3 \xE4\xB3\xE0\xEB\xEE\xE3\xEE\xE2\xB3 \xE2\xB3\xEA\xED\xE0 \xB3\xF1\xEF\xE0\xED\xF1\xFC\xEA\xEE\xFE \xEC\xEE\xE2\xEE\xFE
SwedishLanguage=\xCC\xE5\xED\xFE \xB3 \xE4\xB3\xE0\xEB\xEE\xE3\xEE\xE2\xB3 \xE2\xB3\xEA\xED\xE0 \xF8\xE2\xE5\xE4\xF1\xFC\xEA\xEE\xFE \xEC\xEE\xE2\xEE\xFE
TurkishLanguage=\xCC\xE5\xED\xFE \xB3 \xE4\xB3\xE0\xEB\xEE\xE3\xEE\xE2\xB3 \xE2\xB3\xEA\xED\xE0 \xF2\xF3\xF0\xE5\xF6\xFC\xEA\xEE\xFE \xEC\xEE\xE2\xEE\xFE
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2008-06-21 12:44:24 UTC (rev 5504)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2008-06-22 12:41:31 UTC (rev 5505)
@@ -137,6 +137,7 @@
Name: Romanian; MessagesFile: Languages\Romanian.isl
Name: Russian; MessagesFile: Languages\Russian.isl
Name: Slovak; MessagesFile: Languages\Slovak.isl
+Name: Slovenian; MessagesFile: Languages\Slovenian.isl
Name: Spanish; MessagesFile: Languages\Spanish.isl; InfoAfterFile: ..\..\Docs\Users\Languages\ReadMe-Spanish.txt
Name: Swedish; MessagesFile: Languages\Swedish.isl; InfoAfterFile: ..\..\Docs\Users\Languages\ReadMe-Swedish.txt
Name: Turkish; MessagesFile: Languages\Turkish.isl
@@ -232,6 +233,9 @@
Name: Languages\Slovak; Description: {cm:SlovakLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Slovak
Name: Languages\Slovak; Description: {cm:SlovakLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Slovak
+Name: Languages\Slovenian; Description: {cm:SlovenianLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Slovenian
+Name: Languages\Slovenian; Description: {cm:SlovenianLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Slovenian
+
Name: Languages\Spanish; Description: {cm:SpanishLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Spanish
Name: Languages\Spanish; Description: {cm:SpanishLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Spanish
@@ -394,6 +398,7 @@
Source: ..\..\Src\Languages\Romanian.po; DestDir: {app}\Languages; Components: Languages\Romanian; Flags: ignoreversion comparetimestamp
Source: ..\..\Src\Languages\Russian.po; DestDir: {app}\Languages; Components: Languages\Russian; Flags: ignoreversion comparetimestamp
Source: ..\..\Src\Languages\Slovak.po; DestDir: {app}\Languages; Components: Languages\Slovak; Flags: ignoreversion comparetimestamp
+Source: ..\..\Src\Languages\Slovenian.po; DestDir: {app}\Languages; Components: Languages\Slovenian; Flags: ignoreversion comparetimestamp
Source: ..\..\Src\Languages\Spanish.po; DestDir: {app}\Languages; Components: Languages\Spanish; Flags: ignoreversion comparetimestamp
Source: ..\..\Docs\Users\Languages\ReadMe-Spanish.txt; DestDir: {app}\Docs; Components: Languages\Spanish
Source: ..\..\Src\Languages\Swedish.po; DestDir: {app}\Languages; Components: Languages\Swedish; Flags: ignoreversion comparetimestamp
Added: trunk/Src/Languages/Slovenian.po
===================================================================
--- trunk/Src/Languages/Slovenian.po (rev 0)
+++ trunk/Src/Languages/Slovenian.po 2008-06-22 12:41:31 UTC (rev 5505)
@@ -0,0 +1,6010 @@
+# This file is part from WinMerge <http://winmerge.org/>
+# Released under the "GNU General Public License"
+#
+# Translators:
+# * Iztok Osredkar <iztok.osredkar at institut-oko.si>
+#
+#
+#
+# ID line follows -- this is updated by SVN
+# $Id$
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: WinMerge\n"
+"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2008-06-16 00:11+0100\n"
+"Last-Translator: Iztok Osredkar <izt...@in...>\n"
+"Language-Team: Slovenian <win...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Slovenian\n"
+"X-Poedit-SourceCharset: CP1250\n"
+"X-Poedit-Basepath: ../\n"
+
+#. LANGUAGE, SUBLANGUAGE
+#: Merge.rc:22
+#: Merge.rc:51
+#, c-format
+msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
+msgstr "LANG_SLOVENIAN, SUBLANG_SLOVENIAN"
+
+#. Codepage
+#: Merge.rc:23
+#: Merge.rc:52
+#, c-format
+msgid "1252"
+msgstr "1250"
+
+#: Merge.rc:72
+#: Merge.rc:99
+#, c-format
+msgid "C&opy to Right"
+msgstr "Kopiraj na &desno"
+
+#: Merge.rc:73
+#: Merge.rc:100
+#, c-format
+msgid "Cop&y to Left"
+msgstr "Kopiraj na &levo"
+
+#: Merge.rc:75
+#, c-format
+msgid "&Select Line Difference"
+msgstr "&Izberi razlike vrstic"
+
+#: Merge.rc:77
+#, c-format
+msgid "&Undo"
+msgstr "&Razveljavi"
+
+#: Merge.rc:78
+#, c-format
+msgid "&Redo"
+msgstr "&Uveljavi"
+
+#: Merge.rc:80
+#: Merge.rc:102
+#, c-format
+msgid "Cu&t"
+msgstr "Izre\x9E&i"
+
+#: Merge.rc:81
+#: Merge.rc:103
+#: Merge.rc:496
+#, c-format
+msgid "&Copy"
+msgstr "&Kopiraj"
+
+#: Merge.rc:82
+#: Merge.rc:104
+#, c-format
+msgid "&Paste"
+msgstr "&Prilepi"
+
+#: Merge.rc:84
+#: Merge.rc:577
+#, c-format
+msgid "&Goto..."
+msgstr "Pojdi &na..."
+
+#: Merge.rc:86
+#, c-format
+msgid "Op&en"
+msgstr "&Odpri"
+
+#: Merge.rc:88
+#: Merge.rc:519
+#: Merge.rc:525
+#, c-format
+msgid "with &Registered Application"
+msgstr "Z re&gistrirano aplikacijo"
+
+#: Merge.rc:89
+#: Merge.rc:520
+#: Merge.rc:526
+#, c-format
+msgid "with &External Editor"
+msgstr "Z &zunanjim urejevalnikom"
+
+#: Merge.rc:90
+#: Merge.rc:521
+#: Merge.rc:527
+#, c-format
+msgid "&with..."
+msgstr "&z..."
+
+#: Merge.rc:110
+#: Merge.rc:189
+#: Merge.rc:303
+#, c-format
+msgid "&File"
+msgstr "&Datoteka"
+
+#: Merge.rc:112
+#: Merge.rc:191
+#: Merge.rc:305
+#, c-format
+msgid "&New\tCtrl+N"
+msgstr "&Nova\tCtrl+N"
+
+#: Merge.rc:113
+#: Merge.rc:192
+#: Merge.rc:306
+#, c-format
+msgid "&Open...\tCtrl+O"
+msgstr "&Odpri...\tCtrl+O"
+
+#: Merge.rc:114
+#, c-format
+msgid "Op&en Conflict File..."
+msgstr "Od&pri konfliktno datoteko..."
+
+#: Merge.rc:116
+#: Merge.rc:194
+#: Merge.rc:308
+#, c-format
+msgid "Open Pro&ject...\tCtrl+J"
+msgstr "Odpri pro&jekt...\tCtrl+J"
+
+#: Merge.rc:117
+#: Merge.rc:195
+#: Merge.rc:309
+#, c-format
+msgid "Sa&ve Project..."
+msgstr "S&hrani projekt..."
+
+#: Merge.rc:119
+#, c-format
+msgid "Recent Projects"
+msgstr "Nedavni projekti"
+
+#: Merge.rc:121
+#: Merge.rc:202
+#: Merge.rc:341
+#, c-format
+msgid "E&xit"
+msgstr "I&zhod"
+
+#: Merge.rc:123
+#: Merge.rc:204
+#: Merge.rc:343
+#, c-format
+msgid "&Edit"
+msgstr "&Uredi"
+
+#: Merge.rc:125
+#: Merge.rc:208
+#: Merge.rc:377
+#, c-format
+msgid "&Options..."
+msgstr "&Mo\x9Enosti..."
+
+#: Merge.rc:127
+#: Merge.rc:210
+#: Merge.rc:379
+#, c-format
+msgid "&View"
+msgstr "&Pogled"
+
+#: Merge.rc:129
+#: Merge.rc:221
+#: Merge.rc:381
+#, c-format
+msgid "Select &Font..."
+msgstr "Izberite &pisavo..."
+
+#: Merge.rc:130
+#: Merge.rc:222
+#: Merge.rc:382
+#, c-format
+msgid "Use Default F&ont"
+msgstr "Uporabite privzeto pi&savo"
+
+#: Merge.rc:132
+#: Merge.rc:224
+#: Merge.rc:403
+#, c-format
+msgid "&Toolbar"
+msgstr "&Orodna vrstica"
+
+#: Merge.rc:134
+#: Merge.rc:226
+#: Merge.rc:405
+#, c-format
+msgid "&None"
+msgstr "&Ni\xE8"
+
+#: Merge.rc:135
+#: Merge.rc:227
+#: Merge.rc:406
+#, c-format
+msgid "&Small"
+msgstr "&Male ikone"
+
+#: Merge.rc:136
+#: Merge.rc:228
+#: Merge.rc:407
+#, c-format
+msgid "&Big"
+msgstr "&Velike ikone"
+
+#: Merge.rc:138
+#: Merge.rc:230
+#: Merge.rc:409
+#, c-format
+msgid "&Status Bar"
+msgstr "&Statusna vrstica"
+
+#: Merge.rc:139
+#: Merge.rc:231
+#: Merge.rc:410
+#, c-format
+msgid "Ta&b Bar"
+msgstr "Ta&bulatorska vrstica"
+
+#: Merge.rc:141
+#: Merge.rc:234
+#: Merge.rc:414
+#, c-format
+msgid "&Language..."
+msgstr "&Jezik..."
+
+#: Merge.rc:143
+#: Merge.rc:255
+#: Merge.rc:436
+#, c-format
+msgid "&Tools"
+msgstr "&Orodja"
+
+#: Merge.rc:145
+#: Merge.rc:258
+#: Merge.rc:438
+#, c-format
+msgid "&Filters..."
+msgstr "&Filtri..."
+
+#: Merge.rc:146
+#: Merge.rc:259
+#: Merge.rc:439
+#, c-format
+msgid "&Generate Patch..."
+msgstr "&Generiraj paket..."
+
+#: Merge.rc:148
+#: Merge.rc:262
+#: Merge.rc:442
+#, c-format
+msgid "&Plugins"
+msgstr "&Raz\x9Airitve"
+
+#: Merge.rc:150
+#: Merge.rc:264
+#: Merge.rc:444
+#, c-format
+msgid "&Manual Unpacking"
+msgstr "&Ro\xE8no razpakiranje"
+
+#: Merge.rc:151
+#: Merge.rc:265
+#: Merge.rc:445
+#, c-format
+msgid "&Automatic Unpacking"
+msgstr "&Samodejno razpakiranje"
+
+#: Merge.rc:153
+#: Merge.rc:267
+#: Merge.rc:447
+#, c-format
+msgid "&Edit with Unpacker"
+msgstr "&Uredi v arhiverju"
+
+#: Merge.rc:155
+#: Merge.rc:269
+#: Merge.rc:454
+#, c-format
+msgid "&Reload plugins"
+msgstr "&Ponovno nalo\x9Ei raz\x9Airitve"
+
+#: Merge.rc:157
+#: Merge.rc:271
+#: Merge.rc:456
+#, c-format
+msgid "&Debug"
+msgstr "&Razhro\x9A\xE8evanje"
+
+#: Merge.rc:159
+#: Merge.rc:273
+#: Merge.rc:458
+#, c-format
+msgid "&Load Config..."
+msgstr "&Nalo\x9Ei nastavitev..."
+
+#: Merge.rc:160
+#: Merge.rc:274
+#: Merge.rc:459
+#, c-format
+msgid "&Reset Options"
+msgstr "&Ponastavi nastavitve"
+
+#: Merge.rc:162
+#: Merge.rc:276
+#: Merge.rc:461
+#, c-format
+msgid "&Window"
+msgstr "&Okna"
+
+#: Merge.rc:164
+#: Merge.rc:278
+#: Merge.rc:463
+#, c-format
+msgid "Cl&ose"
+msgstr "Z&apri"
+
+#: Merge.rc:165
+#: Merge.rc:279
+#: Merge.rc:464
+#, c-format
+msgid "Clo&se All"
+msgstr "Zapri &vse"
+
+#: Merge.rc:167
+#: Merge.rc:281
+#: Merge.rc:466
+#, c-format
+msgid "Change &Pane\tF6"
+msgstr "Zamenjaj &panel\tF6"
+
+#: Merge.rc:169
+#: Merge.rc:283
+#: Merge.rc:468
+#, c-format
+msgid "Tile &Horizontally"
+msgstr "Vodoravna &okna"
+
+#: Merge.rc:170
+#: Merge.rc:284
+#: Merge.rc:469
+#, c-format
+msgid "Tile &Vertically"
+msgstr "Navpi\xE8na &okna"
+
+#: Merge.rc:171
+#: Merge.rc:285
+#: Merge.rc:470
+#, c-format
+msgid "&Cascade"
+msgstr "Kaskadna &okna"
+
+#: Merge.rc:173
+#: Merge.rc:287
+#: Merge.rc:472
+#: Merge.rc:1890
+#, c-format
+msgid "&Help"
+msgstr "&Pomo\xE8"
+
+#: Merge.rc:175
+#: Merge.rc:289
+#: Merge.rc:474
+#, c-format
+msgid "&WinMerge Help\tF1"
+msgstr "&WinMerge pomo\xE8\tF1"
+
+#: Merge.rc:177
+#: Merge.rc:291
+#: Merge.rc:476
+#, c-format
+msgid "R&elease Notes"
+msgstr "&Opomba o izdaji"
+
+#: Merge.rc:178
+#: Merge.rc:292
+#: Merge.rc:477
+#, c-format
+msgid "&Translations"
+msgstr "&Prevodi..."
+
+#: Merge.rc:179
+#: Merge.rc:293
+#: Merge.rc:478
+#, c-format
+msgid "C&onfiguration"
+msgstr "&Nastavitve"
+
+#: Merge.rc:180
+#: Merge.rc:294
+#: Merge.rc:479
+#, c-format
+msgid "A&rchive Support disabled..."
+msgstr "&Podpora arhiviranju onemogo\xE8ena"
+
+#: Merge.rc:182
+#: Merge.rc:296
+#: Merge.rc:481
+#, c-format
+msgid "&GNU General Public License"
+msgstr "&GNU Javna licenca"
+
+#: Merge.rc:183
+#: Merge.rc:297
+#: Merge.rc:482
+#, c-format
+msgid "&About WinMerge..."
+msgstr "&O orodju WinMerge"
+
+#: Merge.rc:197
+#: Merge.rc:327
+#, c-format
+msgid "L&eft Read-only"
+msgstr "L&evo samo za branje"
+
+#: Merge.rc:198
+#: Merge.rc:328
+#, c-format
+msgid "Ri&ght Read-only"
+msgstr "De&sno samo za branje"
+
+#: Merge.rc:200
+#, c-format
+msgid "File En&coding"
+msgstr "&Kodiranje datoteke"
+
+#: Merge.rc:206
+#: Merge.rc:353
+#, c-format
+msgid "Select &All\tCtrl+A"
+msgstr "Ozna\xE8i &vse\tCtrl+A"
+
+#: Merge.rc:212
+#, c-format
+msgid "Show &Identical Items"
+msgstr "Prika\x9Ei &identiene predmete"
+
+#: Merge.rc:213
+#, c-format
+msgid "Show &Different Items"
+msgstr "Prika\x9Ei &razli\xE8ne predmete"
+
+#: Merge.rc:214
+#, c-format
+msgid "Show L&eft Unique Items"
+msgstr "Prika\x9Ei l&eve unikatne predmete"
+
+#: Merge.rc:215
+#, c-format
+msgid "Show Ri&ght Unique Items"
+msgstr "Prika\x9Ei d&esne unikatne predmete"
+
+#: Merge.rc:216
+#, c-format
+msgid "Show S&kipped Items"
+msgstr "Prika\x9Ei &preskoeene predmete"
+
+#: Merge.rc:217
+#, c-format
+msgid "S&how Binary Files"
+msgstr "Prika\x9Ei &binarne datoteke"
+
+#: Merge.rc:219
+#, c-format
+msgid "Show Hidd&en Items"
+msgstr "Prika\x9Ei skri&te predmete"
+
+#: Merge.rc:232
+#, c-format
+msgid "Compa&re Statistics"
+msgstr "Primerjaj &statistiko"
+
+#: Merge.rc:236
+#: Merge.rc:416
+#, c-format
+msgid "Refre&sh\tF5"
+msgstr "Osv&e\x9Ei\tF5"
+
+#: Merge.rc:237
+#, c-format
+msgid "&Refresh Selected\tCtrl+F5"
+msgstr "&Osve\x9Ei izbrano\tCtrl+F5"
+
+#: Merge.rc:239
+#: Merge.rc:418
+#, c-format
+msgid "&Merge"
+msgstr "Z&dru\x9Ei"
+
+#: Merge.rc:241
+#, c-format
+msgid "Co&mpare\tEnter"
+msgstr "Pr&imerjaj\tEnter"
+
+#: Merge.rc:243
+#: Merge.rc:420
+#, c-format
+msgid "&Next Difference\tAlt+Down"
+msgstr "&Naslednja razlika\tAlt+Down"
+
+#: Merge.rc:244
+#: Merge.rc:421
+#, c-format
+msgid "&Previous Difference\tAlt+Up"
+msgstr "&Predhodna razlika\tAlt+Up"
+
+#: Merge.rc:246
+#: Merge.rc:423
+#, c-format
+msgid "&First Difference\tAlt+Home"
+msgstr "&Prva razlika\tAlt+Home"
+
+#: Merge.rc:247
+#: Merge.rc:424
+#, c-format
+msgid "&Current Difference\tAlt+Enter"
+msgstr "&Trenutna razlika\tAlt+Enter"
+
+#: Merge.rc:248
+#: Merge.rc:425
+#, c-format
+msgid "&Last Difference\tAlt+End"
+msgstr "&Zadnja razlika\tAlt+End"
+
+#: Merge.rc:250
+#: Merge.rc:427
+#, c-format
+msgid "Copy to &Right\tAlt+Right"
+msgstr "Kopiraj &desno\tAlt+Right"
+
+#: Merge.rc:251
+#: Merge.rc:428
+#, c-format
+msgid "Copy to L&eft\tAlt+Left"
+msgstr "Kopiraj &levo\tAlt+Left"
+
+#: Merge.rc:253
+#, c-format
+msgid "&Delete\tDel"
+msgstr "&Izbri\x9Ai\tDel"
+
+#: Merge.rc:257
+#: Merge.rc:550
+#, c-format
+msgid "&Customize Columns..."
+msgstr "&Prilagodi stolpce..."
+
+#: Merge.rc:260
+#: Merge.rc:440
+#, c-format
+msgid "Generate &Report..."
+msgstr "Izdelaj &poro\xE8ilo"
+
+#: Merge.rc:311
+#, c-format
+msgid "&Save\tCtrl+S"
+msgstr "&Shrani\tCtrl+S"
+
+#: Merge.rc:312
+#, c-format
+msgid "Save &Left"
+msgstr "Shrani &levo datoteko"
+
+#: Merge.rc:314
+#: Merge.rc:319
+#, c-format
+msgid "&Save"
+msgstr "&Shrani"
+
+#: Merge.rc:315
+#: Merge.rc:320
+#, c-format
+msgid "Save &As..."
+msgstr "Shrani &kot..."
+
+#: Merge.rc:317
+#, c-format
+msgid "Save &Right"
+msgstr "Shrani &desno"
+
+#: Merge.rc:323
+#, c-format
+msgid "&Print..."
+msgstr "&Natisni"
+
+#: Merge.rc:324
+#, c-format
+msgid "Page Se&tup"
+msgstr "Nastavitev &strani"
+
+#: Merge.rc:325
+#, c-format
+msgid "Print Previe&w"
+msgstr "&Predogled tiskanja"
+
+#: Merge.rc:330
+#, c-format
+msgid "&Convert Line Endings to"
+msgstr "&Pretvori konec vrstice v"
+
+#: Merge.rc:332
+#, c-format
+msgid "&Windows (CRLF)"
+msgstr "&Okna (CRLF)"
+
+#: Merge.rc:333
+#, c-format
+msgid "&Unix (LF)"
+msgstr "&Unix (LF)"
+
+#: Merge.rc:334
+#, c-format
+msgid "&Mac (CR)"
+msgstr "&Mac (CR)"
+
+#: Merge.rc:337
+#, c-format
+msgid "&Merge Mode\tF9"
+msgstr "Zdru\x9Eevalni na\xE8in\tF9"
+
+#: Merge.rc:339
+#, c-format
+msgid "&File Encoding..."
+msgstr "De&kodiranje datoteke..."
+
+#: Merge.rc:345
+#, c-format
+msgid "&Undo\tCtrl+Z"
+msgstr "&Razveljavi\tCtrl+Z"
+
+#: Merge.rc:346
+#, c-format
+msgid "&Redo\tCtrl+Y"
+msgstr "&Uveljavi\tCtrl+Y"
+
+#: Merge.rc:348
+#, c-format
+msgid "Cu&t\tCtrl+X"
+msgstr "Od&re\x9Ei\tCtrl+X"
+
+#: Merge.rc:349
+#, c-format
+msgid "&Copy\tCtrl+C"
+msgstr "&Kopiraj\tCtrl+C"
+
+#: Merge.rc:350
+#, c-format
+msgid "&Paste\tCtrl+V"
+msgstr "&Prilepi\tCtrl+V"
+
+#: Merge.rc:352
+#, c-format
+msgid "Select Line &Difference\tF4"
+msgstr "Izberite vrstilno &razliko\tF4"
+
+#: Merge.rc:355
+#, c-format
+msgid "F&ind...\tCtrl+F"
+msgstr "&Najdi...\tCtrl+F"
+
+#: Merge.rc:356
+#, c-format
+msgid "Repla&ce...\tCtrl+H"
+msgstr "Zamen&jaj...\tCtrl+H"
+
+#: Merge.rc:358
+#, c-format
+msgid "&Scripts"
+msgstr "&Skripte"
+
+#: Merge.rc:360
+#: Merge.rc:2706
+#, c-format
+msgid "< Empty >"
+msgstr "< Prazno >"
+
+#: Merge.rc:363
+#, c-format
+msgid "Advanced"
+msgstr "Napredno"
+
+#: Merge.rc:365
+#, c-format
+msgid "&Copy With Line Numbers\tCtrl+Shift+C"
+msgstr "&Kopiraj z \x9Atevilkami vrstic\tCtrl+Shift+C"
+
+#: Merge.rc:368
+#, c-format
+msgid "&Bookmarks"
+msgstr "&Zaznamki"
+
+#: Merge.rc:370
+#, c-format
+msgid "&Toggle Bookmark\tCtrl+F2"
+msgstr "Zamenjaj zaznamke\tCtrl+F2"
+
+#: Merge.rc:371
+#, c-format
+msgid "&Next Bookmark\tF2"
+msgstr "&Naslednji zaznamek\tF2"
+
+#: Merge.rc:372
+#, c-format
+msgid "&Previous bookmark\tShift+F2"
+msgstr "&Prej\x9Anji zaznamek\tShift+F2"
+
+#: Merge.rc:373
+#, c-format
+msgid "&Clear All Bookmarks"
+msgstr "&Zbri\x9Ai vse zaznamke"
+
+#: Merge.rc:375
+#, c-format
+msgid "&Go To...\tCtrl+G"
+msgstr "Pojdi &na...\tCtrl+G"
+
+#: Merge.rc:383
+#, c-format
+msgid "&Zoom"
+msgstr "Po&ve\xE8aj"
+
+#: Merge.rc:385
+#, c-format
+msgid "Zoom &In\tCtrl++"
+msgstr "Po&ve\xE8aj\tCtrl++"
+
+#: Merge.rc:386
+#, c-format
+msgid "Zoom &Out\tCtrl+-"
+msgstr "Poman&j\x9Aaj\tCtrl+-"
+
+#. Zoom to normal
+#: Merge.rc:387
+#, c-format
+msgid "&Normal\tCtrl+*"
+msgstr "&Izvorna velikost\tCtrl+*"
+
+#: Merge.rc:389
+#, c-format
+msgid "Syntax Highlight"
+msgstr "Ozna\xE8evanje sintakse"
+
+#: Merge.rc:394
+#, c-format
+msgid "&Lock Panes"
+msgstr "Za&kleni panele"
+
+#: Merge.rc:395
+#, c-format
+msgid "&View Whitespace"
+msgstr "&Preglej prazne prostore"
+
+#: Merge.rc:396
+#, c-format
+msgid "Vie&w Line Differences"
+msgstr "Prika\x9Ei razl&ike vrstic"
+
+#: Merge.rc:397
+#, c-format
+msgid "View Line &Numbers"
+msgstr "Prika\x9Ei \x9Atevilke &vrstic"
+
+#: Merge.rc:398
+#, c-format
+msgid "View &Margins"
+msgstr "Prika\x9Ei &robove"
+
+#: Merge.rc:399
+#, c-format
+msgid "W&rap Lines"
+msgstr "Pr&elomi vrstice"
+
+#: Merge.rc:401
+#, c-format
+msgid "Sw&ap Panes"
+msgstr "Zam&enjaj panele"
+
+#: Merge.rc:411
+#, c-format
+msgid "Diff &Pane"
+msgstr "Panel &razlika"
+
+#: Merge.rc:412
+#, c-format
+msgid "Lo&cation Pane"
+msgstr "Panel &polo\x9Eaja"
+
+#: Merge.rc:430
+#, c-format
+msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
+msgstr "Kopiraj de&sno in nadaljuj..\tAlt+Ctrl+desno"
+
+#: Merge.rc:431
+#, c-format
+msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
+msgstr "Kopiraj le&vo in nadaljuj\tAlt+Ctrl+levo"
+
+#: Merge.rc:433
+#, c-format
+msgid "Copy &All to Right"
+msgstr "Kopiraj vse v des&no"
+
+#: Merge.rc:434
+#, c-format
+msgid "Cop&y All to Left"
+msgstr "Kopiraj vse v &lev&o"
+
+#: Merge.rc:449
+#, c-format
+msgid "&Prediffer"
+msgstr "&dodatki"
+
+#: Merge.rc:490
+#, c-format
+msgid "Comp&are"
+msgstr "Prime&rjaj"
+
+#: Merge.rc:491
+#, c-format
+msgid "Co&mpare Special"
+msgstr "Primer&jaj posebno"
+
+#: Merge.rc:493
+#, c-format
+msgid "&XML"
+msgstr "&XML"
+
+#: Merge.rc:498
+#, c-format
+msgid "&Left to Right"
+msgstr "&Iz leve na desno"
+
+#: Merge.rc:499
+#, c-format
+msgid "L&eft to..."
+msgstr "Z l&evo na..."
+
+#: Merge.rc:500
+#, c-format
+msgid "&Right to Left"
+msgstr "&Od Desne na levo"
+
+#: Merge.rc:501
+#, c-format
+msgid "R&ight to..."
+msgstr "Z d&esni na..."
+
+#: Merge.rc:503
+#, c-format
+msgid "&Move"
+msgstr "&Pre&makni"
+
+#: Merge.rc:505
+#, c-format
+msgid "&Left to..."
+msgstr "&Z levi na..."
+
+#: Merge.rc:506
+#, c-format
+msgid "&Right to..."
+msgstr "&Z desne na..."
+
+#: Merge.rc:508
+#, c-format
+msgid "&Delete"
+msgstr "&Izbri\x9Ai"
+
+#: Merge.rc:510
+#: Merge.rc:1127
+#: Merge.rc:1509
+#, c-format
+msgid "&Left"
+msgstr "&Levo"
+
+#: Merge.rc:511
+#: Merge.rc:1129
+#: Merge.rc:1512
+#, c-format
+msgid "&Right"
+msgstr "&Desno"
+
+#: Merge.rc:512
+#, c-format
+msgid "&Both"
+msgstr "&Oboje"
+
+#: Merge.rc:514
+#, c-format
+msgid "Re&name"
+msgstr "P&reimenuj"
+
+#: Merge.rc:515
+#, c-format
+msgid "&Hide Items"
+msgstr "&Skrij predmete"
+
+#: Merge.rc:517
+#, c-format
+msgid "&Open Left"
+msgstr "&Odpri levo"
+
+#: Merge.rc:523
+#, c-format
+msgid "O&pen Right"
+msgstr "Odpri desno"
+
+#: Merge.rc:530
+#, c-format
+msgid "Cop&y...
[truncated message content] |