You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(148) |
Oct
(84) |
Nov
(130) |
Dec
(121) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(89) |
Feb
(50) |
Mar
(81) |
Apr
(45) |
May
(42) |
Jun
(46) |
Jul
(40) |
Aug
(98) |
Sep
(80) |
Oct
(101) |
Nov
(128) |
Dec
(46) |
| 2008 |
Jan
(132) |
Feb
(117) |
Mar
(118) |
Apr
(112) |
May
(69) |
Jun
(140) |
Jul
(164) |
Aug
(159) |
Sep
(115) |
Oct
(65) |
Nov
(80) |
Dec
(128) |
| 2009 |
Jan
(145) |
Feb
(97) |
Mar
(118) |
Apr
(87) |
May
(96) |
Jun
(83) |
Jul
(50) |
Aug
(42) |
Sep
(18) |
Oct
(32) |
Nov
(12) |
Dec
(35) |
| 2010 |
Jan
(38) |
Feb
(8) |
Mar
(5) |
Apr
(19) |
May
(23) |
Jun
(39) |
Jul
(16) |
Aug
(4) |
Sep
(60) |
Oct
(100) |
Nov
(57) |
Dec
(43) |
| 2011 |
Jan
(25) |
Feb
(1) |
Mar
(3) |
Apr
|
May
(13) |
Jun
(19) |
Jul
|
Aug
(6) |
Sep
(5) |
Oct
(6) |
Nov
|
Dec
(1) |
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ge...@us...> - 2010-02-06 13:00:20
|
Revision: 7119
http://winmerge.svn.sourceforge.net/winmerge/?rev=7119&view=rev
Author: gerundt
Date: 2010-02-06 13:00:14 +0000 (Sat, 06 Feb 2010)
Log Message:
-----------
Fix small typo in Releasing.html developer file
Modified Paths:
--------------
trunk/Docs/Developers/Releasing.html
Modified: trunk/Docs/Developers/Releasing.html
===================================================================
--- trunk/Docs/Developers/Releasing.html 2010-02-06 12:35:23 UTC (rev 7118)
+++ trunk/Docs/Developers/Releasing.html 2010-02-06 13:00:14 UTC (rev 7119)
@@ -69,7 +69,7 @@
<ol>
<li>Executable and libraries build tools are documented in <a href="Compiling.html">Compiling.html</a></li>
- <li>Installer building is explained in <a href="readme-InnoSetup.html">readme-manual.html</a></li>
+ <li>Installer building is explained in <a href="readme-InnoSetup.html">readme-InnoSetup.html</a></li>
<li>Manual building is explained in <a href="readme-manual.html">readme-manual.html</a></li>
</ol>
@@ -101,7 +101,7 @@
<li>Build executables and libraries (see <a href="Compiling.html">Compiling
instructions</a>)</li>
<li>Build manual (see <a href="readme-manual.html">readme-manual.html</a>)</li>
- <li>Build installer (see <a href="readme-InnoSetup.html">readme-manual.html</a>)</li>
+ <li>Build installer (see <a href="readme-InnoSetup.html">readme-InnoSetup.html</a>)</li>
<li>Create binary distribution folder:
<ol><li>Copy executables and libraries to distribution folder</li>
<li>Copy manual to <code>Docs</code> -subfolder</li>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2010-02-01 14:25:03
|
Revision: 7117
http://winmerge.svn.sourceforge.net/winmerge/?rev=7117&view=rev
Author: sdottaka
Date: 2010-02-01 14:24:51 +0000 (Mon, 01 Feb 2010)
Log Message:
-----------
PATCH: [ 2669526 ] ViewColor
Bug fix in HTML report
Modified Paths:
--------------
trunk/Src/editlib/ccrystaltextview.cpp
Modified: trunk/Src/editlib/ccrystaltextview.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextview.cpp 2010-01-30 08:41:09 UTC (rev 7116)
+++ trunk/Src/editlib/ccrystaltextview.cpp 2010-02-01 14:24:51 UTC (rev 7117)
@@ -1709,6 +1709,8 @@
COLORINDEX_SELBKGND,
COLORINDEX_HIGHLIGHTBKGND1,
COLORINDEX_HIGHLIGHTBKGND2,
+ COLORINDEX_HIGHLIGHTBKGND3,
+ COLORINDEX_HIGHLIGHTBKGND4,
};
CString strStyles;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-01-30 08:41:16
|
Revision: 7116
http://winmerge.svn.sourceforge.net/winmerge/?rev=7116&view=rev
Author: gerundt
Date: 2010-01-30 08:41:09 +0000 (Sat, 30 Jan 2010)
Log Message:
-----------
PATCH: [ 2942365 ] Fix scewX64 VC project file
Modified Paths:
--------------
trunk/Externals/scew/win32/scewX64.vcproj
Modified: trunk/Externals/scew/win32/scewX64.vcproj
===================================================================
--- trunk/Externals/scew/win32/scewX64.vcproj 2010-01-21 19:42:51 UTC (rev 7115)
+++ trunk/Externals/scew/win32/scewX64.vcproj 2010-01-30 08:41:09 UTC (rev 7116)
@@ -1845,6 +1845,742 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\scew\element_attribute.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\scew\element_compare.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\scew\element_copy.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\scew\element_search.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\scew\error.c"
>
<FileConfiguration
@@ -2029,6 +2765,190 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\scew\list.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\scew\parser.c"
>
<FileConfiguration
@@ -2213,6 +3133,742 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\scew\printer.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\scew\reader.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\scew\reader_buffer.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\scew\reader_file.c"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Debug Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="XMLStatic Release Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Unicode|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Unicode|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="X64 Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\scew\str.c"
>
<FileConfiguration
@@ -2765,7 +4421,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\scew\xattribute.c"
+ RelativePath="..\scew\writer_buffer.c"
>
<FileConfiguration
Name="Release|Win32"
@@ -2949,7 +4605,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\scew\xerror.c"
+ RelativePath="..\scew\writer_file.c"
>
<FileConfiguration
Name="Release|Win32"
@@ -3133,7 +4789,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\scew\xhandler.c"
+ RelativePath="..\scew\xattribute.c"
>
<FileConfiguration
Name="Release|Win32"
@@ -3317,7 +4973,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\scew\xparser.c"
+ RelativePath="..\scew\xerror.c"
>
<FileConfiguration
Name="Release|Win32"
@@ -3501,7 +5157,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\scew\xprint.c"
+ RelativePath="..\scew\xparser.c"
>
<FileConfiguration
Name="Release|Win32"
@@ -3694,6 +5350,10 @@
>
</File>
<File
+ RelativePath="..\scew\bool.h"
+ >
+ </File>
+ <File
RelativePath="..\scew\element.h"
>
</File>
@@ -3702,10 +5362,34 @@
>
</File>
<File
+ RelativePath="..\scew\export.h"
+ >
+ </File>
+ <File
+ RelativePath="..\scew\list.h"
+ >
+ </File>
+ <File
RelativePath="..\scew\parser.h"
>
</File>
<File
+ RelativePath="..\scew\printer.h"
+ >
+ </File>
+ <File
+ RelativePath="..\scew\reader.h"
+ >
+ </File>
+ <File
+ RelativePath="..\scew\reader_buffer.h"
+ >
+ </File>
+ <File
+ RelativePath="..\scew\reader_file.h"
+ >
+ </File>
+ <File
RelativePath="..\scew\scew.h"
>
</File>
@@ -3726,27 +5410,27 @@
>
</File>
<File
- RelativePath="..\scew\xattribute.h"
+ RelativePath="..\scew\writer_buffer.h"
>
</File>
<File
- RelativePath="..\scew\xelement.h"
+ RelativePath="..\scew\writer_file.h"
>
</File>
<File
- RelativePath="..\scew\xerror.h"
+ RelativePath="..\scew\xattribute.h"
>
</File>
<File
- RelativePath="..\scew\xhandler.h"
+ RelativePath="..\scew\xelement.h"
>
</File>
<File
- RelativePath="..\scew\xparser.h"
+ RelativePath="..\scew\xerror.h"
>
</File>
<File
- RelativePath="..\scew\xprint.h"
+ RelativePath="..\scew\xparser.h"
>
</File>
<File
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-01-21 19:43:47
|
Revision: 7115
http://winmerge.svn.sourceforge.net/winmerge/?rev=7115&view=rev
Author: gerundt
Date: 2010-01-21 19:42:51 +0000 (Thu, 21 Jan 2010)
Log Message:
-----------
Web: Tweak detectLanguageFromBrowser() function from SimpleTranslate class
Modified Paths:
--------------
trunk/Web/engine/simpletranslate.inc
Modified: trunk/Web/engine/simpletranslate.inc
===================================================================
--- trunk/Web/engine/simpletranslate.inc 2010-01-19 19:33:51 UTC (rev 7114)
+++ trunk/Web/engine/simpletranslate.inc 2010-01-21 19:42:51 UTC (rev 7115)
@@ -338,17 +338,26 @@
* @return bool Detected?
*/
function detectLanguageFromBrowser() {
- if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
- $accepted_languages = split(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
- foreach ($accepted_languages as $accepted_language) { //for all accepted languages...
- $tmp = split(';', $accepted_language);
+ $acceptLanguageHeader = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
+ if (isset($acceptLanguageHeader) && is_string($acceptLanguageHeader) && !empty($acceptLanguageHeader)) { //if the "Accept-Language" header is set...
+ $acceptLanguageHeader = strtolower($acceptLanguageHeader);
+ $acceptLanguageHeader = str_replace(' ', '', $acceptLanguageHeader);
+ $acceptLanguageHeader = str_replace('q=', '', $acceptLanguageHeader);
+
+ $acceptedLanguages = explode(',', $acceptLanguageHeader);
+ foreach ($acceptedLanguages as $acceptedLanguage) { //for all accepted languages...
+ $tmp = explode(';', $acceptedLanguage);
- $lang_id = strtolower($tmp[0]);
- if ($this->existsLanguage($lang_id)) { //if the language exists...
- $this->_activelanguageid = $lang_id;
- $language = $this->_languages[$lang_id];
- $this->_translations = $language->getTranslations();
- return true;
+ if (isset($tmp[0]) && !empty($tmp[0])) { //if found (full) language ID...
+ $tmp2 = explode('-', $tmp[0]); //Split language and country ID, if exist!
+
+ $lang_id = strtolower($tmp2[0]);
+ if (array_key_exists($lang_id, $this->_languages)) { //if the language exists...
+ $this->_activelanguageid = $lang_id;
+ $language = $this->_languages[$lang_id];
+ $this->_translations = $language->getTranslations();
+ return true;
+ }
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-01-19 19:33:58
|
Revision: 7114
http://winmerge.svn.sourceforge.net/winmerge/?rev=7114&view=rev
Author: gerundt
Date: 2010-01-19 19:33:51 +0000 (Tue, 19 Jan 2010)
Log Message:
-----------
PATCH: [ 2934354 ] Final Slovenian translation for stable and unstable
Submitted by Filip Komar
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/Languages/Slovenian.po
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2010-01-19 19:30:46 UTC (rev 7113)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2010-01-19 19:33:51 UTC (rev 7114)
@@ -8,7 +8,7 @@
Translation updates:
- Dutch (#2804979)
- French (#2850842)
- - Slovenian (#2917796, #2932094)
+ - Slovenian (#2917796, #2932094, #2934354)
- Spanish (#2930734)
- Turkish (#2825132, #2827817)
- Ukrainian (#2817835)
Modified: branches/R2_12/Src/Languages/Slovenian.po
===================================================================
--- branches/R2_12/Src/Languages/Slovenian.po 2010-01-19 19:30:46 UTC (rev 7113)
+++ branches/R2_12/Src/Languages/Slovenian.po 2010-01-19 19:33:51 UTC (rev 7114)
@@ -13,7 +13,7 @@
"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: 2010-01-15 11:17+0100\n"
+"PO-Revision-Date: 2010-01-18 16:20+0100\n"
"Last-Translator: Filip Komar <fil...@gm...>\n"
"Language-Team: Slovenian <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -52,7 +52,7 @@
#: Merge.rc:75
#, c-format
msgid "&Select Line Difference"
-msgstr "&Izberi razlike vrstic"
+msgstr "&Izberi razliko vrstice"
#: Merge.rc:77
#, c-format
@@ -87,7 +87,7 @@
#: Merge.rc:589
#, c-format
msgid "&Goto..."
-msgstr "Pojdi &na..."
+msgstr "Pojdi &na ..."
#: Merge.rc:86
#, c-format
@@ -113,7 +113,7 @@
#: Merge.rc:539
#, c-format
msgid "&with..."
-msgstr "&z..."
+msgstr "&z ..."
#: Merge.rc:110
#: Merge.rc:191
@@ -134,28 +134,28 @@
#: Merge.rc:315
#, c-format
msgid "&Open...\tCtrl+O"
-msgstr "&Odpri...\tCtrl+O"
+msgstr "&Odpri ... \tCtrl+O"
#: Merge.rc:114
#: Merge.rc:195
#: Merge.rc:316
#, c-format
msgid "Op&en Conflict File..."
-msgstr "Od&pri konfliktno datoteko..."
+msgstr "Od&pri konfliktno datoteko ..."
#: Merge.rc:116
#: Merge.rc:197
#: Merge.rc:318
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
-msgstr "Odpri pro&jekt...\tCtrl+J"
+msgstr "Odpri pro&jekt ... \tCtrl+J"
#: Merge.rc:117
#: Merge.rc:198
#: Merge.rc:319
#, c-format
msgid "Sa&ve Project..."
-msgstr "S&hrani projekt..."
+msgstr "S&hrani projekt ..."
#: Merge.rc:119
#, c-format
@@ -181,7 +181,7 @@
#: Merge.rc:387
#, c-format
msgid "&Options..."
-msgstr "&Mo\x9Enosti..."
+msgstr "&Mo\x9Enosti ..."
#: Merge.rc:127
#: Merge.rc:213
@@ -195,7 +195,7 @@
#: Merge.rc:391
#, c-format
msgid "Select &Font..."
-msgstr "Izberite &pisavo..."
+msgstr "Izberite &pisavo ..."
#: Merge.rc:130
#: Merge.rc:229
@@ -216,7 +216,7 @@
#: Merge.rc:415
#, c-format
msgid "&None"
-msgstr "&Ni\xE8"
+msgstr "&Brez"
#: Merge.rc:135
#: Merge.rc:234
@@ -251,7 +251,7 @@
#: Merge.rc:424
#, c-format
msgid "&Language..."
-msgstr "&Jezik..."
+msgstr "&Jezik ..."
#: Merge.rc:143
#: Merge.rc:262
@@ -265,14 +265,14 @@
#: Merge.rc:448
#, c-format
msgid "&Filters..."
-msgstr "&Filtri..."
+msgstr "&Filtri ..."
#: Merge.rc:146
#: Merge.rc:266
#: Merge.rc:449
#, c-format
msgid "&Generate Patch..."
-msgstr "&Generiraj datoteko s popravki..."
+msgstr "&Generiraj datoteko s popravki ..."
#: Merge.rc:148
#: Merge.rc:269
@@ -286,7 +286,7 @@
#: Merge.rc:454
#, c-format
msgid "&List..."
-msgstr "&Seznam"
+msgstr "&Seznam ..."
#: Merge.rc:152
#: Merge.rc:273
@@ -328,14 +328,14 @@
#: Merge.rc:470
#, c-format
msgid "&Load Config..."
-msgstr "&Nalo\x9Ei nastavitev..."
+msgstr "&Nalo\x9Ei nastavitev ..."
#: Merge.rc:162
#: Merge.rc:283
#: Merge.rc:471
#, c-format
msgid "&Reset Options"
-msgstr "&Ponastavi nastavitve"
+msgstr "&Ponastavi mo\x9Enosti"
#: Merge.rc:164
#: Merge.rc:285
@@ -363,7 +363,7 @@
#: Merge.rc:478
#, c-format
msgid "Change &Pane\tF6"
-msgstr "Zamenjaj &panel\tF6"
+msgstr "Preklopi &okvirja\tF6"
#: Merge.rc:171
#: Merge.rc:292
@@ -413,7 +413,7 @@
#: Merge.rc:489
#, c-format
msgid "&Translations"
-msgstr "&Prevodi..."
+msgstr "&Prevodi"
#: Merge.rc:181
#: Merge.rc:302
@@ -427,7 +427,7 @@
#: Merge.rc:491
#, c-format
msgid "A&rchive Support disabled..."
-msgstr "&Podpora arhivskim datotekam onemogo\xE8ena"
+msgstr "&Podpora arhivskim datotekam onemogo\xE8ena ..."
#: Merge.rc:184
#: Merge.rc:305
@@ -441,7 +441,7 @@
#: Merge.rc:494
#, c-format
msgid "&About WinMerge..."
-msgstr "&O orodju WinMerge"
+msgstr "&O programu WinMerge ..."
#: Merge.rc:200
#: Merge.rc:337
@@ -458,7 +458,7 @@
#: Merge.rc:203
#, c-format
msgid "File En&coding"
-msgstr "&Kodiranje datoteke"
+msgstr "&Kodiranje datotek"
#: Merge.rc:209
#: Merge.rc:363
@@ -469,7 +469,7 @@
#: Merge.rc:215
#, c-format
msgid "Show &Identical Items"
-msgstr "Prika\x9Ei &identi\xE8ne predmete"
+msgstr "Prika\x9Ei &enake predmete"
#: Merge.rc:216
#, c-format
@@ -509,17 +509,17 @@
#: Merge.rc:225
#, c-format
msgid "E&xpand All Subfolders"
-msgstr "Ra&z\x9Airi vse mape"
+msgstr "Ra&z\x9Airi vse podmape"
#: Merge.rc:226
#, c-format
msgid "&Collapse All Subfolders"
-msgstr "S&kr\xE8i vse mape"
+msgstr "S&kr\xE8i vse podmape"
#: Merge.rc:239
#, c-format
msgid "Compa&re Statistics"
-msgstr "Primerjaj &statistiko"
+msgstr "&Statistika primerjave"
#: Merge.rc:243
#: Merge.rc:426
@@ -594,13 +594,13 @@
#: Merge.rc:562
#, c-format
msgid "&Customize Columns..."
-msgstr "&Prilagodi stolpce..."
+msgstr "&Prilagodi stolpce ..."
#: Merge.rc:267
#: Merge.rc:450
#, c-format
msgid "Generate &Report..."
-msgstr "Izdelaj &poro\xE8ilo"
+msgstr "Izdelaj &poro\xE8ilo ..."
#: Merge.rc:321
#, c-format
@@ -622,7 +622,7 @@
#: Merge.rc:330
#, c-format
msgid "Save &As..."
-msgstr "Shrani &kot..."
+msgstr "Shrani &kot ..."
#: Merge.rc:327
#, c-format
@@ -632,7 +632,7 @@
#: Merge.rc:333
#, c-format
msgid "&Print..."
-msgstr "&Natisni"
+msgstr "&Natisni ..."
#: Merge.rc:334
#, c-format
@@ -672,7 +672,7 @@
#: Merge.rc:349
#, c-format
msgid "&File Encoding..."
-msgstr "De&kodiranje datoteke..."
+msgstr "De&kodiranje datoteke ..."
#: Merge.rc:355
#, c-format
@@ -702,17 +702,17 @@
#: Merge.rc:362
#, c-format
msgid "Select Line &Difference\tF4"
-msgstr "Izberite vrstilno &razliko\tF4"
+msgstr "Izberi &razli\xE8na polja\tF4"
#: Merge.rc:365
#, c-format
msgid "F&ind...\tCtrl+F"
-msgstr "&Najdi...\tCtrl+F"
+msgstr "&Najdi ... \tCtrl+F"
#: Merge.rc:366
#, c-format
msgid "Repla&ce...\tCtrl+H"
-msgstr "Zamen&jaj...\tCtrl+H"
+msgstr "Zamen&jaj ... \tCtrl+H"
#: Merge.rc:368
#, c-format
@@ -763,7 +763,7 @@
#: Merge.rc:385
#, c-format
msgid "&Go To...\tCtrl+G"
-msgstr "Pojdi &na...\tCtrl+G"
+msgstr "Pojdi &na ... \tCtrl+G"
#: Merge.rc:393
#, c-format
@@ -794,12 +794,12 @@
#: Merge.rc:404
#, c-format
msgid "&Lock Panes"
-msgstr "Za&kleni panele"
+msgstr "Za&kleni okvirja"
#: Merge.rc:405
#, c-format
msgid "&View Whitespace"
-msgstr "&Preglej prazne prostore"
+msgstr "&Prika\x9Ei prazne znake"
#: Merge.rc:406
#, c-format
@@ -824,27 +824,27 @@
#: Merge.rc:411
#, c-format
msgid "Sw&ap Panes"
-msgstr "Zam&enjaj panele"
+msgstr "Zam&enjaj okvirja"
#: Merge.rc:421
#, c-format
msgid "Diff &Pane"
-msgstr "Panel &razlika"
+msgstr "Okvir &razlik"
#: Merge.rc:422
#, c-format
msgid "Lo&cation Pane"
-msgstr "Panel &polo\x9Eaja"
+msgstr "&Polo\x9Eajni okvir"
#: Merge.rc:440
#, c-format
msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
-msgstr "Kopiraj de&sno in nadaljuj..\tAlt+Ctrl+desno"
+msgstr "Kopiraj de&sno in nadaljuj\tAlt+Ctrl+desno"
#: Merge.rc:441
#, c-format
msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
-msgstr "Kopiraj le&vo in nadaljuj\tAlt+Ctrl+levo"
+msgstr "Kopiraj le&vo in nadaljuj\tAlt+Ctrl+levo"
#: Merge.rc:443
#, c-format
@@ -884,7 +884,7 @@
#: Merge.rc:511
#, c-format
msgid "L&eft to..."
-msgstr "Z l&evo na..."
+msgstr "Z l&evo na ..."
#: Merge.rc:512
#, c-format
@@ -894,7 +894,7 @@
#: Merge.rc:513
#, c-format
msgid "R&ight to..."
-msgstr "Z d&esni na..."
+msgstr "Z d&esni na ..."
#: Merge.rc:515
#, c-format
@@ -904,12 +904,12 @@
#: Merge.rc:517
#, c-format
msgid "&Left to..."
-msgstr "&Z levi na..."
+msgstr "&Z levi na ..."
#: Merge.rc:518
#, c-format
msgid "&Right to..."
-msgstr "&Z desne na..."
+msgstr "&Z desne na ..."
#: Merge.rc:520
#, c-format
@@ -921,14 +921,14 @@
#: Merge.rc:1517
#, c-format
msgid "&Left"
-msgstr "&Levo"
+msgstr "&levi okvir"
#: Merge.rc:523
#: Merge.rc:1137
#: Merge.rc:1520
#, c-format
msgid "&Right"
-msgstr "&Desno"
+msgstr "&desni okvir"
#: Merge.rc:524
#, c-format
@@ -988,22 +988,22 @@
#: Merge.rc:552
#, c-format
msgid "&Left... (%1 of %2)"
-msgstr "&Levo... (%1 od %2)"
+msgstr "&Levo ... (%1 od %2)"
#: Merge.rc:553
#, c-format
msgid "&Right... (%1 of %2)"
-msgstr "&Desno...(%1 od %2)"
+msgstr "&Desno ... (%1 od %2)"
#: Merge.rc:554
#, c-format
msgid "&Both... (%1 of %2)"
-msgstr "&Oba...(%1 od %2)"
+msgstr "&Oba ... (%1 od %2)"
#: Merge.rc:555
#, c-format
msgid "&Differences... (%1 of %2)"
-msgstr "&Razlike... (%1 od %2)"
+msgstr "&Razlike ... (%1 od %2)"
#: Merge.rc:558
#, c-format
@@ -1043,7 +1043,7 @@
#: Merge.rc:591
#, c-format
msgid "&No Moved Blocks"
-msgstr "Ne premikaj blokov"
+msgstr "&Brez premaknjenih blokov"
#: Merge.rc:592
#, c-format
@@ -1068,12 +1068,12 @@
#: Merge.rc:669
#, c-format
msgid "All rights reserved."
-msgstr "Vse pravice pridr\x9Eane"
+msgstr "Vse pravice pridr\x9Eane."
#: Merge.rc:670
#, c-format
msgid "Visit the WinMerge HomePage!"
-msgstr "Obi\x9A\xE8i doma\xE8o stran programa WinMerge"
+msgstr "Obi\x9A\xE8i doma\xE8o stran programa WinMerge!"
#: Merge.rc:673
#: Merge.rc:705
@@ -1090,7 +1090,7 @@
#: Merge.rc:1665
#, c-format
msgid "OK"
-msgstr "Vredu"
+msgstr "V redu"
#: Merge.rc:674
#, c-format
@@ -1106,7 +1106,7 @@
#: Merge.rc:1594
#, c-format
msgid "&Left:"
-msgstr "&Levo"
+msgstr "&levi okvir:"
#: Merge.rc:688
#: Merge.rc:749
@@ -1114,19 +1114,19 @@
#: Merge.rc:1019
#, c-format
msgid "&Browse..."
-msgstr "&Brskaj..."
+msgstr "&Brskaj ..."
#: Merge.rc:689
#: Merge.rc:1598
#, c-format
msgid "&Right:"
-msgstr "&Desni panel:"
+msgstr "&Desni okvir:"
#: Merge.rc:693
#: Merge.rc:1030
#, c-format
msgid "Bro&wse..."
-msgstr "&Brskaj..."
+msgstr "&Brskaj ..."
#: Merge.rc:694
#: Merge.rc:1602
@@ -1138,7 +1138,7 @@
#: Merge.rc:1604
#, c-format
msgid "Select..."
-msgstr "Iz&beri..."
+msgstr "Izberi ..."
#: Merge.rc:698
#, c-format
@@ -1148,7 +1148,7 @@
#: Merge.rc:701
#, c-format
msgid "&Select..."
-msgstr "&Izberi..."
+msgstr "&Izberi ..."
#: Merge.rc:702
#: Merge.rc:1605
@@ -1194,7 +1194,7 @@
#: Merge.rc:715
#, c-format
msgid "Visual SourceSafe"
-msgstr "Vizualni izvorna varnost"
+msgstr "Visual SourceSafe"
#: Merge.rc:720
#, c-format
@@ -1236,17 +1236,17 @@
#: Merge.rc:871
#, c-format
msgid "Save As..."
-msgstr "Shrani kot..."
+msgstr "Shrani kot ..."
#: Merge.rc:741
#, c-format
msgid "Versioning System"
-msgstr "Izbor programa:"
+msgstr "Versioning System"
#: Merge.rc:744
#, c-format
msgid "&Versioning System:"
-msgstr "&Izbor programa:"
+msgstr "&Versioning System:"
#: Merge.rc:747
#: Merge.rc:2065
@@ -1273,22 +1273,22 @@
#: Merge.rc:762
#, c-format
msgid "Cl&ose windows with ESC"
-msgstr "Zapri okno z tipko &ESC"
+msgstr "Zapri okna s tipko &ESC"
#: Merge.rc:764
#, c-format
msgid "&Automatically verify paths in Open-dialog"
-msgstr "&Samodejno preveri pot v odprtem dialogu"
+msgstr "&Samodejno preverjaj pot v odprtem dialogu"
#: Merge.rc:767
#, c-format
msgid "All&ow only one instance to run"
-msgstr "Dovoli &samo en primer za izvajanje"
+msgstr "Dovoli &samo en trenutno aktiven program za izvajanje"
#: Merge.rc:769
#, c-format
msgid "As&k when closing multiple windows"
-msgstr "&Upra\x9Aaj predno zapre\x9A ve\xE8kratna okna"
+msgstr "&Vpra\x9Aaj pred zapiranjem ve\xE8kratnih oken"
#: Merge.rc:771
#, c-format
@@ -1303,30 +1303,30 @@
#: Merge.rc:776
#, c-format
msgid "O&pen-dialog Auto-Completion:"
-msgstr "Odpri dialog samodejne &dovr\x9Aitve"
+msgstr "Samodejno &dopolnjevanje vrstice v Odprtem dialogu"
#: Merge.rc:779
#, c-format
msgid "Enable multiple compare windows for"
-msgstr "Omogo\xE8i ve\xE8kratno primerjanje oken za"
+msgstr "Omogo\xE8i ve\xE8kratna okna za primerjanje"
#: Merge.rc:781
#: Merge.rc:1617
#, c-format
msgid "&Folder compare"
-msgstr "Primerjava &map"
+msgstr "primerjavi &map"
#: Merge.rc:783
#: Merge.rc:1619
#, c-format
msgid "Fil&e compare"
-msgstr "Primerjva &datotek"
+msgstr "primerjavi &datotek"
#: Merge.rc:785
#, c-format
msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
msgstr ""
-"WinMerge omogo\xE8a skrivanje skupnih sporo\xE8ilnih okvirjev.\n"
+"WinMerge omogo\xE8a skrivanje skupnih sporo\xE8ilnih oken.\n"
"Pritisnite gumb Ponastavi, da bodo postala vsa sporo\xE8ilna okna vidna."
#: Merge.rc:787
@@ -1376,7 +1376,7 @@
#: Merge.rc:819
#, c-format
msgid "D&on't wrap end of file"
-msgstr "Ne prelomi konec datoteke"
+msgstr "&Po koncu datoteke ne nadaljuj na za\xE8etku"
#: Merge.rc:822
#, c-format
@@ -1412,7 +1412,7 @@
#: Merge.rc:849
#, c-format
msgid "&Don't wrap end of file"
-msgstr "&Brez preloma konca datoteke"
+msgstr "&Po koncu datoteke ne nadaljuj na za\xE8etku"
#: Merge.rc:852
#, c-format
@@ -1443,7 +1443,7 @@
#: Merge.rc:2187
#, c-format
msgid "Rational ClearCase"
-msgstr "Racionalno jasen primer"
+msgstr "Rational ClearCase"
#: Merge.rc:869
#, c-format
@@ -1548,7 +1548,7 @@
#: Merge.rc:960
#, c-format
msgid "Word Difference:"
-msgstr "Besedna razlika"
+msgstr "Besedne razlike:"
#: Merge.rc:967
#, c-format
@@ -1590,27 +1590,27 @@
#: Merge.rc:998
#, c-format
msgid "&Filter folder:"
-msgstr "&Filter mape:"
+msgstr "&Mapa filtrov:"
#: Merge.rc:1000
#, c-format
msgid "B&rowse..."
-msgstr "B&rskaj.."
+msgstr "B&rskaj ..."
#: Merge.rc:1001
#, c-format
msgid "Temporary files folder"
-msgstr "Za\xE8asna datote\xE8na mapa"
+msgstr "Mapa za za\xE8asne datoteke"
#: Merge.rc:1002
#, c-format
msgid "S&ystem's temp folder"
-msgstr "S&istemska za\xE8asna mapa:"
+msgstr "s&istemska mapa"
#: Merge.rc:1004
#, c-format
msgid "C&ustom folder:"
-msgstr "Mapa po meri"
+msgstr "mapa po meri"
#: Merge.rc:1007
#: Merge.rc:1023
@@ -1621,7 +1621,7 @@
#: Merge.rc:1013
#, c-format
msgid "Patch Generator"
-msgstr "Generator datotek s popravki..."
+msgstr "Generator datotek s popravki ..."
#: Merge.rc:1016
#, c-format
@@ -1666,7 +1666,7 @@
#: Merge.rc:1038
#, c-format
msgid "W&hitespaces"
-msgstr "&Praznine"
+msgstr "&Prazni znaki"
#: Merge.rc:1039
#, c-format
@@ -1706,7 +1706,7 @@
#: Merge.rc:1073
#, c-format
msgid "Display Columns"
-msgstr "Prika\x9Ei kolone"
+msgstr "Prika\x9Ei stolpce"
#: Merge.rc:1079
#, c-format
@@ -1757,12 +1757,12 @@
#: Merge.rc:1121
#, c-format
msgid "Comparing items..."
-msgstr "Primerjanje predmetov..."
+msgstr "Primerjanje predmetov ..."
#: Merge.rc:1122
#, c-format
msgid "Items compared:"
-msgstr "Predmeti primerjani:"
+msgstr "Primerjanih predmetov:"
#: Merge.rc:1123
#, c-format
@@ -1813,7 +1813,7 @@
#: Merge.rc:1153
#, c-format
msgid "Whitespace"
-msgstr "Presledki"
+msgstr "Prazen znak"
#: Merge.rc:1154
#, c-format
@@ -1838,12 +1838,12 @@
#: Merge.rc:1162
#, c-format
msgid "Ignore &case"
-msgstr "Zanemari &primere"
+msgstr "Zanemari &velikost znakov"
#: Merge.rc:1164
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
-msgstr "&Zanemari razli\xE8nost vrnitev oznak zaklju\xE8ka (Windows/Unix/Mac)"
+msgstr "&Prezri razli\xE8nost tipa znakov za zaklju\xE8ke vrstic (EOL)"
#: Merge.rc:1167
#, c-format
@@ -1853,12 +1853,12 @@
#: Merge.rc:1169
#, c-format
msgid "&Match similar lines"
-msgstr "&Ozna\xE8i enake vrstice"
+msgstr "&Ujemanje enakih vrstic"
#: Merge.rc:1171
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
-msgstr "&Zanemari razlike manj\x9Ae od 3 sekund"
+msgstr "&Zanemari \xE8asovne razlike manj\x9Ae od 3 sekund"
#: Merge.rc:1174
#, c-format
@@ -1868,12 +1868,12 @@
#: Merge.rc:1177
#, c-format
msgid "S&top after first difference"
-msgstr "&Ustavi na prvi razliki"
+msgstr "&Ustavi po prvi razliki"
#: Merge.rc:1180
#, c-format
msgid "Filter Comments"
-msgstr "Filtriraj komentarje"
+msgstr "Komentarji filtrov"
#: Merge.rc:1187
#: Merge.rc:1943
@@ -1894,7 +1894,7 @@
#: Merge.rc:1194
#, c-format
msgid "&Preserve original EOL chars"
-msgstr "Obdr\x9Ei izvorni na\xE8in znakov za konec vrstice (EOL)"
+msgstr "Obdr\x9Ei izvorni tip znakov za konec vrstice (EOL)"
#: Merge.rc:1196
#, c-format
@@ -1904,17 +1904,17 @@
#: Merge.rc:1197
#, c-format
msgid "&Tab size:"
-msgstr "&Velikost tabel"
+msgstr "&\x9Atevilo presledkov, ki jih tabulator nadomesti"
#: Merge.rc:1200
#, c-format
msgid "&Insert Tabs"
-msgstr "&Vstavi tabele"
+msgstr "&Vstavi tabulatorje"
#: Merge.rc:1202
#, c-format
msgid "Insert &Spaces"
-msgstr "&Vstavi presledeke"
+msgstr "&Vstavi presledke"
#: Merge.rc:1204
#, c-format
@@ -1924,17 +1924,17 @@
#: Merge.rc:1206
#, c-format
msgid "View line differences"
-msgstr "Poglej vrsti\xE8ne razlike"
+msgstr "Poglej vrsti\xE8ne razlike na"
#: Merge.rc:1208
#, c-format
msgid "&Character level"
-msgstr "&Zna\xE8ajski nivo"
+msgstr "&znakovnem nivoju"
#: Merge.rc:1210
#, c-format
msgid "&Word-level:"
-msgstr "&Nivo besede"
+msgstr "&besednem nivoju"
#: Merge.rc:1225
#, c-format
@@ -1949,22 +1949,22 @@
#: Merge.rc:1232
#, c-format
msgid "Install..."
-msgstr "Namesti..."
+msgstr "Namesti ..."
#: Merge.rc:1233
#, c-format
msgid "New..."
-msgstr "Nova..."
+msgstr "Nova ..."
#: Merge.rc:1234
#, c-format
msgid "Edit..."
-msgstr "Uredi..."
+msgstr "Uredi ..."
#: Merge.rc:1235
#, c-format
msgid "Delete..."
-msgstr "Izbri\x9Ai..."
+msgstr "Izbri\x9Ai ..."
#: Merge.rc:1241
#, c-format
@@ -2016,12 +2016,12 @@
#: Merge.rc:1268
#, c-format
msgid "Default Codepage"
-msgstr "Standardna kodna tabela"
+msgstr "Privzeta kodna tabela"
#: Merge.rc:1269
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
-msgstr "Izberi splo\x9Ano kodno tabelo ko se nalagajo non-Unicode datoteke:"
+msgstr "Izberite privzeto kodno tabelo za nalaganje ne-Unicode datotek:"
#: Merge.rc:1271
#, c-format
@@ -2030,7 +2030,7 @@
"need to restart session"
msgstr ""
"Zaznaj kodno tabelo za datoteke s kon\xE8nico: .html, .rc, .xml \n"
-"potreben je ponovni zagon seje"
+"(potreben je ponovni zagon seje)"
#: Merge.rc:1274
#, c-format
@@ -2055,7 +2055,7 @@
#: Merge.rc:1289
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
-msgstr "Ni mogo\xE8e zaznati 7-zip verzijo (ni name\x9A\xE8ena?)"
+msgstr "Nisem mogel zaznati 7-zip verzijo (ni name\x9A\xE8ena?)"
# Removed \n because of lack of space!
#: Merge.rc:1292
@@ -2063,12 +2063,14 @@
msgid ""
"Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n"
"essential components to be copied to the program directory for standalone operation."
-msgstr "Delo z arhivskimi datotekami zahteva program 7-Zip 3.11 ali njegovo novej\x9Ao razli\xE8ico name\x9A\xE8eno na va\x9Aem ra\xE8unalniku"
+msgstr ""
+"Delo z arhivskimi datotekami zahteva program 7-Zip 3.11 ali njegovo novej\x9Ao razli\xE8ico\n"
+"name\x9A\xE8eno na va\x9Aem ra\xE8unalniku ali kopijo nujnih komponent za samostojno delovanje."
#: Merge.rc:1294
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
-msgstr "Name\x9A\xE8eni morajo biti tudi prave raz\x9Airitve (Merge7z*.dll) na sistemski poti (PATH)."
+msgstr "Name\x9A\xE8ene morajo biti tudi primerne raz\x9Airitve vmesnika (Merge7z*.dll) na poti (PATH)."
#: Merge.rc:1296
#, c-format
@@ -2090,7 +2092,7 @@
"Plugin required\n"
"(dllbuild %04u)"
msgstr ""
-"Potreben vti\xE8nik\n"
+"Potrebna raz\x9Airitev\n"
"(dllbuild %04u)"
#: Merge.rc:1302
@@ -2102,23 +2104,23 @@
#: Merge.rc:1308
#, c-format
msgid "present"
-msgstr "Predstavlja"
+msgstr "trenutno"
#: Merge.rc:1306
#, c-format
msgid "Merge7z000U.dll"
-msgstr "Zdru\x9Ei 7z000U.dll"
+msgstr "Merge7z000U.dll"
#: Merge.rc:1309
#, c-format
msgid "7-Zip software installed on your computer:"
-msgstr "7-Zip programska oprema je name\x9A\xE8ena na ra\xE8unalniku:"
+msgstr "7-Zip programska oprema name\x9A\xE8ena na ra\xE8unalniku:"
#: Merge.rc:1311
#: Merge.rc:1316
#, c-format
msgid "none"
-msgstr "Ni\xE8"
+msgstr "Ni"
#: Merge.rc:1313
#, c-format
@@ -2133,7 +2135,7 @@
#: Merge.rc:1318
#, c-format
msgid "outdated"
-msgstr "Zastarelo"
+msgstr "zastarelo"
#: Merge.rc:1319
#, c-format
@@ -2157,22 +2159,22 @@
#: Merge.rc:1333
#, c-format
msgid "Options"
-msgstr "Opcije"
+msgstr "Mo\x9Enosti"
#: Merge.rc:1344
#, c-format
msgid " Categories"
-msgstr " Kategorije"
+msgstr "Kategorije"
#: Merge.rc:1346
#, c-format
msgid "Import..."
-msgstr "Uvozi..."
+msgstr "Uvozi ..."
#: Merge.rc:1347
#, c-format
msgid "Export..."
-msgstr "Izvozi..."
+msgstr "Izvozi ..."
#: Merge.rc:1355
#, c-format
@@ -2187,7 +2189,7 @@
#: Merge.rc:1357
#, c-format
msgid "Comments:"
-msgstr "Komentarji"
+msgstr "Komentarji:"
#: Merge.rc:1358
#, c-format
@@ -2197,12 +2199,12 @@
#: Merge.rc:1359
#, c-format
msgid "Operators:"
-msgstr "Operatorji"
+msgstr "Operatorji:"
#: Merge.rc:1360
#, c-format
msgid "Strings:"
-msgstr "Nizi"
+msgstr "Nizi:"
#: Merge.rc:1361
#, c-format
@@ -2230,7 +2232,7 @@
#: Merge.rc:1408
#, c-format
msgid "Bold"
-msgstr "Odebeljeno"
+msgstr "Krepko"
#: Merge.rc:1416
#, c-format
@@ -2240,7 +2242,7 @@
#: Merge.rc:1419
#, c-format
msgid "Report &File:"
-msgstr "Poro\xE8ilo &datoteke:"
+msgstr "Poro\xE8ilna &datoteka:"
#: Merge.rc:1422
#: Merge.rc:1596
@@ -2248,7 +2250,7 @@
#: Merge.rc:1627
#, c-format
msgid "Browse..."
-msgstr "Brskaj..."
+msgstr "Brskaj ..."
#: Merge.rc:1423
#, c-format
@@ -2258,12 +2260,12 @@
#: Merge.rc:1426
#, c-format
msgid "&Copy to Clipboard"
-msgstr "&Kopiraj v medpomnilnik"
+msgstr "&Kopiraj v odlo\x9Ei\x9A\xE8e"
#: Merge.rc:1434
#, c-format
msgid "Shared or Private Filter"
-msgstr "Skupni ali privatni filter"
+msgstr "Skupni ali zasebni filter"
#: Merge.rc:1437
#, c-format
@@ -2304,7 +2306,7 @@
#: Merge.rc:1457
#, c-format
msgid "&Use stand-alone 7-Zip if available"
-msgstr "&Uporabi standardni 7-zip \xE8e je razpolo\x9Eljiv"
+msgstr "&Uporabi samostojni 7-zip, \xE8e je razpolo\x9Eljiv"
#: Merge.rc:1460
#, c-format
@@ -2319,7 +2321,7 @@
#: Merge.rc:1470
#, c-format
msgid "Compare Statistics"
-msgstr "Preimerjaj statistiko"
+msgstr "Preimerjalna statistika"
#: Merge.rc:1473
#, c-format
@@ -2367,7 +2369,7 @@
#: Merge.rc:2335
#, c-format
msgid "Identical"
-msgstr "Identi\xE8no"
+msgstr "Enako"
#: Merge.rc:1502
#, c-format
@@ -2382,39 +2384,39 @@
#: Merge.rc:1516
#, c-format
msgid "Affects"
-msgstr "Spremembe"
+msgstr "Spremeni"
#: Merge.rc:1519
#: Merge.rc:1522
#, c-format
msgid "(Affects)"
-msgstr "(spremembe)"
+msgstr "(Spremeni)"
#: Merge.rc:1523
#, c-format
msgid "Select Codepage for"
-msgstr "Izberi kodno tabelo za"
+msgstr "Izberi kodno tabelo datoteke za"
#: Merge.rc:1524
#, c-format
msgid "&File Loading:"
-msgstr "&Nalaganje datoteke:"
+msgstr "&nalaganje:"
#: Merge.rc:1526
#: Merge.rc:1529
#, c-format
msgid "..."
-msgstr "..."
+msgstr " ..."
#: Merge.rc:1527
#, c-format
msgid "File &Saving:"
-msgstr "Shranjevanje &datoteke:"
+msgstr "&shranjevanje:"
#: Merge.rc:1530
#, c-format
msgid "&Use same codepage for both"
-msgstr "&Uporabi enako kodno tabelo za oba"
+msgstr "&Uporabi enako kodno tabelo za oboje"
#: Merge.rc:1533
#, c-format
@@ -2435,7 +2437,7 @@
#: Merge.rc:1542
#, c-format
msgid "Testing filter ..."
-msgstr "Testiranje filtra..."
+msgstr "Testiranje filtra ..."
#: Merge.rc:1544
#, c-format
@@ -2475,12 +2477,12 @@
#: Merge.rc:1566
#, c-format
msgid "Whitespace:"
-msgstr "Skriti znaki in razmaki:"
+msgstr "Prazen znak:"
#: Merge.rc:1567
#, c-format
msgid "Regular text:"
-msgstr "Stalno besedilo"
+msgstr "Navadno besedilo:"
#: Merge.rc:1568
#, c-format
@@ -2516,32 +2518,32 @@
#: Merge.rc:1951
#, c-format
msgid "Backup Files"
-msgstr "Varnostne datoteke"
+msgstr "Arhivske datoteke"
#: Merge.rc:1616
#, c-format
msgid "Create backup files in:"
-msgstr "Ustvari varnostne datoteke v:"
+msgstr "Ustvari arhivske datoteke v:"
#: Merge.rc:1621
#, c-format
msgid "Create backup files into:"
-msgstr "Ustvari varnostne datoteke v:"
+msgstr "Ustvari arhivske datoteke v:"
#: Merge.rc:1622
#, c-format
msgid "&Original file's folder"
-msgstr "&Izvorna datote\xE8na mapa"
+msgstr "&mapi izvorne datoteke"
#: Merge.rc:1624
#, c-format
msgid "&Global backup folder:"
-msgstr "&Globalna varnostna mapa:"
+msgstr "&globalni arhivski mapi:"
#: Merge.rc:1628
#, c-format
msgid "Backup filename:"
-msgstr "Naziv varnostne datoteke"
+msgstr "Naziv arhivske datoteke"
#: Merge.rc:1629
#, c-format
@@ -2623,12 +2625,12 @@
#: Merge.rc:1681
#, c-format
msgid "Folder compare"
-msgstr "Primerjava map"
+msgstr "primerjavi map"
#: Merge.rc:1682
#, c-format
msgid "Add &Shell menu to context menu"
-msgstr "Dodaj obstoje\xE8i meni k &raz\x9Airjenemu meniju"
+msgstr "Dodaj meni lupine k &raz\x9Airjenemu meniju"
#. StringFileInfo.Block
#: Merge.rc:1708
@@ -2756,7 +2758,7 @@
"Print Preview"
msgstr ""
"Prika\x9Ei vse strani\n"
-"Predogledled tiskanja"
+"Predogled tiskanja"
#: Merge.rc:1769
#, c-format
@@ -2805,12 +2807,12 @@
#: Merge.rc:1782
#, c-format
msgid "Project file successfully loaded."
-msgstr "Projektna datoteka uspe\x9Ano nalo\x9Eena"
+msgstr "Datoteka projekta uspe\x9Ano nalo\x9Eena."
#: Merge.rc:1783
#, c-format
msgid "Project file successfully saved."
-msgstr "Projektna datoteka uspe\x9Ano shranjena"
+msgstr "Datoteka projekta uspe\x9Ano shranjena."
#: Merge.rc:1784
#, c-format
@@ -2818,8 +2820,8 @@
"Save current paths and options to project file\n"
"Save Project File"
msgstr ""
-"Shrani izbrano pot in mo\x9Enosti v projektno datoteko\n"
-"Shrani projektno datoteko"
+"Shrani izbrano pot in mo\x9Enosti v datoteko projekta\n"
+"Shrani datoteko projekta"
#: Merge.rc:1789
#, c-format
@@ -2836,7 +2838,7 @@
"Quit the application; prompts to save documents\n"
"Exit"
msgstr ""
-"Zapri aplikacijo; opozori shranjevanje dokumentov\n"
+"Zapri aplikacijo; opozori na shranjevanje dokumentov\n"
"Izhod"
#: Merge.rc:1796
@@ -2865,8 +2867,8 @@
"Switch to the next window pane\n"
"Next Pane"
msgstr ""
-"Preklopi na naslednji okenski panel\n"
-"Naslednji panel"
+"Preklopi na naslednji okenski okvir\n"
+"Naslednji okvir"
#: Merge.rc:1817
#, c-format
@@ -2874,8 +2876,8 @@
"Switch back to the previous window pane\n"
"Previous Pane"
msgstr ""
-"Preklopi nazaj na predhodni okenski panel\n"
-"Predhodni panel"
+"Preklopi nazaj na predhodni okenski okvir\n"
+"Predhodni okvir"
#: Merge.rc:1823
#, c-format
@@ -2883,7 +2885,7 @@
"Arrange windows so they overlap\n"
"Cascade Windows"
msgstr ""
-"Razvrsti okna kaskadno, s prekrivanjem \n"
+"Razvrsti okna kaskadno, s prekrivanjem\n"
"Kaskadno"
#: Merge.rc:1824
@@ -2982,8 +2984,8 @@
"Redo the previously undone action\n"
"Redo (Ctrl+Y)"
msgstr ""
-"Ponovi prej\x9Anjo neizvedeno akcijo\n"
-"Ponovi(Ctrl+Y)"
+"Uveljavi razveljavljeno akcijo\n"
+"Uveljavi(Ctrl+Y)"
#: Merge.rc:1845
#, c-format
@@ -3009,8 +3011,8 @@
"Show or hide the tab bar\n"
"Toggle TabBar"
msgstr ""
-"Skrij ali prika\x9Ei tabulatorsko vrstico\n"
-"Tabulatorska vrstica"
+"Skrij ali prika\x9Ei vrstico z listi\xE8i\n"
+"Vrstica z listi\xE8i"
#: Merge.rc:1848
#, c-format
@@ -3018,8 +3020,8 @@
"Automatically resize panes\n"
"Lock Panes"
msgstr ""
-"Samodejno pove\xE8aj panel\n"
-"Zakleni panel"
+"Samodejno pove\xE8aj okvirje\n"
+"Zakleni okvirje"
#: Merge.rc:1854
#, c-format
@@ -3029,7 +3031,7 @@
#: Merge.rc:1855
#, c-format
msgid "Change the window position"
-msgstr "Spremeni pozicijo okena"
+msgstr "Spremeni pozicijo okna"
#: Merge.rc:1856
#, c-format
@@ -3054,7 +3056,7 @@
#: Merge.rc:1860
#, c-format
msgid "Close the active window and prompts to save the documents"
-msgstr "Zapri vsa aktivna okna in opozori na shranjevanje dokumenta"
+msgstr "Zapri aktivno okno in vpra\x9Aaj za shranjevanje dokumenta"
#: Merge.rc:1865
#, c-format
@@ -3064,7 +3066,7 @@
#: Merge.rc:1866
#, c-format
msgid "Activate Task List"
-msgstr "Aktivni list opravil"
+msgstr "Aktiviraj seznam opravil"
#: Merge.rc:1867
#, c-format
@@ -3077,7 +3079,7 @@
"Close print preview mode\n"
"Cancel Preview"
msgstr ""
-"Zapri mo\x9Enost predogleda tiskanja\n"
+"Zapri predogled tiskanja\n"
"Zapri predogled"
#: Merge.rc:1880
@@ -3097,7 +3099,7 @@
"\n"
"\n"
"WinMerge.Primerjava datotek\n"
-"WinMerge primerjava datoteke"
+"WinMerge primerjava datotek"
#: Merge.rc:1881
#, c-format
@@ -3116,12 +3118,12 @@
"\n"
"\n"
"WinMerge.Primerjava map\n"
-"WinMerge primerjalna mapa"
+"WinMerge primerjava map"
#: Merge.rc:1888
#, c-format
msgid "Preserve original EOL chars"
-msgstr "Obdr\x9Ei izvorne znake za konec vrstice (EOL)"
+msgstr "Obdr\x9Ei izvorni tip znakov za konec vrstice (EOL)"
#: Merge.rc:1895
#, c-format
@@ -3151,7 +3153,7 @@
#: Merge.rc:1915
#, c-format
msgid "&Ok"
-msgstr "&Vredu"
+msgstr "&V redu"
#: Merge.rc:1917
#, c-format
@@ -3216,7 +3218,7 @@
#: Merge.rc:1935
#, c-format
msgid "Don't ask this &question again."
-msgstr "Ne vpra\x9Aaj ve\xE8 tega."
+msgstr "Tega vpra\x9Aanja ne postavi ve\xE8."
#: Merge.rc:1945
#, c-format
@@ -3231,12 +3233,12 @@
#: Merge.rc:1948
#, c-format
msgid "Version Control"
-msgstr "Razli\xE8ica nadzora"
+msgstr "Version Control"
#: Merge.rc:1959
#, c-format
msgid "To:"
-msgstr "Do:"
+msgstr "Na:"
#: Merge.rc:1960
#, c-format
@@ -3281,17 +3283,17 @@
#: Merge.rc:1978
#, c-format
msgid "All message boxes are now displayed again."
-msgstr "Vsa sporo\xE8ilna okna so sedaj ponovno prikazana "
+msgstr "Vsa sporo\xE8ilna okna bodo sedaj ponovno prikazana "
#: Merge.rc:1979
#, c-format
msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted."
-msgstr "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted."
+msgstr "V trenutni seji primerjave so bile narejene spremembe nastavitev. Nekatere nastavitve ne bodo veljale dokler ne boste ponovno zagnali primerjave."
#: Merge.rc:1980
#, c-format
msgid "The selected font change will not be applied to any currently visible difference windows."
-msgstr "Ta izbrana sprememba pisave ne bo uporabljena na katerikoli vidni spremembi"
+msgstr "Izbrana sprememba pisave \x9Ae ne bo v veljavi na trenutno vidnem panelu razlik."
#: Merge.rc:1982
#, c-format
@@ -3300,9 +3302,10 @@
"\n"
"Please use values 1 - %1."
msgstr ""
-"Veli\xE8ina oznake ni v obsegu sprejemljivega v WinMerge .\n"
+"\x8Atevilo presledkov, ki jih tabulator nadomesti, ni v obsegu sprejemljivega\n"
+"za WinMerge .\n"
"\n"
-"Prosimo koristite vrednosti 1 - %1."
+"Prosimo, uporabite vrednosti 1 - %1."
#: Merge.rc:1984
#, c-format
@@ -3311,9 +3314,9 @@
"\n"
"Please re-start WinMerge after the reset."
msgstr ""
-"Ali ste prepri\xE8ani da \x9Eelite resetirati vse mo\x9Enosti WinMerge na privzete vrednosti?\n"
+"Ali ste prepri\xE8ani da \x9Eelite ponastaviti vse mo\x9Enosti WinMerge na privzete vrednosti?\n"
"\n"
-"Prosim ponovno za\x9Eenite WinMerge po ponastavitvi"
+"Prosimo, ponovno za\x9Eenite WinMerge po ponastavitvi."
#: Merge.rc:1990
#, c-format
@@ -3323,7 +3326,7 @@
#: Merge.rc:1991
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
-msgstr "Programi|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
+msgstr "Izvedljive datoteke|*.exe;*.bat;*.cmd|Vse datoteke (*.*)|*.*||"
#: Merge.rc:1992
#, c-format
@@ -3333,27 +3336,27 @@
#: Merge.rc:1993
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
-msgstr "Datoteke WinMerge projekta(*.WinMerge)|*.WinMerge||"
+msgstr "Datoteke WinMerge projektov (*.WinMerge)|*.WinMerge||"
#: Merge.rc:1995
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
-msgstr "Mo\x9Ene datoteke (*.ini)|*.ini|All Files (*.*)|*.*||"
+msgstr "Datoteke nastavitev (*.ini)|*.ini|Vse datoteke (*.*)|*.*||"
#: Merge.rc:2001
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
-msgstr "Besedilne datotke (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
+msgstr "Besedilne datoteke (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Vse datoteke (*.*)|*.*||"
#: Merge.rc:2002
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
-msgstr "HTML datoteke (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
+msgstr "HTML datoteke (*.htm,*.html)|*.htm;*.html|Vse datoteke (*.*)|*.*||"
#: Merge.rc:2003
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
-msgstr "XML datoteke (*.xml)|*.xml|All Files (*.*)|*.*||"
+msgstr "XML datoteke (*.xml)|*.xml|Vse datoteke (*.*)|*.*||"
#: Merge.rc:2009
#, c-format
@@ -3388,12 +3391,12 @@
#: Merge.rc:2020
#, c-format
msgid "Modified Date"
-msgstr "Datum spremembe"
+msgstr "Spremenjen datum"
#: Merge.rc:2021
#, c-format
msgid "Modified Date and Size"
-msgstr "Sprememba datuma in velikosti"
+msgstr "Spremenjen datum in velikost"
#: Merge.rc:2022
#, c-format
@@ -3430,12 +3433,12 @@
#: Merge.rc:2033
#, c-format
msgid "Select filename for new filter"
-msgstr "Izberi ime datoteke za nov filter"
+msgstr "Izberite ime datoteke za nov filter"
#: Merge.rc:2034
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
-msgstr "Datoteke filtrov (*.flt)|*.flt|Sve datoteke (*.*)|*.*||"
+msgstr "Datoteke filtrov (*.flt)|*.flt|Vse datoteke (*.*)|*.*||"
#: Merge.rc:2036
#, c-format
@@ -3445,9 +3448,9 @@
"Please copy file %1 to WinMerge/Filters -folder:\n"
"%2."
msgstr ""
-"Ne najdem filtra datoteke, datoteke predloge!\n"
+"Ne najdem datoteke predloge filtra!\n"
"\n"
-"Prosimo, kopirajte datoteko %1 v WinMerge/Filters -mapo:\n"
+"Prosimo, kopirajte datoteko %1 v \"WinMerge/Filters\" mapo:\n"
"%2."
#: Merge.rc:2038
@@ -3458,10 +3461,10 @@
"\n"
"Please make sure the folder exists and is writable."
msgstr ""
-"Ne morem kopirati filtra predloge datoteke v filter mapo:\n"
+"Ne morem kopirati datoteke filtra predloge v filter mapo:\n"
"%1\n"
"\n"
-"Preverite \xE8e mapa obstaja in je zapisljiva."
+"Prosim preverite, \xE8e mapa obstaja in je zapisljiva."
#: Merge.rc:2040
#, c-format
@@ -3472,7 +3475,7 @@
msgstr ""
"Uporabni\x9Aka filter datote\xE8na mapa ni definirana.\n"
"\n"
-"Prosim izberite filter mape v mo\x9Enosti/Sistem."
+"Prosim izberite filter mape v Mo\x9Enosti/Sistem."
#: Merge.rc:2042
#, c-format
@@ -3482,10 +3485,10 @@
"\n"
"Maybe the file is read-only?"
msgstr ""
-"Ni mogo\xE8e izbrisati filter datoteke:\n"
+"Ni morem izbrisati filter datoteke:\n"
"%1\n"
"\n"
-"Morda je datoteka za\x9A\xE8itena - samo za brananje."
+"Morda je datoteka za\x9A\xE8itena - samo za branje."
#: Merge.rc:2043
#, c-format
@@ -3522,7 +3525,7 @@
msgstr ""
"Filtri so bili posodobljeni. Ali \x9Eelite osve\x9Eiti vse odprte mape za primerjavo?\n"
"\n"
-"\xC8e jih ne \x9Eelite osve\x9Eiti sedaj, lahko izberete Ne in osve\x9Eite primerjave kasneje."
+"\xC8e jih ne \x9Eelite osve\x9Eiti sedaj, lahko izberete Ne in osve\x9Eite primerjave kasneje."
#: Merge.rc:2066
#, c-format
@@ -3542,7 +3545,7 @@
#: Merge.rc:2074
#, c-format
msgid "Untitled left"
-msgstr "Levi neimanovan"
+msgstr "Levi neimenovan"
#: Merge.rc:2075
#, c-format
@@ -3557,17 +3560,17 @@
#: Merge.rc:2077
#, c-format
msgid "Mine File"
-msgstr "Moja datoteka"
+msgstr "Va\x9Aa datoteka"
#: Merge.rc:2083
#, c-format
msgid "Scanning files..."
-msgstr "Prei\x9A\xE8i datoteko..."
+msgstr "Pregledovanje datoteko ..."
#: Merge.rc:2084
#, c-format
msgid "Opening selection"
-msgstr "Odpiranje izbranega"
+msgstr "Odpiranje izbora"
#: Merge.rc:2085
#, c-format
@@ -3592,37 +3595,37 @@
#: Merge.rc:2089
#, c-format
msgid "Copying files..."
-msgstr "Kopiranje datotek..."
+msgstr "Kopiranje datotek ..."
#: Merge.rc:2090
#, c-format
msgid "Deleting files..."
-msgstr "Brisanje datotek..."
+msgstr "Brisanje datotek ..."
#: Merge.rc:2091
#, c-format
msgid "Moving files..."
-msgstr "Premikanje datotek..."
+msgstr "Premikanje datotek ..."
#: Merge.rc:2092
#, c-format
msgid "Creating the report..."
-msgstr "Izdelava poro\xE8ila..."
+msgstr "Izdelava poro\xE8ila ..."
#: Merge.rc:2093
#, c-format
msgid "Undoing the last operation..."
-msgstr "Razveljavi zadnje dejanje..."
+msgstr "Razveljavi zadnje dejanje ..."
#: Merge.rc:2094
#, c-format
msgid "Redoing the previous operation..."
-msgstr "Ponovi zadnje dejanje..."
+msgstr "Ponovi zadnje dejanje ..."
#: Merge.rc:2100
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
-msgstr "Vr: %s St: %d/%d znak: %d/%d EOL: %s"
+msgstr "Vr: %s St: %d/%d znak: %d/%d EOL: %s"
#: Merge.rc:2101
#, c-format
@@ -3632,7 +3635,7 @@
#: Merge.rc:2102
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
-msgstr "Vr: %s St: %d/%d Zn: %d/%d"
+msgstr "Vr: %s St: %d/%d Zn: %d/%d"
#: Merge.rc:2103
#, c-format
@@ -3647,12 +3650,12 @@
#: Merge.rc:2105
#, c-format
msgid "%1 Differences Found"
-msgstr "Najdena razlika: %1"
+msgstr "%1 najdenih razlik"
#: Merge.rc:2106
#, c-format
msgid "1 Difference Found"
-msgstr "Najdena razlika: 1"
+msgstr "1 najdena razlika"
#. Abbreviation from "Read Only"
#: Merge.rc:2107
@@ -3668,12 +3671,12 @@
#: Merge.rc:2114
#, c-format
msgid "Items: %1"
-msgstr "Predmet: %1"
+msgstr "Predmetov: %1"
#: Merge.rc:2120
#, c-format
msgid "Select two existing folders or files to compare"
-msgstr "Izberi dve obstoje\xE8i mapi ali datoteki za primerjavo"
+msgstr "Izberite dve obstoje\xE8i mapi ali datoteki za primerjavo"
#: Merge.rc:2121
#, c-format
@@ -3683,32 +3686,32 @@
#: Merge.rc:2122
#, c-format
msgid "Select two folders or two files to compare."
-msgstr "Izberi dve mapi ali dve datoteki za primerjavo."
+msgstr "Izberite dve mapi ali dve datoteki za primerjavo."
#: Merge.rc:2123
#, c-format
msgid "Left path is invalid!"
-msgstr "Leva pot je neveljavna"
+msgstr "Leva pot je neveljavna!"
#: Merge.rc:2124
#, c-format
msgid "Right path is invalid!"
-msgstr "Desna pot je neveljavna"
+msgstr "Desna pot je neveljavna!"
#: Merge.rc:2125
#, c-format
msgid "Both paths are invalid!"
-msgstr "Obe poti sta neveljavni"
+msgstr "Obe poti sta neveljavni!"
#: Merge.rc:2126
#, c-format
msgid "Choose two files to enable unpacker selection."
-msgstr "Izberi dve datoteki, da boste omogo\xE8ili izbiro pretvornika"
+msgstr "Izberite dve datoteki, da boste omogo\xE8ili izbiro pretvornika."
#: Merge.rc:2127
#, c-format
msgid "Cannot compare file and folder!"
-msgstr "Ni mogo\xE8e primerjati datoteke in mape!"
+msgstr "Ne morem primerjati datoteke in mape!"
#: Merge.rc:2133
#, c-format
@@ -3728,7 +3731,7 @@
"\n"
"%2"
msgstr ""
-"Ni mogo\xE8e odpreti datoteke\n"
+"Ne morem odpreti datotek\n"
"%1\n"
"\n"
"%2"
@@ -3736,7 +3739,7 @@
#: Merge.rc:2136
#, c-format
msgid "Failed to parse conflict file."
-msgstr "Spodletelo raz\xE8lenjevanje konfliktne datoteke."
+msgstr "Ne morem raz\xE8leniti konfliktne datoteke."
#: Merge.rc:2137
#, c-format
@@ -3762,7 +3765,7 @@
#: Merge.rc:2145
#, c-format
msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
-msgstr "%1 je samo za branje. Ali \x9Eelite prepisati to datoteko? ( Ne za shranjevanje pod novim imenom)"
+msgstr "%1 je ozna\xE8ena samo za branje. Ali jo kljub temu \x9Eelite prepisati? ( Ne, za shranjevanje pod novim imenom)"
#: Merge.rc:2146
#, c-format
@@ -3801,7 +3804,7 @@
"%1\n"
"%2\n"
"Ali \x9Eelite:\n"
-"\t- uporabiti razli\xE8no ime datoteke (pritisnite Vredu)\n"
+"\t- uporabiti druga\xE8no ime datoteke (pritisnite V redu)\n"
"\t- preklicati trenutno operacijo (pritisnite Prekli\xE8i)?"
#: Merge.rc:2151
@@ -3845,7 +3848,7 @@
msgstr ""
"Druga aplikacija je posodobila datoteko\n"
"%1\n"
-"odkar jo je WinMerge zadnji\xE8 nalo\x9Eil.\n"
+"odkar jo je WinMerge nalo\x9Eil.\n"
"\n"
"Prepi\x9Ai spremenjeno datoteko?"
@@ -3856,7 +3859,7 @@
"is marked read-only. Would you like to override the read-only item?"
msgstr ""
"%1\n"
-"je ozna\xE8ena samo za branje. \x8Eelite prepisati predmet samo za branje?"
+"je ozna\xE8ena samo za branje. Ali jo kljub temu \x9Eelite prepisati?"
#: Merge.rc:2155
#, c-format
@@ -3901,14 +3904,14 @@
"\n"
"Refresh documents before continuing."
msgstr ""
-"Ni mogo\xE8e povezati razlik, kadar dokumenta nista sinhronizirana.\n"
+"Ne morem zdru\x9Eevati razlik, \xE8e dokumenta nista sinhronizirana.\n"
"\n"
-"Osve\x9Eite dokumente predno nadaljujete."
+"Prosim, osve\x9Eite dokumente pred nadaljujete."
#: Merge.rc:2170
#, c-format
msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)"
-msgstr "Navesti morate pot SourceSafe projekta \xE8e \x9Eelite nadaljevati (npr: $/MyProject)"
+msgstr "Navesti morate pot SourceSafe projekta \xE8e \x9Eelite nadaljevati (npr: $/MyProject)"
#: Merge.rc:2171
#, c-format
@@ -3918,22 +3921,22 @@
#: Merge.rc:2172
#, c-format
msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..."
-msgstr "Versioning System je vrnil napako medtem ko je posku\x9Aal dostopati do datoteke. Ni mogo\xE8e nadaljevati..."
+msgstr "Versioning System je vrnil napako medtem ko je posku\x9Aal dostopati do datoteke. Ni mogo\xE8e nadaljevati ..."
#: Merge.rc:2173
#, c-format
msgid "Error executing versioning system command."
-msgstr "Napaka pri izvr\x9Aevanju sistemskega ukaza."
+msgstr "Napaka pri izvr\x9Aevanju Versioning System ukaza."
#: Merge.rc:2174
#, c-format
msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
-msgstr "VSS delovna mapa in lokacija izbrane mape se ne ujemata. Nadaljujem?"
+msgstr "VSS delovna mapa in lokacija trenutne datoteke se ne ujemata. Nadaljujem?"
#: Merge.rc:2175
#, c-format
msgid "No VSS database(s) found!"
-msgstr "VSS podatkovna baza ni najdena!"
+msgstr "Ne morem najti VSS podatkovne baze!"
#: Merge.rc:2176
#, c-format
@@ -3947,7 +3950,7 @@
" Please, check config spec of used view.\n"
" Undo checkout operation?"
msgstr ""
-"Versioning System je vrnil napako med preverjanjem datoteke...\n"
+"Versioning System je vrnil napako med preverjanjem datoteke ...\n"
"Prosim preverite nastavitvene specifikacije uporabljenega pogleda.\n"
"Zavrzi pregledno operacijo?"
@@ -3964,7 +3967,7 @@
#: Merge.rc:2637
#, c-format
msgid "None"
-msgstr "Prazno"
+msgstr "Brez"
#: Merge.rc:2185
#, c-format
@@ -3979,12 +3982,12 @@
#: Merge.rc:2188
#, c-format
msgid "Break at whitespace"
-msgstr "Prelom na presledku"
+msgstr "Prelom na praznem znaku"
#: Merge.rc:2189
#, c-format
msgid "Break at whitespace or punctuation"
-msgstr "Prelom na presledku ali lo\xE8ilu"
+msgstr "Prelom na praznem znaku ali lo\xE8ilu"
#: Merge.rc:2195
#: Merge.rc:2197
@@ -4011,12 +4014,12 @@
#: Merge.rc:2201
#, c-format
msgid "Delete selected item(s) on both sides"
-msgstr "Izbri\x9Ai izran predmet na obeh straneh"
+msgstr "Izbri\x9Ai izbran(e) predmet(e) na obeh straneh"
#: Merge.rc:2202
#, c-format
msgid "Hide selected item(s) (on the fly filter)"
-msgstr "Skrij izbran predmet(e) (na filtru)"
+msgstr "Skrij izbran(e) predmet(e) (takoj\x9Anji filter)"
#: Merge.rc:2203
#, c-format
@@ -4047,25 +4050,25 @@
#: Merge.rc:2224
#, c-format
msgid "Left to... (%1)"
-msgstr "Leva do...(%1)"
+msgstr "Leva do ... (%1)"
#: Merge.rc:2209
#: Merge.rc:2225
#, c-format
msgid "Right to... (%1)"
-msgstr "Desna do...(%1)"
+msgstr "Desna do ... (%1)"
#: Merge.rc:2210
#: Merge.rc:2226
#, c-format
msgid "Left to... (%1 of %2)"
-msgstr "Leva do...(%1 od%2)"
+msgstr "Leva do ... (%1 od%2)"
#: Merge.rc:2211
#: Merge.rc:2227
#, c-format
msgid "Right to... (%1 of %2)"
-msgstr "Desna do...(%1 od%2)"
+msgstr "Desna do ... (%1 od%2)"
#: Merge.rc:2217
#, c-format
@@ -4100,27 +4103,27 @@
#: Merge.rc:2223
#, c-format
msgid "Select destination folder"
-msgstr "Izberi ciljno mapo"
+msgstr "Izberite ciljno mapo"
#: Merge.rc:2228
#, c-format
msgid "Left side - select destination folder:"
-msgstr "Leva stran- izberi ciljno mapo:"
+msgstr "Leva stran - izberite ciljno mapo:"
#: Merge.rc:2229
#, c-format
msgid "Right side - select destination folder:"
-msgstr "Desna stran- izberi ciljno mapo:"
+msgstr "Desna stran - izberite ciljno mapo:"
#: Merge.rc:2230
#, c-format
msgid "(%1 Files Affected)"
-msgstr "(%1 Datoteke simulirano)"
+msgstr "(%1 vpletenih datotek)"
#: Merge.rc:2231
#, c-format
msgid "(%1 of %2 Files Affected)"
-msgstr "(%1 of %2 datotek simulirano)"
+msgstr "(%1 of %2 vpletenih datotek)"
#: Merge.rc:2237
#, c-format
@@ -4129,10 +4132,9 @@
"\n"
"%1 ?"
msgstr ""
-"Ali ste prepri\xE8ani da \x9Eelite\n"
+"Ali ste prepri\xE8ani, da \x9Eelite brisati\n"
"\n"
-"%1\n"
-"Izbrisati?"
+"%1?"
#: Merge.rc:2238
#, c-format
@@ -4142,7 +4144,7 @@
#: Merge.rc:2239
#, c-format
msgid "Are you sure you want to copy %d items:"
-msgstr "Ali ste prepri\xE8ani da \x9Eelite kopirati %d predmetov:"
+msgstr "Ali ste prepri\xE8ani, da \x9Eelite kopirati %d predmetov:"
#: Merge.rc:2240
#, c-format
@@ -4155,13 +4157,13 @@
"\n"
"Please refresh the compare."
msgstr ""
-"Postopek zaustavljen!\n"
+"Postopek prekinjen!\n"
"\n"
-"Mapa z vsebino na disku je spremenjena , pot\n"
+"Vsebina map na disku je bila spremenjena , poti\n"
"%1\n"
-"do nje.\n"
+"do nje nisem na\x9Ael.\n"
"\n"
-"Osve\x9Eite primerjavo."
+"Prosim, osve\x9Eite primerjavo."
#: Merge.rc:2241
#, c-format
@@ -4191,7 +4193,7 @@
#: Merge.rc:2252
#, c-format
msgid "Open left file with ..."
-msgstr "Odpri levo datoteko z..."
+msgstr "Odpri levo datoteko z ..."
#: Merge.rc:2253
#, c-format
@@ -4376,12 +4378,12 @@
#: Merge.rc:2311
#, c-format
msgid "Left EOL"
-msgstr "Znake za konec vrstice (EOL) na levi"
+msgstr "Znake za konec vrstice (EOL) na levi datoteki"
#: Merge.rc:2312
#, c-format
msgid "Right EOL"
-msgstr "Znake za konec vrstice (EOL) na desni"
+msgstr "Znake za konec vrstice (EOL) na desni datoteki"
#: Merge.rc:2318
#, c-format
@@ -4396,7 +4398,7 @@
#: Merge.rc:2320
#, c-format
msgid "Ignored Diff."
-msgstr "Zanemari razlike"
+msgstr "Zanemarjene razlike."
#: Merge.rc:2321
#, c-format
@@ -4412,12 +4414,12 @@
#: Merge.rc:2328
#, c-format
msgid "Unable to compare files"
-msgstr "Ni mogo\xE8e primerjati datotek"
+msgstr "Nisem mogel primerjati datotek"
#: Merge.rc:2329
#, c-format
msgid "Item aborted"
-msgstr "Predmet prekinjen"
+msgstr "Pregled predmeta prekinjen"
#: Merge.rc:2330
#, c-format
@@ -4427,7 +4429,7 @@
#: Merge.rc:2331
#, c-format
msgid "Folder skipped"
-msgstr "Skraja\x9Aana map"
+msgstr "Presko\xE8ena mapa"
#: Merge.rc:2332
#, c-format
@@ -4442,7 +4444,7 @@
#: Merge.rc:2334
#, c-format
msgid "Binary files are identical"
-msgstr "Binarni datoteki sta identi\xE8ni"
+msgstr "Binarni datoteki sta enaki"
#: Merge.rc:2336
#, c-format
@@ -4487,7 +4489,7 @@
#: Merge.rc:2354
#, c-format
msgid "Elapsed time: %ld ms"
-msgstr "Potekel \xE8as: %ld ms"
+msgstr "Minilo je: %ld ms"
#: Merge.rc:2355
#, c-format
@@ -4507,22 +4509,22 @@
#: Merge.rc:2363
#, c-format
msgid "Subfolder name when subfolders are included."
-msgstr "Imena podmap kadar so vklju\xE8ene podmape"
+msgstr "Imena podmap ko so vklju\xE8ene podmape."
#: Merge.rc:2364
#, c-format
msgid "Comparison result, long form."
-msgstr "Rezultat primerjave, dolga oblika"
+msgstr "Rezultat primerjave, dolga oblika."
#: Merge.rc:2365
#, c-format
msgid "Left side modification date."
-msgstr "Leva stran datum spremembe"
+msgstr "Datum spremembe datoteke na levi strani."
#: Merge.rc:2366
#, c-format
msgid "Right side modification date."
-msgstr "Desna stran datum spremembe"
+msgstr "Datum spremembe datoteke na desni strani."
#: Merge.rc:2367
#, c-format
@@ -4532,32 +4534,32 @@
#: Merge.rc:2368
#, c-format
msgid "Left file size in bytes."
-msgstr "Velikost leve datoteke v bajtih"
+msgstr "Velikost leve datoteke v bajtih."
#: Merge.rc:2369
#, c-format
msgid "Right file size in bytes."
-msgstr "Velikost desne datoteke v bajtih"
+msgstr "Velikost desne datoteke v bajtih."
#: Merge.rc:2370
#, c-format
msgid "Left file size abbreviated."
-msgstr "Skraja\x9Aana leva datoteka"
+msgstr "Skraj\x9Aana velikost leve datoteke."
#: Merge.rc:2371
#, c-format
msgid "Right file size abbreviated."
-msgstr "Skraj\x9Aana desna datoteka"
+msgstr "Skraj\x9Aana velikost desne datoteke."
#: Merge.rc:2377
#, c-format
msgid "Left side creation time."
-msgstr "Leva stran datum nastanka"
+msgstr "Datum nastanka na levi strani."
#: Merge.rc:2378
#, c-format
msgid "Right side creation time."
-msgstr "Desna stran datum nastanka"
+msgstr "Datum nastanka na desni strani."
#: Merge.rc:2379
#, c-format
@@ -4572,52 +4574,52 @@
#: Merge.rc:2381
#, c-format
msgid "Right side file version, only for some filetypes."
-msgstr "Verzija desne datoteke, samo za nekatere datote\xE8ne tipe"
+msgstr "Verzija desne datoteke, samo za nekatere datote\xE8ne tipe."
#: Merge.rc:2382
#, c-format
msgid "Short comparison result."
-msgstr "Rezultat kratke primerjave"
+msgstr "Kratki rezultati primerjave."
#: Merge.rc:2383
#, c-format
msgid "Left side attributes."
-msgstr "Atributi leve strani"
+msgstr "Atributi leve strani."
#: Merge.rc:2384
#, c-format
msgid "Right side attributes."
-msgstr "Atributi desne strani"
+msgstr "Atributi desne strani."
#: Merge.rc:2385
#, c-format
msgid "Left side file EOL type"
-msgstr "Tip znakov za konec vrstice (EOL) na levi"
+msgstr "Tip znakov za konec vrstice (EOL) na levi datoteki"
#: Merge.rc:2386
#, c-format
msgid "Right side file EOL type"
-msgstr "Tip znakov za konec vrstice (EOL) na desni"
+msgstr "Tip znakov za konec vrstice (EOL) na desni datoteki"
#: Merge.rc:2392
#, c-format
msgid "Left side encoding."
-msgstr "Kodirana leva stran"
+msgstr "Kodna stran leve strani."
#: Merge.rc:2393
#, c-format
msgid "Right side encoding."
-msgstr "Kodirana desna stran"
+msgstr "Kodna stran desne strani."
#: Merge.rc:2394
#, c-format
msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
-msgstr "\x8Atevilo ignoriranih razlik v datoteki. Te razlike so ignorirane iz strani WinMerge-a in ne morejo biti zdru\x9Eene"
+msgstr "\x8Atevilo ignoriranih razlik v datoteki. Te razlike program WinMerge ignorira in ne morejo biti zdru\x9Eene."
#: Merge.rc:2395
#, c-format
msgid "Number of differences in file. This number does not include ignored differences."
-msgstr "\x8Atevilo razlik v datoteki. Ta \x9Atevilka na vsebuje ignoriranih razlik"
+msgstr "\x8Atevilo razlik v datoteki. Ta \x9Atevilka ne vsebuje ignoriranih razlik."
#: Merge.rc:2396
#, c-format
@@ -4632,12 +4634,12 @@
#: Merge.rc:2403
#, c-format
msgid "Comma-separated list"
-msgstr "Seznam lo\xE8en z vejico"
+msgstr "Seznam, lo\xE8en z vejicami"
#: Merge.rc:2404
#, c-format
msgid "Tab-separated list"
-msgstr "Seznam lo\xE8en s tabulatorjem"
+msgstr "Seznam, lo\xE8en s tabulatorji"
#: Merge.rc:2405
#, c-format
@@ -4652,7 +4654,7 @@
#: Merge.rc:2408
#, c-format
msgid "The report file already exists. Do you want to overwrite existing file?"
-msgstr "Poro\xE8ilo datoteke \x9Ee obstaja. Ali \x9Eelite prepisati obstoje\xE8o datoteko?"
+msgstr "Datoteka s poro\xE8ilom \x9Ee obstaja. Ali jo \x9Eelite prepisati?"
#: Merge.rc:2409
#, c-format
@@ -4671,12 +4673,12 @@
#: Merge.rc:2416
#, c-format
msgid "The same file is opened in both panels."
-msgstr "Ista datoteka je odprta v obeh panelih"
+msgstr "Ista datoteka je odprta v obeh okvirih"
#: Merge.rc:2417
#, c-format
msgid "The selected files are identical."
-msgstr "Izbrani datoteki sta identi\xE8ni."
+msgstr "Izbrani datoteki sta enaki."
#: Merge.rc:2418
#, c-format
@@ -4697,11 +4699,11 @@
"\n"
"Note: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences..' in the Compare tab of the options dialog (available under Edit/Options)."
msgstr ""
-"Te datoteka so razli\xE8ne pri prehodu v drugo vrsto.\n"
+"Ti datoteki imata razli\xE8na tipa znakov za zaklju\xE8ke vrstic (EOL).\n"
"\n"
-"Ali zadr\x9Eujete razli\xE8ne prehode v drugo vrsto?\n"
+"Ali \x9Eelite oba tipa obravnavati kot enaka za trenutno primerjavo?\n"
"\n"
-"Opomba: \xC8e \x9Eelite vedno obdr\x9Eati razli\xE8ne prehode v drugo vrsto, izberite 'Prezri razli\xE8nost prehoda v drugo vrsto...' v tabulatorskem primerjanju nastavitev dialoga (dostopno pod Urajanje/Nastavitve."
+"Opomba: \xC8e jih \x9Eelite vedno obravnavati kot enake, nastavite mo\x9Enost 'Prezri razli\xE8nost tipa znakov za zaklju\xE8ke vrstic (EOL)' na listi\xE8u Primerjave dialoga nastavitev (dostopen pod Urejanje/Nastavitve)."
#: Merge.rc:2421
#, c-format
@@ -4710,9 +4712,9 @@
" With the current options, they will be unified to the main type.\n"
" Do you want to change the options and preserve the different EOL ?"
msgstr ""
-"Zaklju\xE8ki vrstic (EOL) so razli\xE8nega tipa (Windows/Unix/Mac) v datoteki '%1'.\n"
+"Znaki za zaklju\xE8ke vrstic (EOL) so razli\xE8nega tipa (Windows/Unix/Mac) v datoteki '%1'.\n"
"S trenutno nastavitvijo, bodo poenotene v glavnem tipu.\n"
-"Ali \x9Eelite spremeniti nastavitev in ohraniti razli\xE8ne zaklju\xE8ke vrstic?"
+"Ali \x9Eelite spremeniti mo\x9Enosti in ohraniti razli\xE8ne zaklju\xE8ke vrstic?"
#: Merge.rc:2422
#, c-format
@@ -4722,12 +4724,12 @@
#: Merge.rc:2423
#, c-format
msgid "The selected folder is invalid."
-msgstr "Izbrana mapa je napa\xE8na"
+msgstr "Izbrana mapa ni veljavna."
#: Merge.rc:2424
#, c-format
msgid "Cannot open a binary file to editor."
-msgstr "Ni mogo\xE8e odpreti binarne datoteke v urejevalniku"
+msgstr "V urejevalniku ne morem odpreti binarne datoteke."
#: Merge.rc:2425
#, c-format
@@ -4738,11 +4740,11 @@
"%1\n"
"to the other side and open these folders?"
msgstr ""
-"Datoteka obstaja samo na drugi strani in je ni mogo\xE8e odpreti.\n"
+"Mapa obstaja samo na drugi strani, zato je ne morem odpreti.\n"
"\n"
-"ali \x9Eelite ustvariti ujemajo\xE8o mapo:\n"
+"Ali jo \x9Eelite ustvariti:\n"
"%1\n"
-"na drugi strani in odpreti to mapo?"
+"na drugi strani in jo odpreti?"
#: Merge.rc:2431
#, c-format
@@ -4751,14 +4753,14 @@
"Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n"
"Would you like to treat both files as being in the default windows codepage (recommended)?"
msgstr ""
-"Razli\xE8ne kodne tabele so najdene v levi (cp%d) in desni (cp%d) datoteki. \n"
-"Prikaz posamezne datoteke v svoji kodni tabeli bo povzro\xE8ilo bol\x9Ai prikaz toda zdru\x9Eevanje/kopiranje bo nevarno.\n"
-"Ali \x9Eelite tretirati,da sta obe datoteka vidna v isti privzeti windows kodni tabeli (priporo\xE8ljivo)?"
+"Leva (cp%d) in desna (cp%d) datoteka sta v razli\xE8nih kodnih tabelah. \n"
+"Prikaz posamezne datoteke v svoji kodni tabeli bo omogo\xE8ilo bolj\x9Ai prikaz, a zdru\x9Eevanje/kopiranje bo nevarno.\n"
+"Ali \x9Eelite obravnavati obe datoteki kot da sta v isti privzeti windows kodni tabeli (priporo\xE8ljivo)?"
#: Merge.rc:2432
#, c-format
msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
-msgstr "Opozorilo: Datoteki uporabljata razli\xE8ni kodiranji, levo=%s in desno=%s, in s spajanjem je mogo\xE8e izgubiti informacije"
+msgstr "Opozorilo: Datoteki uporabljata razli\xE8ni kodiranji, levo=%s in desno=%s. Zdru\x9Eevanje lahko povzro\xE8i izgubo informacije."
#: Merge.rc:2433
#, c-format
@@ -4783,17 +4785,17 @@
#: Merge.rc:2442
#, c-format
msgid "Line difference"
-msgstr "Vrsti\xE8ne razlike"
+msgstr "Razlika v vrstici"
#: Merge.rc:2448
#, c-format
msgid "Replaced %1 string(s)."
-msgstr "Zamenjan %1 znak(i)."
+msgstr "Zamenjan %1 niz(i)."
#: Merge.rc:2449
#, c-format
msgid "Cannot find string \"%s\""
-msgstr "Ni mogo\xE8e najti znaka \"%s\""
+msgstr "Ne morem najti niza \"%s\""
#: Merge.rc:2455
#, c-format
@@ -4808,12 +4810,12 @@
#: Merge.rc:2462
#, c-format
msgid "Location Pane"
-msgstr "Polo\x9Eaj panela"
+msgstr "Polo\x9Eajni okvir"
#: Merge.rc:2463
#, c-format
msgid "Diff Pane"
-msgstr "Razlika panelov"
+msgstr "Okvir razlik"
#: Merge.rc:2469
#, c-format
@@ -4838,7 +4840,7 @@
#: Merge.rc:2473
#, c-format
msgid "[%1 files selected]"
-msgstr "[%1 datoteka izbrana]"
+msgstr "[%1 izbranih datotek]"
#: Merge.rc:2474
#, c-format
@@ -4848,7 +4850,7 @@
#: Merge.rc:2475
#, c-format
msgid "Context"
-msgstr "Sobesedilo"
+msgstr "Pomen"
#: Merge.rc:2476
#, c-format
@@ -4858,7 +4860,7 @@
#: Merge.rc:2477
#, c-format
msgid "Could not write to file %1."
-msgstr "Ni mogo\xE8e zapisato v datoteko %1."
+msgstr "Ne morem pisati v datoteko %1."
#: Merge.rc:2478
#, c-format
@@ -4873,12 +4875,12 @@
#: Merge.rc:2480
#, c-format
msgid "Cannot create a patch file from binary files."
-msgstr "Ni mogo\xE8e izdelati datoteke s popravki iz binarnih datotek."
+msgstr "Iz binarnih datotek ne morem izdelati datoteke s popravki."
#: Merge.rc:2481
#, c-format
msgid "Cannot create a patch file from directories."
-msgstr "Ni mogo\xE8e izdelati datoteke s popravki iz iz map."
+msgstr "Iz map ne morem izdelati datoteke s popravki."
#: Merge.rc:2482
#, c-format
@@ -4909,8 +4911,8 @@
"See manual for more info about archive support and how to enable it."
msgstr ""
"Delo z arhivskimi datotekami ni omogo\xE8eno.\n"
-"Vse rabljene komponente (7-zip in/ali Merge7z*.dll) za arhivno podporo ni mogo\xE8e najti.\n"
-"Za ve\xE8 informacij poglejte v rubriko pomo\xE8 o podpori arhivskih datotek."
+"Vseh potrebnih komponent (7-zip in/ali Merge7z*.dll) za to ne morem najti.\n"
+"Za ve\xE8 informacij poglejte v rubriko pomo\xE8 o podpori arhivskih datotek in kako jo omogo\xE8iti."
#: Merge.rc:2490
#, c-format
@@ -4919,7 +4921,7 @@
"Note: 7-Zip integration is disabled in WinMerge settings."
msgstr ""
"\n"
-"Sporo\xE8ilo: 7-Zip intergracija je onemogo\xE8ena v WinMerge nastavitvah."
+"Sporo\xE8ilo: 7-Zip integracija je onemogo\xE8ena v WinMerge nastavitvah."
#: Merge.rc:2491
#, c-format
@@ -4928,17 +4930,17 @@
"Note: 7-Zip integration is restricted to standalone operation in WinMerge settings."
msgstr ""
"\n"
-"Sporo\xE8ilo: 7-Zip zdru\x9Eitev je omejena na samostojno operacijo v WinMerge nastavitvah."
+"Sporo\xE8ilo: 7-Zip funkcionalnost je omejena na samostojno operacijo v WinMerge nastavitvah."
#: Merge.rc:2492
#, c-format
msgid "Select file for export"
-msgstr "Izberi datoteko za izvoz"
+msgstr "Izberite datoteko za izvoz"
#: Merge.rc:2493
#, c-format
msgid "Select file for import"
-msgstr "Izberi datoteko za uvoz"
+msgstr "Izberite datoteko za uvoz"
#: Merge.rc:2494
#, c-format
@@ -4953,12 +4955,12 @@
#: Merge.rc:2496
#, c-format
msgid "Failed to import options from the file."
-msgstr "Ni mogo\xE8e uvoziti mo\x9Enosti iz datoteke"
+msgstr "Uva\x9Eanje mo\x9Enosti iz datoteke ni uspelo"
#: Merge.rc:2497
#, c-format
msgid "Failed to write options to the file."
-msgstr "Ni mogo\xE8e zapisati mo\x9Enosti v datoteko"
+msgstr "Izva\x9Eanje mo\x9Enosti v datoteko ni uspelo"
#: Merge.rc:2498
#, c-format
@@ -4979,17 +4981,17 @@
#: Merge.rc:2505
#, c-format
msgid "No match"
-msgstr "Ni enakosti"
+msgstr "Ni ujemanja"
#: Merge.rc:2506
#, c-format
msgid "Invalid regular expression"
-msgstr "Neveljaven reden izraz"
+msgstr "Neveljaven regularni izraz"
#: Merge.rc:2507
...
[truncated message content] |
|
From: <ge...@us...> - 2010-01-19 19:30:53
|
Revision: 7113
http://winmerge.svn.sourceforge.net/winmerge/?rev=7113&view=rev
Author: gerundt
Date: 2010-01-19 19:30:46 +0000 (Tue, 19 Jan 2010)
Log Message:
-----------
PATCH: [ 2934354 ] Final Slovenian translation for stable and unstable
Submitted by Filip Komar
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Translations/ShellExtension/Slovenian.po
trunk/Translations/WinMerge/Slovenian.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-01-16 08:21:28 UTC (rev 7112)
+++ trunk/Docs/Users/ChangeLog.txt 2010-01-19 19:30:46 UTC (rev 7113)
@@ -3,6 +3,10 @@
to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL:
http://winmerge.org/tracker/[tracker-id]
+WinMerge 2.13.12
+ Translation updates:
+ - Slovenian (#2934354)
+
WinMerge 2.13.11 - 2010-01-15 (r7111)
Write config log as UTF-8 file (r7057)
Update PCRE to version 8.00 (r7068)
Modified: trunk/Translations/ShellExtension/Slovenian.po
===================================================================
--- trunk/Translations/ShellExtension/Slovenian.po 2010-01-16 08:21:28 UTC (rev 7112)
+++ trunk/Translations/ShellExtension/Slovenian.po 2010-01-19 19:30:46 UTC (rev 7113)
@@ -12,7 +12,7 @@
"Project-Id-Version: WinMerge Shell Extension\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2010-01-14 19:36+0100\n"
+"PO-Revision-Date: 2010-01-18 15:47+0100\n"
"Last-Translator: Filip Komar <fil...@gm...>\n"
"Language-Team: Slovenian <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -68,7 +68,7 @@
#: ShellExtensionTemplate.rc:47
#, c-format
msgid "Compare..."
-msgstr "Primerjaj..."
+msgstr "Primerjaj ..."
#: ShellExtensionTemplate.rc:48
#, c-format
@@ -78,7 +78,7 @@
#: ShellExtensionTemplate.rc:49
#, c-format
msgid "Save this path. Select another path to compare with this path."
-msgstr "Shrani tole pot. Izberi \x9Ae drugo pot za primerjavo s tole."
+msgstr "Shrani tole pot. Izberite \x9Ae drugo pot za primerjavo s tole."
#: ShellExtensionTemplate.rc:50
#, c-format
Modified: trunk/Translations/WinMerge/Slovenian.po
===================================================================
--- trunk/Translations/WinMerge/Slovenian.po 2010-01-16 08:21:28 UTC (rev 7112)
+++ trunk/Translations/WinMerge/Slovenian.po 2010-01-19 19:30:46 UTC (rev 7113)
@@ -13,7 +13,7 @@
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2010-01-14 15:24+0100\n"
+"PO-Revision-Date: 2010-01-18 16:20+0100\n"
"Last-Translator: Filip Komar <fil...@gm...>\n"
"Language-Team: Slovenian <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -52,7 +52,7 @@
#: Merge.rc:75
#, c-format
msgid "&Select Line Difference"
-msgstr "&Izberi razlike vrstic"
+msgstr "&Izberi razliko vrstice"
#: Merge.rc:77
#, c-format
@@ -87,7 +87,7 @@
#: Merge.rc:593
#, c-format
msgid "&Goto..."
-msgstr "Pojdi &na..."
+msgstr "Pojdi &na ..."
#: Merge.rc:86
#, c-format
@@ -113,7 +113,7 @@
#: Merge.rc:543
#, c-format
msgid "&with..."
-msgstr "&z..."
+msgstr "&z ..."
#: Merge.rc:110
#: Merge.rc:194
@@ -134,28 +134,28 @@
#: Merge.rc:318
#, c-format
msgid "&Open...\tCtrl+O"
-msgstr "&Odpri...\tCtrl+O"
+msgstr "&Odpri ... \tCtrl+O"
#: Merge.rc:114
#: Merge.rc:198
#: Merge.rc:319
#, c-format
msgid "Op&en Conflict File..."
-msgstr "Od&pri konfliktno datoteko..."
+msgstr "Od&pri konfliktno datoteko ..."
#: Merge.rc:116
#: Merge.rc:200
#: Merge.rc:321
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
-msgstr "Odpri pro&jekt...\tCtrl+J"
+msgstr "Odpri pro&jekt ... \tCtrl+J"
#: Merge.rc:117
#: Merge.rc:201
#: Merge.rc:322
#, c-format
msgid "Sa&ve Project..."
-msgstr "S&hrani projekt..."
+msgstr "S&hrani projekt ..."
#: Merge.rc:119
#, c-format
@@ -181,7 +181,7 @@
#: Merge.rc:390
#, c-format
msgid "&Options..."
-msgstr "&Mo\x9Enosti..."
+msgstr "&Mo\x9Enosti ..."
#: Merge.rc:127
#: Merge.rc:216
@@ -195,7 +195,7 @@
#: Merge.rc:394
#, c-format
msgid "Select &Font..."
-msgstr "Izberite &pisavo..."
+msgstr "Izberite &pisavo ..."
#: Merge.rc:130
#: Merge.rc:232
@@ -216,7 +216,7 @@
#: Merge.rc:418
#, c-format
msgid "&None"
-msgstr "&Ni\xE8"
+msgstr "&Brez"
#: Merge.rc:135
#: Merge.rc:237
@@ -251,7 +251,7 @@
#: Merge.rc:427
#, c-format
msgid "&Language..."
-msgstr "&Jezik..."
+msgstr "&Jezik ..."
#: Merge.rc:143
#: Merge.rc:265
@@ -265,14 +265,14 @@
#: Merge.rc:451
#, c-format
msgid "&Filters..."
-msgstr "&Filtri..."
+msgstr "&Filtri ..."
#: Merge.rc:146
#: Merge.rc:269
#: Merge.rc:452
#, c-format
msgid "&Generate Patch..."
-msgstr "&Generiraj datoteko s popravki..."
+msgstr "&Generiraj datoteko s popravki ..."
#: Merge.rc:148
#: Merge.rc:272
@@ -286,7 +286,7 @@
#: Merge.rc:457
#, c-format
msgid "&List..."
-msgstr "&Seznam"
+msgstr "&Seznam ..."
#: Merge.rc:152
#, c-format
@@ -338,14 +338,14 @@
#: Merge.rc:473
#, c-format
msgid "&Load Config..."
-msgstr "&Nalo\x9Ei nastavitev..."
+msgstr "&Nalo\x9Ei nastavitev ..."
#: Merge.rc:165
#: Merge.rc:286
#: Merge.rc:474
#, c-format
msgid "&Reset Options"
-msgstr "&Ponastavi nastavitve"
+msgstr "&Ponastavi mo\x9Enosti"
#: Merge.rc:167
#: Merge.rc:288
@@ -373,7 +373,7 @@
#: Merge.rc:481
#, c-format
msgid "Change &Pane\tF6"
-msgstr "Zamenjaj &panel\tF6"
+msgstr "Preklopi &okvirja\tF6"
#: Merge.rc:174
#: Merge.rc:295
@@ -423,7 +423,7 @@
#: Merge.rc:492
#, c-format
msgid "&Translations"
-msgstr "&Prevodi..."
+msgstr "&Prevodi"
#: Merge.rc:184
#: Merge.rc:305
@@ -437,7 +437,7 @@
#: Merge.rc:494
#, c-format
msgid "A&rchive Support disabled..."
-msgstr "&Podpora arhivskim datotekam onemogo\xE8ena"
+msgstr "&Podpora arhivskim datotekam onemogo\xE8ena ..."
#: Merge.rc:187
#: Merge.rc:308
@@ -451,7 +451,7 @@
#: Merge.rc:497
#, c-format
msgid "&About WinMerge..."
-msgstr "&O orodju WinMerge"
+msgstr "&O programu WinMerge ..."
#: Merge.rc:203
#: Merge.rc:340
@@ -468,7 +468,7 @@
#: Merge.rc:206
#, c-format
msgid "File En&coding"
-msgstr "&Kodiranje datoteke"
+msgstr "&Kodiranje datotek"
#: Merge.rc:212
#: Merge.rc:366
@@ -479,7 +479,7 @@
#: Merge.rc:218
#, c-format
msgid "Show &Identical Items"
-msgstr "Prika\x9Ei &identi\xE8ne predmete"
+msgstr "Prika\x9Ei &enake predmete"
#: Merge.rc:219
#, c-format
@@ -519,17 +519,17 @@
#: Merge.rc:228
#, c-format
msgid "E&xpand All Subfolders"
-msgstr "Ra&z\x9Airi vse mape"
+msgstr "Ra&z\x9Airi vse podmape"
#: Merge.rc:229
#, c-format
msgid "&Collapse All Subfolders"
-msgstr "S&kr\xE8i vse mape"
+msgstr "S&kr\xE8i vse podmape"
#: Merge.rc:242
#, c-format
msgid "Compa&re Statistics"
-msgstr "Primerjaj &statistiko"
+msgstr "&Statistika primerjave"
#: Merge.rc:246
#: Merge.rc:429
@@ -604,13 +604,13 @@
#: Merge.rc:566
#, c-format
msgid "&Customize Columns..."
-msgstr "&Prilagodi stolpce..."
+msgstr "&Prilagodi stolpce ..."
#: Merge.rc:270
#: Merge.rc:453
#, c-format
msgid "Generate &Report..."
-msgstr "Izdelaj &poro\xE8ilo"
+msgstr "Izdelaj &poro\xE8ilo ..."
#: Merge.rc:324
#, c-format
@@ -632,7 +632,7 @@
#: Merge.rc:333
#, c-format
msgid "Save &As..."
-msgstr "Shrani &kot..."
+msgstr "Shrani &kot ..."
#: Merge.rc:330
#, c-format
@@ -642,7 +642,7 @@
#: Merge.rc:336
#, c-format
msgid "&Print..."
-msgstr "&Natisni"
+msgstr "&Natisni ..."
#: Merge.rc:337
#, c-format
@@ -682,7 +682,7 @@
#: Merge.rc:352
#, c-format
msgid "&File Encoding..."
-msgstr "De&kodiranje datoteke..."
+msgstr "De&kodiranje datoteke ..."
#: Merge.rc:358
#, c-format
@@ -712,17 +712,17 @@
#: Merge.rc:365
#, c-format
msgid "Select Line &Difference\tF4"
-msgstr "Izberite vrstilno &razliko\tF4"
+msgstr "Izberi &razli\xE8na polja\tF4"
#: Merge.rc:368
#, c-format
msgid "F&ind...\tCtrl+F"
-msgstr "&Najdi...\tCtrl+F"
+msgstr "&Najdi ... \tCtrl+F"
#: Merge.rc:369
#, c-format
msgid "Repla&ce...\tCtrl+H"
-msgstr "Zamen&jaj...\tCtrl+H"
+msgstr "Zamen&jaj ... \tCtrl+H"
#: Merge.rc:371
#, c-format
@@ -773,7 +773,7 @@
#: Merge.rc:388
#, c-format
msgid "&Go To...\tCtrl+G"
-msgstr "Pojdi &na...\tCtrl+G"
+msgstr "Pojdi &na ... \tCtrl+G"
#: Merge.rc:396
#, c-format
@@ -804,12 +804,12 @@
#: Merge.rc:407
#, c-format
msgid "&Lock Panes"
-msgstr "Za&kleni panele"
+msgstr "Za&kleni okvirja"
#: Merge.rc:408
#, c-format
msgid "&View Whitespace"
-msgstr "&Preglej prazne prostore"
+msgstr "&Prika\x9Ei prazne znake"
#: Merge.rc:409
#, c-format
@@ -834,27 +834,27 @@
#: Merge.rc:414
#, c-format
msgid "Sw&ap Panes"
-msgstr "Zam&enjaj panele"
+msgstr "Zam&enjaj okvirja"
#: Merge.rc:424
#, c-format
msgid "Diff &Pane"
-msgstr "Panel &razlik"
+msgstr "Okvir &razlik"
#: Merge.rc:425
#, c-format
msgid "Lo&cation Pane"
-msgstr "Panel &polo\x9Eaja"
+msgstr "&Polo\x9Eajni okvir"
#: Merge.rc:443
#, c-format
msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
-msgstr "Kopiraj de&sno in nadaljuj..\tAlt+Ctrl+desno"
+msgstr "Kopiraj de&sno in nadaljuj\tAlt+Ctrl+desno"
#: Merge.rc:444
#, c-format
msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
-msgstr "Kopiraj le&vo in nadaljuj\tAlt+Ctrl+levo"
+msgstr "Kopiraj le&vo in nadaljuj\tAlt+Ctrl+levo"
#: Merge.rc:446
#, c-format
@@ -899,7 +899,7 @@
#: Merge.rc:515
#, c-format
msgid "L&eft to..."
-msgstr "Z l&evo na..."
+msgstr "Z l&evo na ..."
#: Merge.rc:516
#, c-format
@@ -909,7 +909,7 @@
#: Merge.rc:517
#, c-format
msgid "R&ight to..."
-msgstr "Z d&esni na..."
+msgstr "Z d&esni na ..."
#: Merge.rc:519
#, c-format
@@ -919,12 +919,12 @@
#: Merge.rc:521
#, c-format
msgid "&Left to..."
-msgstr "&Z levi na..."
+msgstr "&Z levi na ..."
#: Merge.rc:522
#, c-format
msgid "&Right to..."
-msgstr "&Z desne na..."
+msgstr "&Z desne na ..."
#: Merge.rc:524
#, c-format
@@ -936,14 +936,14 @@
#: Merge.rc:1514
#, c-format
msgid "&Left"
-msgstr "&Levo"
+msgstr "&levi okvir"
#: Merge.rc:527
#: Merge.rc:1149
#: Merge.rc:1517
#, c-format
msgid "&Right"
-msgstr "&Desno"
+msgstr "&desni okvir"
#: Merge.rc:528
#, c-format
@@ -1003,22 +1003,22 @@
#: Merge.rc:556
#, c-format
msgid "&Left... (%1 of %2)"
-msgstr "&Levo... (%1 od %2)"
+msgstr "&Levo ... (%1 od %2)"
#: Merge.rc:557
#, c-format
msgid "&Right... (%1 of %2)"
-msgstr "&Desno...(%1 od %2)"
+msgstr "&Desno ... (%1 od %2)"
#: Merge.rc:558
#, c-format
msgid "&Both... (%1 of %2)"
-msgstr "&Oba...(%1 od %2)"
+msgstr "&Oba ... (%1 od %2)"
#: Merge.rc:559
#, c-format
msgid "&Differences... (%1 of %2)"
-msgstr "&Razlike... (%1 od %2)"
+msgstr "&Razlike ... (%1 od %2)"
#: Merge.rc:562
#, c-format
@@ -1058,7 +1058,7 @@
#: Merge.rc:595
#, c-format
msgid "&No Moved Blocks"
-msgstr "Ne premikaj blokov"
+msgstr "&Brez premaknjenih blokov"
#: Merge.rc:596
#, c-format
@@ -1083,12 +1083,12 @@
#: Merge.rc:675
#, c-format
msgid "All rights reserved."
-msgstr "Vse pravice pridr\x9Eane"
+msgstr "Vse pravice pridr\x9Eane."
#: Merge.rc:676
#, c-format
msgid "Visit the WinMerge HomePage!"
-msgstr "Obi\x9A\xE8i doma\xE8o stran programa WinMerge"
+msgstr "Obi\x9A\xE8i doma\xE8o stran programa WinMerge!"
#: Merge.rc:679
#: Merge.rc:711
@@ -1105,7 +1105,7 @@
#: Merge.rc:1662
#, c-format
msgid "OK"
-msgstr "Vredu"
+msgstr "V redu"
#: Merge.rc:680
#, c-format
@@ -1121,7 +1121,7 @@
#: Merge.rc:1591
#, c-format
msgid "&Left:"
-msgstr "&Levo"
+msgstr "&Levi okvir:"
#: Merge.rc:694
#: Merge.rc:755
@@ -1129,19 +1129,19 @@
#: Merge.rc:1031
#, c-format
msgid "&Browse..."
-msgstr "&Brskaj..."
+msgstr "&Brskaj ..."
#: Merge.rc:695
#: Merge.rc:1595
#, c-format
msgid "&Right:"
-msgstr "&Desni panel:"
+msgstr "&Desni okvir:"
#: Merge.rc:699
#: Merge.rc:1042
#, c-format
msgid "Bro&wse..."
-msgstr "&Brskaj..."
+msgstr "&Brskaj ..."
#: Merge.rc:700
#: Merge.rc:1599
@@ -1153,7 +1153,7 @@
#: Merge.rc:1601
#, c-format
msgid "Select..."
-msgstr "Iz&beri..."
+msgstr "Izberi ..."
#: Merge.rc:704
#, c-format
@@ -1163,7 +1163,7 @@
#: Merge.rc:707
#, c-format
msgid "&Select..."
-msgstr "&Izberi..."
+msgstr "&Izberi ..."
#: Merge.rc:708
#: Merge.rc:1602
@@ -1209,7 +1209,7 @@
#: Merge.rc:721
#, c-format
msgid "Visual SourceSafe"
-msgstr "Vizualni izvorna varnost"
+msgstr "Visual SourceSafe"
#: Merge.rc:726
#, c-format
@@ -1251,17 +1251,17 @@
#: Merge.rc:877
#, c-format
msgid "Save As..."
-msgstr "Shrani kot..."
+msgstr "Shrani kot ..."
#: Merge.rc:747
#, c-format
msgid "Versioning System"
-msgstr "Izbor programa:"
+msgstr "Versioning System"
#: Merge.rc:750
#, c-format
msgid "&Versioning System:"
-msgstr "&Izbor programa:"
+msgstr "&Versioning System:"
#: Merge.rc:753
#: Merge.rc:2083
@@ -1289,22 +1289,22 @@
#: Merge.rc:768
#, c-format
msgid "Cl&ose windows with ESC"
-msgstr "Zapri okno z tipko &ESC"
+msgstr "Zapri okna s tipko &ESC"
#: Merge.rc:770
#, c-format
msgid "&Automatically verify paths in Open-dialog"
-msgstr "&Samodejno preveri pot v odprtem dialogu"
+msgstr "&Samodejno preverjaj pot v odprtem dialogu"
#: Merge.rc:773
#, c-format
msgid "All&ow only one instance to run"
-msgstr "Dovoli &samo en primer za izvajanje"
+msgstr "Dovoli &samo en trenutno aktiven program za izvajanje"
#: Merge.rc:775
#, c-format
msgid "As&k when closing multiple windows"
-msgstr "&Upra\x9Aaj predno zapre\x9A ve\xE8kratna okna"
+msgstr "&Vpra\x9Aaj pred zapiranjem ve\xE8kratnih oken"
#: Merge.rc:777
#, c-format
@@ -1319,30 +1319,30 @@
#: Merge.rc:782
#, c-format
msgid "O&pen-dialog Auto-Completion:"
-msgstr "Odpri dialog samodejne &dovr\x9Aitve"
+msgstr "Samodejno &dopolnjevanje vrstice v Odprtem dialogu"
#: Merge.rc:785
#, c-format
msgid "Enable multiple compare windows for"
-msgstr "Omogo\xE8i ve\xE8kratno primerjanje oken za"
+msgstr "Omogo\xE8i ve\xE8kratna okna za primerjanje"
#: Merge.rc:787
#: Merge.rc:1614
#, c-format
msgid "&Folder compare"
-msgstr "Primerjava &map"
+msgstr "primerjavi &map"
#: Merge.rc:789
#: Merge.rc:1616
#, c-format
msgid "Fil&e compare"
-msgstr "Primerjva &datotek"
+msgstr "primerjavi &datotek"
#: Merge.rc:791
#, c-format
msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
msgstr ""
-"WinMerge omogo\xE8a skrivanje skupnih sporo\xE8ilnih okvirjev.\n"
+"WinMerge omogo\xE8a skrivanje skupnih sporo\xE8ilnih oken.\n"
"Pritisnite gumb Ponastavi, da bodo postala vsa sporo\xE8ilna okna vidna."
#: Merge.rc:793
@@ -1392,7 +1392,7 @@
#: Merge.rc:825
#, c-format
msgid "D&on't wrap end of file"
-msgstr "Ne prelomi konec datoteke"
+msgstr "&Po koncu datoteke ne nadaljuj na za\xE8etku"
#: Merge.rc:828
#, c-format
@@ -1428,7 +1428,7 @@
#: Merge.rc:855
#, c-format
msgid "&Don't wrap end of file"
-msgstr "&Brez preloma konca datoteke"
+msgstr "&Po koncu datoteke ne nadaljuj na za\xE8etku"
#: Merge.rc:858
#, c-format
@@ -1459,7 +1459,7 @@
#: Merge.rc:2205
#, c-format
msgid "Rational ClearCase"
-msgstr "Racionalno jasen primer"
+msgstr "Rational ClearCase"
#: Merge.rc:875
#, c-format
@@ -1565,7 +1565,7 @@
#: Merge.rc:966
#, c-format
msgid "Word Difference:"
-msgstr "Besedna razlika"
+msgstr "Besedne razlike:"
#: Merge.rc:976
#, c-format
@@ -1608,27 +1608,27 @@
#: Merge.rc:1010
#, c-format
msgid "&Filter folder:"
-msgstr "&Filter mape:"
+msgstr "&Mapa filtrov:"
#: Merge.rc:1012
#, c-format
msgid "B&rowse..."
-msgstr "B&rskaj.."
+msgstr "B&rskaj ..."
#: Merge.rc:1013
#, c-format
msgid "Temporary files folder"
-msgstr "Za\xE8asna datote\xE8na mapa"
+msgstr "Mapa za za\xE8asne datoteke"
#: Merge.rc:1014
#, c-format
msgid "S&ystem's temp folder"
-msgstr "S&istemska za\xE8asna mapa:"
+msgstr "s&istemska mapa"
#: Merge.rc:1016
#, c-format
msgid "C&ustom folder:"
-msgstr "Mapa po meri"
+msgstr "mapa po meri"
#: Merge.rc:1019
#: Merge.rc:1035
@@ -1639,7 +1639,7 @@
#: Merge.rc:1025
#, c-format
msgid "Patch Generator"
-msgstr "Generator datotek s popravki..."
+msgstr "Generator datotek s popravki ..."
#: Merge.rc:1028
#, c-format
@@ -1684,7 +1684,7 @@
#: Merge.rc:1050
#, c-format
msgid "W&hitespaces"
-msgstr "&Praznine"
+msgstr "&Prazni znaki"
#: Merge.rc:1051
#, c-format
@@ -1724,7 +1724,7 @@
#: Merge.rc:1085
#, c-format
msgid "Display Columns"
-msgstr "Prika\x9Ei kolone"
+msgstr "Prika\x9Ei stolpce"
#: Merge.rc:1091
#, c-format
@@ -1775,12 +1775,12 @@
#: Merge.rc:1133
#, c-format
msgid "Comparing items..."
-msgstr "Primerjanje predmetov..."
+msgstr "Primerjanje predmetov ..."
#: Merge.rc:1134
#, c-format
msgid "Items compared:"
-msgstr "Predmeti primerjani:"
+msgstr "Primerjanih predmetov:"
#: Merge.rc:1135
#, c-format
@@ -1831,7 +1831,7 @@
#: Merge.rc:1165
#, c-format
msgid "Whitespace"
-msgstr "Presledki"
+msgstr "Prazen znak"
#: Merge.rc:1166
#, c-format
@@ -1856,12 +1856,12 @@
#: Merge.rc:1170
#, c-format
msgid "Ignore &case"
-msgstr "Zanemari &primere"
+msgstr "Zanemari &velikost znakov"
#: Merge.rc:1171
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
-msgstr "&Zanemari razli\xE8nost vrnitev oznak zaklju\xE8ka (Windows/Unix/Mac)"
+msgstr "&Prezri razli\xE8nost tipa znakov za zaklju\xE8ke vrstic (EOL)"
#: Merge.rc:1173
#, c-format
@@ -1871,12 +1871,12 @@
#: Merge.rc:1174
#, c-format
msgid "&Match similar lines"
-msgstr "&Ozna\xE8i enake vrstice"
+msgstr "&Ujemanje enakih vrstic"
#: Merge.rc:1176
#, c-format
msgid "Filter Comments"
-msgstr "Filtriraj komentarje"
+msgstr "Komentarji filtrov"
#: Merge.rc:1182
#: Merge.rc:1958
@@ -1897,7 +1897,7 @@
#: Merge.rc:1189
#, c-format
msgid "&Preserve original EOL chars"
-msgstr "Obdr\x9Ei izvorni na\xE8in znakov za konec vrstice (EOL)"
+msgstr "Obdr\x9Ei izvorni tip znakov za konec vrstice (EOL)"
#: Merge.rc:1191
#, c-format
@@ -1907,17 +1907,17 @@
#: Merge.rc:1192
#, c-format
msgid "&Tab size:"
-msgstr "&Velikost tabel"
+msgstr "&\x9Atevilo presledkov, ki jih tabulator nadomesti"
#: Merge.rc:1195
#, c-format
msgid "&Insert Tabs"
-msgstr "&Vstavi tabele"
+msgstr "&Vstavi tabulatorje"
#: Merge.rc:1197
#, c-format
msgid "Insert &Spaces"
-msgstr "&Vstavi presledeke"
+msgstr "&Vstavi presledke"
#: Merge.rc:1199
#, c-format
@@ -1927,17 +1927,17 @@
#: Merge.rc:1201
#, c-format
msgid "View line differences"
-msgstr "Poglej vrsti\xE8ne razlike"
+msgstr "Poglej vrsti\xE8ne razlike na"
#: Merge.rc:1203
#, c-format
msgid "&Character level"
-msgstr "&Zna\xE8ajski nivo"
+msgstr "&znakovnem nivoju"
#: Merge.rc:1205
#, c-format
msgid "&Word-level:"
-msgstr "&Nivo besede"
+msgstr "&besednem nivoju"
#: Merge.rc:1209
#, c-format
@@ -1957,22 +1957,22 @@
#: Merge.rc:1229
#, c-format
msgid "Install..."
-msgstr "Namesti..."
+msgstr "Namesti ..."
#: Merge.rc:1230
#, c-format
msgid "New..."
-msgstr "Nova..."
+msgstr "Nova ..."
#: Merge.rc:1231
#, c-format
msgid "Edit..."
-msgstr "Uredi..."
+msgstr "Uredi ..."
#: Merge.rc:1232
#, c-format
msgid "Delete..."
-msgstr "Izbri\x9Ai..."
+msgstr "Izbri\x9Ai ..."
#: Merge.rc:1238
#, c-format
@@ -2024,12 +2024,12 @@
#: Merge.rc:1265
#, c-format
msgid "Default Codepage"
-msgstr "Standardna kodna tabela"
+msgstr "Privzeta kodna tabela"
#: Merge.rc:1266
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
-msgstr "Izberi splo\x9Ano kodno tabelo ko se nalagajo non-Unicode datoteke:"
+msgstr "Izberite privzeto kodno tabelo za nalaganje ne-Unicode datotek:"
#: Merge.rc:1268
#, c-format
@@ -2038,7 +2038,7 @@
"need to restart session"
msgstr ""
"Zaznaj kodno tabelo za datoteke s kon\xE8nico: .html, .rc, .xml \n"
-"potreben je ponovni zagon seje"
+"(potreben je ponovni zagon seje)"
#: Merge.rc:1271
#, c-format
@@ -2063,7 +2063,7 @@
#: Merge.rc:1286
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
-msgstr "Ni mogo\xE8e zaznati 7-zip verzijo (ni name\x9A\xE8ena?)"
+msgstr "Nisem mogel zaznati 7-zip verzijo (ni name\x9A\xE8ena?)"
# Removed \n because of lack of space!
#: Merge.rc:1289
@@ -2071,12 +2071,14 @@
msgid ""
"Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n"
"essential components to be copied to the program directory for standalone operation."
-msgstr "Delo z arhivskimi datotekami zahteva program 7-Zip 3.11 ali njegovo novej\x9Ao razli\xE8ico name\x9A\xE8eno na va\x9Aem ra\xE8unalniku"
+msgstr ""
+"Delo z arhivskimi datotekami zahteva program 7-Zip 3.11 ali njegovo novej\x9Ao razli\xE8ico\n"
+"name\x9A\xE8eno na va\x9Aem ra\xE8unalniku ali kopijo nujnih komponent za samostojno delovanje."
#: Merge.rc:1291
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
-msgstr "Name\x9A\xE8eni morajo biti tudi prave raz\x9Airitve (Merge7z*.dll) na sistemski poti (PATH)."
+msgstr "Name\x9A\xE8ene morajo biti tudi primerne raz\x9Airitve vmesnika (Merge7z*.dll) na poti (PATH)."
#: Merge.rc:1293
#, c-format
@@ -2110,23 +2112,23 @@
#: Merge.rc:1305
#, c-format
msgid "present"
-msgstr "Predstavlja"
+msgstr "trenutno"
#: Merge.rc:1303
#, c-format
msgid "Merge7z000U.dll"
-msgstr "Zdru\x9Ei 7z000U.dll"
+msgstr "Merge7z000U.dll"
#: Merge.rc:1306
#, c-format
msgid "7-Zip software installed on your computer:"
-msgstr "7-Zip programska oprema je name\x9A\xE8ena na ra\xE8unalniku:"
+msgstr "7-Zip programska oprema name\x9A\xE8ena na ra\xE8unalniku:"
#: Merge.rc:1308
#: Merge.rc:1313
#, c-format
msgid "none"
-msgstr "Ni\xE8"
+msgstr "Ni"
#: Merge.rc:1310
#, c-format
@@ -2141,7 +2143,7 @@
#: Merge.rc:1315
#, c-format
msgid "outdated"
-msgstr "Zastarelo"
+msgstr "zastarelo"
#: Merge.rc:1316
#, c-format
@@ -2165,22 +2167,22 @@
#: Merge.rc:1330
#, c-format
msgid "Options"
-msgstr "Opcije"
+msgstr "Mo\x9Enosti"
#: Merge.rc:1341
#, c-format
msgid " Categories"
-msgstr " Kategorije"
+msgstr "Kategorije"
#: Merge.rc:1343
#, c-format
msgid "Import..."
-msgstr "Uvozi..."
+msgstr "Uvozi ..."
#: Merge.rc:1344
#, c-format
msgid "Export..."
-msgstr "Izvozi..."
+msgstr "Izvozi ..."
#: Merge.rc:1352
#, c-format
@@ -2195,7 +2197,7 @@
#: Merge.rc:1354
#, c-format
msgid "Comments:"
-msgstr "Komentarji"
+msgstr "Komentarji:"
#: Merge.rc:1355
#, c-format
@@ -2205,12 +2207,12 @@
#: Merge.rc:1356
#, c-format
msgid "Operators:"
-msgstr "Operatorji"
+msgstr "Operatorji:"
#: Merge.rc:1357
#, c-format
msgid "Strings:"
-msgstr "Nizi"
+msgstr "Nizi:"
#: Merge.rc:1358
#, c-format
@@ -2238,7 +2240,7 @@
#: Merge.rc:1405
#, c-format
msgid "Bold"
-msgstr "Odebeljeno"
+msgstr "Krepko"
#: Merge.rc:1413
#, c-format
@@ -2248,7 +2250,7 @@
#: Merge.rc:1416
#, c-format
msgid "Report &File:"
-msgstr "Poro\xE8ilo &datoteke:"
+msgstr "Poro\xE8ilna &datoteka:"
#: Merge.rc:1419
#: Merge.rc:1593
@@ -2256,7 +2258,7 @@
#: Merge.rc:1624
#, c-format
msgid "Browse..."
-msgstr "Brskaj..."
+msgstr "Brskaj ..."
#: Merge.rc:1420
#, c-format
@@ -2266,12 +2268,12 @@
#: Merge.rc:1423
#, c-format
msgid "&Copy to Clipboard"
-msgstr "&Kopiraj v medpomnilnik"
+msgstr "&Kopiraj v odlo\x9Ei\x9A\xE8e"
#: Merge.rc:1431
#, c-format
msgid "Shared or Private Filter"
-msgstr "Skupni ali privatni filter"
+msgstr "Skupni ali zasebni filter"
#: Merge.rc:1434
#, c-format
@@ -2312,7 +2314,7 @@
#: Merge.rc:1454
#, c-format
msgid "&Use stand-alone 7-Zip if available"
-msgstr "&Uporabi standardni 7-zip \xE8e je razpolo\x9Eljiv"
+msgstr "&Uporabi samostojni 7-zip, \xE8e je razpolo\x9Eljiv"
#: Merge.rc:1457
#, c-format
@@ -2327,7 +2329,7 @@
#: Merge.rc:1467
#, c-format
msgid "Compare Statistics"
-msgstr "Preimerjaj statistiko"
+msgstr "Preimerjalna statistika"
#: Merge.rc:1470
#, c-format
@@ -2375,7 +2377,7 @@
#: Merge.rc:2353
#, c-format
msgid "Identical"
-msgstr "Identi\xE8no"
+msgstr "Enako"
#: Merge.rc:1499
#, c-format
@@ -2390,39 +2392,39 @@
#: Merge.rc:1513
#, c-format
msgid "Affects"
-msgstr "Vpliva"
+msgstr "Spremeni"
#: Merge.rc:1516
#: Merge.rc:1519
#, c-format
msgid "(Affects)"
-msgstr "(Vpliva)"
+msgstr "(Spremeni)"
#: Merge.rc:1520
#, c-format
msgid "Select Codepage for"
-msgstr "Izberi kodno tabelo za"
+msgstr "Izberi kodno tabelo datoteke za"
#: Merge.rc:1521
#, c-format
msgid "&File Loading:"
-msgstr "&Nalaganje datoteke:"
+msgstr "&nalaganje:"
#: Merge.rc:1523
#: Merge.rc:1526
#, c-format
msgid "..."
-msgstr "..."
+msgstr " ..."
#: Merge.rc:1524
#, c-format
msgid "File &Saving:"
-msgstr "Shranjevanje &datoteke:"
+msgstr "&shranjevanje:"
#: Merge.rc:1527
#, c-format
msgid "&Use same codepage for both"
-msgstr "&Uporabi enako kodno tabelo za oba"
+msgstr "&Uporabi enako kodno tabelo za oboje"
#: Merge.rc:1530
#, c-format
@@ -2443,7 +2445,7 @@
#: Merge.rc:1539
#, c-format
msgid "Testing filter ..."
-msgstr "Testiranje filtra..."
+msgstr "Testiranje filtra ..."
#: Merge.rc:1541
#, c-format
@@ -2483,12 +2485,12 @@
#: Merge.rc:1563
#, c-format
msgid "Whitespace:"
-msgstr "Skriti znaki in razmaki:"
+msgstr "Prazen znak:"
#: Merge.rc:1564
#, c-format
msgid "Regular text:"
-msgstr "Stalno besedilo"
+msgstr "Navadno besedilo:"
#: Merge.rc:1565
#, c-format
@@ -2524,32 +2526,32 @@
#: Merge.rc:1966
#, c-format
msgid "Backup Files"
-msgstr "Varnostne datoteke"
+msgstr "Arhivske datoteke"
#: Merge.rc:1613
#, c-format
msgid "Create backup files in:"
-msgstr "Ustvari varnostne datoteke v:"
+msgstr "Ustvari arhivske datoteke v:"
#: Merge.rc:1618
#, c-format
msgid "Create backup files into:"
-msgstr "Ustvari varnostne datoteke v:"
+msgstr "Ustvari arhivske datoteke v:"
#: Merge.rc:1619
#, c-format
msgid "&Original file's folder"
-msgstr "&Izvorna datote\xE8na mapa"
+msgstr "&mapi izvorne datoteke"
#: Merge.rc:1621
#, c-format
msgid "&Global backup folder:"
-msgstr "&Globalna varnostna mapa:"
+msgstr "&globalni arhivski mapi:"
#: Merge.rc:1625
#, c-format
msgid "Backup filename:"
-msgstr "Naziv varnostne datoteke"
+msgstr "Naziv arhivske datoteke"
#: Merge.rc:1626
#, c-format
@@ -2595,7 +2597,7 @@
#: Merge.rc:1654
#, c-format
msgid "Plugins"
-msgstr "&Raz\x9Airitve"
+msgstr "Raz\x9Airitve"
#: Merge.rc:1657
#, c-format
@@ -2636,7 +2638,7 @@
#: Merge.rc:1679
#, c-format
msgid "Add &Shell menu to context menu"
-msgstr "Dodaj obstoje\xE8i meni k &raz\x9Airjenemu meniju"
+msgstr "Dodaj meni lupine k &raz\x9Airjenemu meniju"
#: Merge.rc:1686
#: Merge.rc:1970
@@ -2653,7 +2655,7 @@
#: Merge.rc:1691
#, c-format
msgid "S&top after first difference"
-msgstr "&Ustavi na prvi razliki"
+msgstr "&Ustavi po prvi razliki"
#: Merge.rc:1693
#, c-format
@@ -2663,7 +2665,7 @@
#: Merge.rc:1695
#, c-format
msgid "&Include unique subfolders contents"
-msgstr "&Vklju\xE8i enkratne subfolders contents"
+msgstr "&Vklju\xE8i podmape ki obstajajo samo na eni strani"
#: Merge.rc:1697
#, c-format
@@ -2796,7 +2798,7 @@
"Print Preview"
msgstr ""
"Prika\x9Ei vse strani\n"
-"Predogledled tiskanja"
+"Predogled tiskanja"
#: Merge.rc:1784
#, c-format
@@ -2811,12 +2813,12 @@
#: Merge.rc:1786
#, c-format
msgid "Expand all subfolders"
-msgstr "Raz\x9Airi vse mape"
+msgstr "Raz\x9Airi vse podmape"
#: Merge.rc:1787
#, c-format
msgid "Collapse all subfolders"
-msgstr "Skr\xE8i vse mape"
+msgstr "Skr\xE8i vse podmape"
#: Merge.rc:1793
#, c-format
@@ -2845,12 +2847,12 @@
#: Merge.rc:1797
#, c-format
msgid "Project file successfully loaded."
-msgstr "Projektna datoteka uspe\x9Ano nalo\x9Eena"
+msgstr "Datoteka projekta uspe\x9Ano nalo\x9Eena."
#: Merge.rc:1798
#, c-format
msgid "Project file successfully saved."
-msgstr "Projektna datoteka uspe\x9Ano shranjena"
+msgstr "Datoteka projekta uspe\x9Ano shranjena."
#: Merge.rc:1799
#, c-format
@@ -2858,8 +2860,8 @@
"Save current paths and options to project file\n"
"Save Project File"
msgstr ""
-"Shrani izbrano pot in mo\x9Enosti v projektno datoteko\n"
-"Shrani projektno datoteko"
+"Shrani izbrano pot in mo\x9Enosti v datoteko projekta\n"
+"Shrani datoteko projekta"
#: Merge.rc:1804
#, c-format
@@ -2876,7 +2878,7 @@
"Quit the application; prompts to save documents\n"
"Exit"
msgstr ""
-"Zapri aplikacijo; opozori shranjevanje dokumentov\n"
+"Zapri aplikacijo; opozori na shranjevanje dokumentov\n"
"Izhod"
#: Merge.rc:1811
@@ -2905,8 +2907,8 @@
"Switch to the next window pane\n"
"Next Pane"
msgstr ""
-"Preklopi na naslednji okenski panel\n"
-"Naslednji panel"
+"Preklopi na naslednji okenski okvir\n"
+"Naslednji okvir"
#: Merge.rc:1832
#, c-format
@@ -2914,15 +2916,16 @@
"Switch back to the previous window pane\n"
"Previous Pane"
msgstr ""
-"Preklopi nazaj na predhodni okenski panel\n"
-"Predhodni panel"
+"Preklopi nazaj na predhodni okenski okvir\n"
+"Predhodni okvir"
#: Merge.rc:1838
#, c-format
msgid ""
"Arrange windows so they overlap\n"
"Cascade Windows"
-"Razvrsti okna kaskadno, s prekrivanjem \n"
+msgstr ""
+"Razvrsti okna kaskadno, s prekrivanjem\n"
"Kaskadno"
#: Merge.rc:1839
@@ -3021,8 +3024,8 @@
"Redo the previously undone action\n"
"Redo (Ctrl+Y)"
msgstr ""
-"Ponovi prej\x9Anjo neizvedeno akcijo\n"
-"Ponovi(Ctrl+Y)"
+"Uveljavi razveljavljeno akcijo\n"
+"Uveljavi(Ctrl+Y)"
#: Merge.rc:1860
#, c-format
@@ -3048,8 +3051,8 @@
"Show or hide the tab bar\n"
"Toggle TabBar"
msgstr ""
-"Skrij ali prika\x9Ei tabulatorsko vrstico\n"
-"Tabulatorska vrstica"
+"Skrij ali prika\x9Ei vrstico z listi\xE8i\n"
+"Vrstica z listi\xE8i"
#: Merge.rc:1863
#, c-format
@@ -3057,8 +3060,8 @@
"Automatically resize panes\n"
"Lock Panes"
msgstr ""
-"Samodejno pove\xE8aj panel\n"
-"Zakleni panel"
+"Samodejno pove\xE8aj okvirje\n"
+"Zakleni okvirje"
#: Merge.rc:1869
#, c-format
@@ -3068,7 +3071,7 @@
#: Merge.rc:1870
#, c-format
msgid "Change the window position"
-msgstr "Spremeni pozicijo okena"
+msgstr "Spremeni pozicijo okna"
#: Merge.rc:1871
#, c-format
@@ -3093,7 +3096,7 @@
#: Merge.rc:1875
#, c-format
msgid "Close the active window and prompts to save the documents"
-msgstr "Zapri vsa aktivna okna in opozori na shranjevanje dokumenta"
+msgstr "Zapri aktivno okno in vpra\x9Aaj za shranjevanje dokumenta"
#: Merge.rc:1880
#, c-format
@@ -3103,7 +3106,7 @@
#: Merge.rc:1881
#, c-format
msgid "Activate Task List"
-msgstr "Aktivni list opravil"
+msgstr "Aktiviraj seznam opravil"
#: Merge.rc:1882
#, c-format
@@ -3116,7 +3119,7 @@
"Close print preview mode\n"
"Cancel Preview"
msgstr ""
-"Zapri mo\x9Enost predogleda tiskanja\n"
+"Zapri predogled tiskanja\n"
"Zapri predogled"
#: Merge.rc:1895
@@ -3136,7 +3139,7 @@
"\n"
"\n"
"WinMerge.Primerjava datotek\n"
-"WinMerge primerjava datoteke"
+"WinMerge primerjava datotek"
#: Merge.rc:1896
#, c-format
@@ -3155,12 +3158,12 @@
"\n"
"\n"
"WinMerge.Primerjava map\n"
-"WinMerge primerjalna mapa"
+"WinMerge primerjava map"
#: Merge.rc:1903
#, c-format
msgid "Preserve original EOL chars"
-msgstr "Obdr\x9Ei izvorne znake za konec vrstice (EOL)"
+msgstr "Obdr\x9Ei izvorni tip znakov za konec vrstice (EOL)"
#: Merge.rc:1910
#, c-format
@@ -3190,7 +3193,7 @@
#: Merge.rc:1930
#, c-format
msgid "&Ok"
-msgstr "&Vredu"
+msgstr "&V redu"
#: Merge.rc:1932
#, c-format
@@ -3255,7 +3258,7 @@
#: Merge.rc:1950
#, c-format
msgid "Don't ask this &question again."
-msgstr "Ne vpra\x9Aaj ve\xE8 tega."
+msgstr "Tega vpra\x9Aanja ne postavi ve\xE8."
#: Merge.rc:1961
#, c-format
@@ -3265,7 +3268,7 @@
#: Merge.rc:1963
#, c-format
msgid "Version Control"
-msgstr "Razli\xE8ica nadzora"
+msgstr "Version Control"
#: Merge.rc:1968
#: Merge.rc:2339
@@ -3276,7 +3279,7 @@
#: Merge.rc:1977
#, c-format
msgid "To:"
-msgstr "Do:"
+msgstr "Na:"
#: Merge.rc:1978
#, c-format
@@ -3321,17 +3324,17 @@
#: Merge.rc:1996
#, c-format
msgid "All message boxes are now displayed again."
-msgstr "Vsa sporo\xE8ilna okna so sedaj ponovno prikazana "
+msgstr "Vsa sporo\xE8ilna okna bodo sedaj ponovno prikazana "
#: Merge.rc:1997
#, c-format
msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted."
-msgstr "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted."
+msgstr "V trenutni seji primerjave so bile narejene spremembe nastavitev. Nekatere nastavitve ne bodo veljale dokler ne boste ponovno zagnali primerjave."
#: Merge.rc:1998
#, c-format
msgid "The selected font change will not be applied to any currently visible difference windows."
-msgstr "Ta izbrana sprememba pisave ne bo uporabljena na katerikoli vidni spremembi"
+msgstr "Izbrana sprememba pisave \x9Ae ne bo v veljavi na trenutno vidnem panelu razlik."
#: Merge.rc:2000
#, c-format
@@ -3340,9 +3343,10 @@
"\n"
"Please use values 1 - %1."
msgstr ""
-"Veli\xE8ina oznake ni v obsegu sprejemljivega v WinMerge .\n"
+"\x8Atevilo presledkov, ki jih tabulator nadomesti, ni v obsegu sprejemljivega\n"
+"za WinMerge .\n"
"\n"
-"Prosimo koristite vrednosti 1 - %1."
+"Prosimo, uporabite vrednosti 1 - %1."
#: Merge.rc:2002
#, c-format
@@ -3351,9 +3355,9 @@
"\n"
"Please re-start WinMerge after the reset."
msgstr ""
-"Ali ste prepri\xE8ani da \x9Eelite resetirati vse mo\x9Enosti WinMerge na privzete vrednosti?\n"
+"Ali ste prepri\xE8ani da \x9Eelite ponastaviti vse mo\x9Enosti WinMerge na privzete vrednosti?\n"
"\n"
-"Prosim ponovno za\x9Eenite WinMerge po ponastavitvi"
+"Prosimo, ponovno za\x9Eenite WinMerge po ponastavitvi."
#: Merge.rc:2008
#, c-format
@@ -3363,7 +3367,7 @@
#: Merge.rc:2009
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
-msgstr "Programi|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
+msgstr "Izvedljive datoteke|*.exe;*.bat;*.cmd|Vse datoteke (*.*)|*.*||"
#: Merge.rc:2010
#, c-format
@@ -3373,27 +3377,27 @@
#: Merge.rc:2011
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
-msgstr "Datoteke WinMerge projekta(*.WinMerge)|*.WinMerge||"
+msgstr "Datoteke WinMerge projektov (*.WinMerge)|*.WinMerge||"
#: Merge.rc:2013
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
-msgstr "Mo\x9Ene datoteke (*.ini)|*.ini|All Files (*.*)|*.*||"
+msgstr "Datoteke nastavitev (*.ini)|*.ini|Vse datoteke (*.*)|*.*||"
#: Merge.rc:2019
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
-msgstr "Besedilne datotke (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
+msgstr "Besedilne datoteke (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Vse datoteke (*.*)|*.*||"
#: Merge.rc:2020
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
-msgstr "HTML datoteke (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
+msgstr "HTML datoteke (*.htm,*.html)|*.htm;*.html|Vse datoteke (*.*)|*.*||"
#: Merge.rc:2021
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
-msgstr "XML datoteke (*.xml)|*.xml|All Files (*.*)|*.*||"
+msgstr "XML datoteke (*.xml)|*.xml|Vse datoteke (*.*)|*.*||"
#: Merge.rc:2027
#, c-format
@@ -3428,12 +3432,12 @@
#: Merge.rc:2038
#, c-format
msgid "Modified Date"
-msgstr "Datum spremembe"
+msgstr "Spremenjen datum"
#: Merge.rc:2039
#, c-format
msgid "Modified Date and Size"
-msgstr "Sprememba datuma in velikosti"
+msgstr "Spremenjen datum in velikost"
#: Merge.rc:2040
#, c-format
@@ -3470,12 +3474,12 @@
#: Merge.rc:2051
#, c-format
msgid "Select filename for new filter"
-msgstr "Izberi ime datoteke za nov filter"
+msgstr "Izberite ime datoteke za nov filter"
#: Merge.rc:2052
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
-msgstr "Datoteke filtrov (*.flt)|*.flt|Sve datoteke (*.*)|*.*||"
+msgstr "Datoteke filtrov (*.flt)|*.flt|Vse datoteke (*.*)|*.*||"
#: Merge.rc:2054
#, c-format
@@ -3485,9 +3489,9 @@
"Please copy file %1 to WinMerge/Filters -folder:\n"
"%2."
msgstr ""
-"Ne najdem filtra datoteke, datoteke predloge!\n"
+"Ne najdem datoteke predloge filtra!\n"
"\n"
-"Prosimo, kopirajte datoteko %1 v WinMerge/Filters -mapo:\n"
+"Prosimo, kopirajte datoteko %1 v \"WinMerge/Filters\" mapo:\n"
"%2."
#: Merge.rc:2056
@@ -3498,10 +3502,10 @@
"\n"
"Please make sure the folder exists and is writable."
msgstr ""
-"Ne morem kopirati filtra predloge datoteke v filter mapo:\n"
+"Ne morem kopirati datoteke filtra predloge v filter mapo:\n"
"%1\n"
"\n"
-"Preverite \xE8e mapa obstaja in je zapisljiva."
+"Prosim preverite, \xE8e mapa obstaja in je zapisljiva."
#: Merge.rc:2058
#, c-format
@@ -3512,7 +3516,7 @@
msgstr ""
"Uporabni\x9Aka filter datote\xE8na mapa ni definirana.\n"
"\n"
-"Prosim izberite filter mape v mo\x9Enosti/Sistem."
+"Prosim izberite filter mape v Mo\x9Enosti/Sistem."
#: Merge.rc:2060
#, c-format
@@ -3522,10 +3526,10 @@
"\n"
"Maybe the file is read-only?"
msgstr ""
-"Ni mogo\xE8e izbrisati filter datoteke:\n"
+"Ni morem izbrisati filter datoteke:\n"
"%1\n"
"\n"
-"Morda je datoteka za\x9A\xE8itena - samo za brananje."
+"Morda je datoteka za\x9A\xE8itena - samo za branje."
#: Merge.rc:2061
#, c-format
@@ -3562,7 +3566,7 @@
msgstr ""
"Filtri so bili posodobljeni. Ali \x9Eelite osve\x9Eiti vse odprte mape za primerjavo?\n"
"\n"
-"\xC8e jih ne \x9Eelite osve\x9Eiti sedaj, lahko izberete Ne in osve\x9Eite primerjave kasneje."
+"\xC8e jih ne \x9Eelite osve\x9Eiti sedaj, lahko izberete Ne in osve\x9Eite primerjave kasneje."
#: Merge.rc:2084
#, c-format
@@ -3582,7 +3586,7 @@
#: Merge.rc:2092
#, c-format
msgid "Untitled left"
-msgstr "Levi neimanovan"
+msgstr "Levi neimenovan"
#: Merge.rc:2093
#, c-format
@@ -3597,17 +3601,17 @@
#: Merge.rc:2095
#, c-format
msgid "Mine File"
-msgstr "Moja datoteka"
+msgstr "Va\x9Aa datoteka"
#: Merge.rc:2101
#, c-format
msgid "Scanning files..."
-msgstr "Prei\x9A\xE8i datoteko..."
+msgstr "Pregledovanje datoteko ..."
#: Merge.rc:2102
#, c-format
msgid "Opening selection"
-msgstr "Odpiranje izbranega"
+msgstr "Odpiranje izbora"
#: Merge.rc:2103
#, c-format
@@ -3632,37 +3636,37 @@
#: Merge.rc:2107
#, c-format
msgid "Copying files..."
-msgstr "Kopiranje datotek..."
+msgstr "Kopiranje datotek ..."
#: Merge.rc:2108
#, c-format
msgid "Deleting files..."
-msgstr "Brisanje datotek..."
+msgstr "Brisanje datotek ..."
#: Merge.rc:2109
#, c-format
msgid "Moving files..."
-msgstr "Premikanje datotek..."
+msgstr "Premikanje datotek ..."
#: Merge.rc:2110
#, c-format
msgid "Creating the report..."
-msgstr "Izdelava poro\xE8ila..."
+msgstr "Izdelava poro\xE8ila ..."
#: Merge.rc:2111
#, c-format
msgid "Undoing the last operation..."
-msgstr "Razveljavi zadnje dejanje..."
+msgstr "Razveljavi zadnje dejanje ..."
#: Merge.rc:2112
#, c-format
msgid "Redoing the previous operation..."
-msgstr "Ponovi zadnje dejanje..."
+msgstr "Ponovi zadnje dejanje ..."
#: Merge.rc:2118
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
-msgstr "Vr: %s St: %d/%d znak: %d/%d EOL: %s"
+msgstr "Vr: %s St: %d/%d znak: %d/%d EOL: %s"
#: Merge.rc:2119
#, c-format
@@ -3672,7 +3676,7 @@
#: Merge.rc:2120
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
-msgstr "Vr: %s St: %d/%d Zn: %d/%d"
+msgstr "Vr: %s St: %d/%d Zn: %d/%d"
#: Merge.rc:2121
#, c-format
@@ -3687,12 +3691,12 @@
#: Merge.rc:2123
#, c-format
msgid "%1 Differences Found"
-msgstr "Najdena razlika: %1"
+msgstr "%1 najdenih razlik"
#: Merge.rc:2124
#, c-format
msgid "1 Difference Found"
-msgstr "Najdena razlika: 1"
+msgstr "1 najdena razlika"
#. Abbreviation from "Read Only"
#: Merge.rc:2125
@@ -3708,12 +3712,12 @@
#: Merge.rc:2132
#, c-format
msgid "Items: %1"
-msgstr "Predmet: %1"
+msgstr "Predmetov: %1"
#: Merge.rc:2138
#, c-format
msgid "Select two existing folders or files to compare"
-msgstr "Izberi dve obstoje\xE8i mapi ali datoteki za primerjavo"
+msgstr "Izberite dve obstoje\xE8i mapi ali datoteki za primerjavo"
#: Merge.rc:2139
#, c-format
@@ -3723,32 +3727,32 @@
#: Merge.rc:2140
#, c-format
msgid "Select two folders or two files to compare."
-msgstr "Izberi dve mapi ali dve datoteki za primerjavo."
+msgstr "Izberite dve mapi ali dve datoteki za primerjavo."
#: Merge.rc:2141
#, c-format
msgid "Left path is invalid!"
-msgstr "Leva pot je neveljavna"
+msgstr "Leva pot je neveljavna!"
#: Merge.rc:2142
#, c-format
msgid "Right path is invalid!"
-msgstr "Desna pot je neveljavna"
+msgstr "Desna pot je neveljavna!"
#: Merge.rc:2143
#, c-format
msgid "Both paths are invalid!"
-msgstr "Obe poti sta neveljavni"
+msgstr "Obe poti sta neveljavni!"
#: Merge.rc:2144
#, c-format
msgid "Choose two files to enable unpacker selection."
-msgstr "Izberi dve datoteki, da boste omogo\xE8ili izbiro pretvornika"
+msgstr "Izberite dve datoteki, da boste omogo\xE8ili izbiro pretvornika."
#: Merge.rc:2145
#, c-format
msgid "Cannot compare file and folder!"
-msgstr "Ni mogo\xE8e primerjati datoteke in mape!"
+msgstr "Ne morem primerjati datoteke in mape!"
#: Merge.rc:2151
#, c-format
@@ -3768,7 +3772,7 @@
"\n"
"%2"
msgstr ""
-"Ni mogo\xE8e odpreti datoteke\n"
+"Ne morem odpreti datotek\n"
"%1\n"
"\n"
"%2"
@@ -3776,7 +3780,7 @@
#: Merge.rc:2154
#, c-format
msgid "Failed to parse conflict file."
-msgstr "Spodletelo raz\xE8lenjevanje konfliktne datoteke."
+msgstr "Ne morem raz\xE8leniti konfliktne datoteke."
#: Merge.rc:2155
#, c-format
@@ -3802,7 +3806,7 @@
#: Merge.rc:2163
#, c-format
msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
-msgstr "%1 je samo za branje. Ali \x9Eelite prepisati to datoteko? ( Ne za shranjevanje pod novim imenom)"
+msgstr "%1 je ozna\xE8ena samo za branje. Ali jo kljub temu \x9Eelite prepisati? ( Ne, za shranjevanje pod novim imenom)"
#: Merge.rc:2164
#, c-format
@@ -3841,7 +3845,7 @@
"%1\n"
"%2\n"
"Ali \x9Eelite:\n"
-"\t- uporabiti razli\xE8no ime datoteke (pritisnite Vredu)\n"
+"\t- uporabiti druga\xE8no ime datoteke (pritisnite V redu)\n"
"\t- preklicati trenutno operacijo (pritisnite Prekli\xE8i)?"
#: Merge.rc:2169
@@ -3885,7 +3889,7 @@
msgstr ""
"Druga aplikacija je posodobila datoteko\n"
"%1\n"
-"odkar jo je WinMerge zadnji\xE8 nalo\x9Eil.\n"
+"odkar jo je WinMerge nalo\x9Eil.\n"
"\n"
"Prepi\x9Ai spremenjeno datoteko?"
@@ -3896,7 +3900,7 @@
"is marked read-only. Would you like to override the read-only item?"
msgstr ""
"%1\n"
-"je ozna\xE8ena samo za branje. \x8Eelite prepisati predmet samo za branje?"
+"je ozna\xE8ena samo za branje. Ali jo kljub temu \x9Eelite prepisati?"
#: Merge.rc:2173
#, c-format
@@ -3941,14 +3945,14 @@
"\n"
"Refresh documents before continuing."
msgstr ""
-"Ni mogo\xE8e povezati razlik, kadar dokumenta nista sinhronizirana.\n"
+"Ne morem zdru\x9Eevati razlik, \xE8e dokumenta nista sinhronizirana.\n"
"\n"
-"Osve\x9Eite dokumente predno nadaljujete."
+"Prosim, osve\x9Eite dokumente pred nadaljujete."
#: Merge.rc:2188
#, c-format
msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)"
-msgstr "Navesti morate pot SourceSafe projekta \xE8e \x9Eelite nadaljevati (npr: $/MyProject)"
+msgstr "Navesti morate pot SourceSafe projekta \xE8e \x9Eelite nadaljevati (npr: $/MyProject)"
#: Merge.rc:2189
#, c-format
@@ -3958,22 +3962,22 @@
#: Merge.rc:2190
#, c-format
msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..."
-msgstr "Versioning System je vrnil napako medtem ko je posku\x9Aal dostopati do datoteke. Ni mogo\xE8e nadaljevati..."
+msgstr "Versioning System je vrnil napako medtem ko je posku\x9Aal dostopati do datoteke. Ni mogo\xE8e nadaljevati ..."
#: Merge.rc:2191
#, c-format
msgid "Error executing versioning system command."
-msgstr "Napaka pri izvr\x9Aevanju sistemskega ukaza."
+msgstr "Napaka pri izvr\x9Aevanju Versioning System ukaza."
#: Merge.rc:2192
#, c-format
msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
-msgstr "VSS delovna mapa in lokacija izbrane mape se ne ujemata. Nadaljujem?"
+msgstr "VSS delovna mapa in lokacija trenutne datoteke se ne ujemata. Nadaljujem?"
#: Merge.rc:2193
#, c-format
msgid "No VSS database(s) found!"
-msgstr "VSS podatkovna baza ni najdena!"
+msgstr "Ne morem najti VSS podatkovne baze!"
#: Merge.rc:2194
#, c-format
@@ -3987,7 +3991,7 @@
" Please, check config spec of used view.\n"
" Undo checkout operation?"
msgstr ""
-"Versioning System je vrnil napako med preverjanjem datoteke...\n"
+"Versioning System je vrnil napako med preverjanjem datoteke ...\n"
"Prosim preverite nastavitvene specifikacije uporabljenega pogleda.\n"
"Zavrzi pregledno operacijo?"
@@ -4004,7 +4008,7 @@
#: Merge.rc:2556
#, c-format
msgid "None"
-msgstr "Prazno"
+msgstr "Brez"
#: Merge.rc:2203
#, c-format
@@ -4019,12 +4023,12 @@
#: Merge.rc:2206
#, c-format
msgid "Break at whitespace"
-msgstr "Prelom na presledku"
+msgstr "Prelom na praznem znaku"
#: Merge.rc:2207
#, c-format
msgid "Break at whitespace or punctuation"
-msgstr "Prelom na presledku ali lo\xE8ilu"
+msgstr "Prelom na praznem znaku ali lo\xE8ilu"
#: Merge.rc:2213
#: Merge.rc:2215
@@ -4051,12 +4055,12 @@
#: Merge.rc:2219
#, c-format
msgid "Delete selected item(s) on both sides"
-msgstr "Izbri\x9Ai izran predmet na obeh straneh"
+msgstr "Izbri\x9Ai izbran(e) predmet(e) na obeh straneh"
#: Merge.rc:2220
#, c-format
msgid "Hide selected item(s) (on the fly filter)"
-msgstr "Skrij izbran predmet(e) (na filtru)"
+msgstr "Skrij izbran(e) predmet(e) (takoj\x9Anji filter)"
#: Merge.rc:2221
#, c-format
@@ -4087,25 +4091,25 @@
#: Merge.rc:2242
#, c-format
msgid "Left to... (%1)"
-msgstr "Leva do...(%1)"
+msgstr "Leva do ... (%1)"
#: Merge.rc:2227
#: Merge.rc:2243
#, c-format
msgid "Right to... (%1)"
-msgstr "Desna do...(%1)"
+msgstr "Desna do ... (%1)"
#: Merge.rc:2228
#: Merge.rc:2244
#, c-format
msgid "Left to... (%1 of %2)"
-msgstr "Leva do...(%1 od%2)"
+msgstr "Leva do ... (%1 od%2)"
#: Merge.rc:2229
#: Merge.rc:2245
#, c-format
msgid "Right to... (%1 of %2)"
-msgstr "Desna do...(%1 od%2)"
+msgstr "Desna do ... (%1 od%2)"
#: Merge.rc:2235
#, c-format
@@ -4140,27 +4144,27 @@
#: Merge.rc:2241
#, c-format
msgid "Select destination folder"
-msgstr "Izberi ciljno mapo"
+msgstr "Izberite ciljno mapo"
#: Merge.rc:2246
#, c-format
msgid "Left side - select destination folder:"
-msgstr "Leva stran- izberi ciljno mapo:"
+msgstr "Leva stran - izberite ciljno mapo:"
#: Merge.rc:2247
#, c-format
msgid "Right side - select destination folder:"
-msgstr "Desna stran- izberi ciljno mapo:"
+msgstr "Desna stran - izberite ciljno mapo:"
#: Merge.rc:2248
#, c-format
msgid "(%1 Files Affected)"
-msgstr "(%1 Datoteke simulirano)"
+msgstr "(%1 vpletenih datotek)"
#: Merge.rc:2249
#, c-format
msgid "(%1 of %2 Files Affected)"
-msgstr "(%1 of %2 datotek simulirano)"
+msgstr "(%1 of %2 vpletenih datotek)"
#: Merge.rc:2255
#, c-format
@@ -4169,10 +4173,9 @@
"\n"
"%1 ?"
msgstr ""
-"Ali ste prepri\xE8ani da \x9Eelite\n"
+"Ali ste prepri\xE8ani, da \x9Eelite brisati\n"
"\n"
-"%1\n"
-"Izbrisati?"
+"%1?"
#: Merge.rc:2256
#, c-format
@@ -4182,7 +4185,7 @@
#: Merge.rc:2257
#, c-format
msgid "Are you sure you want to copy %d items:"
-msgstr "Ali ste prepri\xE8ani da \x9Eelite kopirati %d predmetov:"
+msgstr "Ali ste prepri\xE8ani, da \x9Eelite kopirati %d predmetov:"
#: Merge.rc:2258
#, c-format
@@ -4195,13 +4198,13 @@
"\n"
"Please refresh the compare."
msgstr ""
-"Postopek zaustavljen!\n"
+"Postopek prekinjen!\n"
"\n"
-"Mapa z vsebino na disku je spremenjena , pot\n"
+"Vsebina map na disku je bila spremenjena , poti\n"
"%1\n"
-"do nje.\n"
+"do nje nisem na\x9Ael.\n"
"\n"
-"Osve\x9Eite primerjavo."
+"Prosim, osve\x9Eite primerjavo."
#: Merge.rc:2259
#, c-format
@@ -4231,7 +4234,7 @@
#: Merge.rc:2270
#, c-format
msgid "Open left file with ..."
-msgstr "Odpri levo datoteko z..."
+msgstr "Odpri levo datoteko z ..."
#: Merge.rc:2271
#, c-format
@@ -4411,12 +4414,12 @@
#: Merge.rc:2329
#, c-format
msgid "Left EOL"
-msgstr "Znake za konec vrstice (EOL) na levi"
+msgstr "Znake za konec vrstice (EOL) na levi datoteki"
#: Merge.rc:2330
#, c-format
msgid "Right EOL"
-msgstr "Znake za konec vrstice (EOL) na desni"
+msgstr "Znake za konec vrstice (EOL) na desni datoteki"
#: Merge.rc:2336
#, c-format
@@ -4431,7 +4434,7 @@
#: Merge.rc:2338
#, c-format
msgid "Ignored Diff."
-msgstr "Zanemari razlike"
+msgstr "Zanemarjene razlike."
#: Merge.rc:2340
#: Merge.rc:2552
@@ -4442,12 +4445,12 @@
#: Merge.rc:2346
#, c-format
msgid "Unable to compare files"
-msgstr "Ni mogo\xE8e primerjati datotek"
+msgstr "Nisem mogel primerjati datotek"
#: Merge.rc:2347
#, c-format
msgid "Item aborted"
-msgstr "Predmet prekinjen"
+msgstr "Pregled predmeta prekinjen"
#: Merge.rc:2348
#, c-format
@@ -4457,7 +4460,7 @@
#: Merge.rc:2349
#, c-format
msgid "Folder skipped"
-msgstr "Skraja\x9Aana map"
+msgstr "Presko\xE8ena mapa"
#: Merge.rc:2350
#, c-format
@@ -4472,7 +4475,7 @@
#: Merge.rc:2352
#, c-format
msgid "Binary files are identical"
-msgstr "Binarni datoteki sta identi\xE8ni"
+msgstr "Binarni datoteki sta enaki"
#: Merge.rc:2354
#, c-format
@@ -4517,7 +4520,7 @@
#: Merge.rc:2372
#, c-format
msgid "Elapsed time: %ld ms"
-msgstr "Potekel \xE8as: %ld ms"
+msgstr "Minilo je: %ld ms"
#: Merge.rc:2373
#, c-format
@@ -4537,22 +4540,22 @@
#: Merge.rc:2381
#, c-format
msgid "Subfolder name when subfolders are included."
-msgstr "Imena podmap kadar so vklju\xE8ene podmape"
+msgstr "Imena podmap ko so vklju\xE8ene podmape."
#: Merge.rc:2382
#, c-format
msgid "Comparison result, long form."
-msgstr "Rezultat primerjave, dolga oblika"
+msgstr "Rezultat primerjave, dolga oblika."
#: Merge.rc:2383
#, c-format
msgid "Left side modification date."
-msgstr "Leva stran datum spremembe"
+msgstr "Datum spremembe datoteke na levi strani."
#: Merge.rc:2384
#, c-format
msgid "Right side modification date."
-msgstr "Desna stran datum spremembe"
+msgstr "Datum spremembe datoteke na desni strani."
#: Merge.rc:2385
#, c-format
@@ -4562,32 +4565,32 @@
#: Merge.rc:2386
#, c-format
msgid "Left file size in bytes."
-msgstr "Velikost leve datoteke v bajtih"
+msgstr "Velikost leve datoteke v bajtih."
#: Merge.rc:2387
#, c-format
msgid "Right file size in bytes."
-msgstr "Velikost desne datoteke v bajtih"
+msgstr "Velikost desne datoteke v bajtih."
#: Merge.rc:2388
#, c-format
msgid "Left file size abbreviated."
-msgstr "Skraja\x9Aana leva datoteka"
+msgstr "Skraj\x9Aana velikost leve datoteke."
#: Merge.rc:2389
#, c-format
msgid "Right file size abbreviated."
-msgstr "Skraj\x9Aana desna datoteka"
+msgstr "Skraj\x9Aana velikost desne datoteke."
#: Merge.rc:2395
#, c-format
msgid "Left side creation time."
-msgstr "Leva stran datum nastanka"
+msgstr "Datum nastanka na levi strani."
#: Merge.rc:2396
#, c-format
msgid "Right side creation time."
-msgstr "Desna stran datum nastanka"
+msgstr "Datum nastanka na desni strani."
#: Merge.rc:2397
#, c-format
@@ -4602,52 +4605,52 @@
#: Merge.rc:2399
#, c-format
msgid "Right side file version, only for some filetypes."
-msgstr "Verzija desne datoteke, samo za nekatere datote\xE8ne tipe"
+msgstr "Verzija desne datoteke, samo za nekatere datote\xE8ne tipe."
#: Merge.rc:2400
#, c-format
msgid "Short comparison result."
-msgstr "Rezultat kratke primerjave"
+msgstr "Kratki rezultati primerjave."
#: Merge.rc:2401
#, c-format
msgid "Left side attributes."
-msgstr "Atributi leve strani"
+msgstr "Atributi leve strani."
#: Merge.rc:2402
#, c-format
msgid "Right side attributes."
-msgstr "Atributi desne strani"
+msgstr "Atributi desne strani."
#: Merge.rc:2403
#, c-format
msgid "Left side file EOL type"
-msgstr "Tip znakov za konec vrstice (EOL) na levi"
+msgstr "Tip znakov za konec vrstice (EOL) na levi datoteki"
#: Merge.rc:2404
#, c-format
msgid "Right side file EOL type"
-msgstr "Tip znakov za konec vrstice (EOL) na desni"
+msgstr "Tip znakov za konec vrstice (EOL) na desni datoteki"
#: Merge.rc:2410
#, c-format
msgid "Left side encoding."
-msgstr "Kodirana leva stran"
+msgstr "Kodna stran leve strani."
#: Merge.rc:2411
#, c-format
msgid "Right side encoding."
-msgstr "Kodirana desna stran"
+msgstr "Kodna stran desne strani."
#: Merge.rc:2412
#, c-format
msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
-msgstr "\x8Atevilo ignoriranih razlik v datoteki. Te razlike so ignorirane iz strani WinMerge-a in ne morejo biti zdru\x9Eene"
+msgstr "\x8Atevilo ignoriranih razlik v datoteki. Te razlike program WinMerge ignorira in ne morejo biti zdru\x9Eene."
#: Merge.rc:2413
#, c-format
msgid "Number of differences in file. This number does not include ignored differences."
-msgstr "\x8Atevilo razlik v datoteki. Ta \x9Atevilka na vsebuje ignoriranih razlik"
+msgstr "\x8Atevilo razlik v datoteki. Ta \x9Atevilka ne vsebuje ignoriranih razlik."
#: Merge.rc:2414
#, c-format
@@ -4662,12 +4665,12 @@
#: Merge.rc:2421
#, c-format
msgid "Comma-separated list"
-msgstr "Seznam lo\xE8en z vejico"
+msgstr "Seznam, lo\xE8en z vejicami"
#: Merge.rc:2422
#, c-format
msgid "Tab-separated list"
-msgstr "Seznam lo\xE8en s tabulatorjem"
+msgstr "Seznam, lo\xE8en s tabulatorji"
#: Merge.rc:2423
#, c-format
@@ -4682,7 +4685,7 @@
#: Merge.rc:2426
#, c-format
msgid "The report file already exists. Do you want to overwrite existing file?"
-msgstr "Poro\xE8ilo datoteke \x9Ee obstaja. Ali \x9Eelite prepisati obstoje\xE8o datoteko?"
+msgstr "Datoteka s poro\xE8ilom \x9Ee obstaja. Ali jo \x9Eelite prepisati?"
#: Merge.rc:2427
#, c-format
@@ -4701,12 +4704,12 @@
#: Merge.rc:2434
#, c-format
msgid "The same file is opened in both panels."
-msgstr "Ista datoteka je odprta v obeh panelih"
+msgstr "Ista datoteka je odprta v obeh okvirih"
#: Merge.rc:2435
#, c-format
msgid "The selected files are identical."
-msgstr "Izbrani datoteki sta identi\xE8ni."
+msgstr "Izbrani datoteki sta enaki."
#: Merge.rc:2436
#, c-format
@@ -4727,11 +4730,11 @@
"\n"
"Note: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences..' in the Compare tab of the options dialog (available under Edit/Options)."
msgstr ""
-"Te datoteka so razli\xE8ne pri prehodu v drugo vrsto.\n"
+"Ti datoteki imata razli\xE8na tipa znakov za zaklju\xE8ke vrstic (EOL).\n"
"\n"
-"Ali zadr\x9Eujete razli\xE8ne prehode v drugo vrsto?\n"
+"Ali \x9Eelite oba tipa obravnavati kot enaka za trenutno primerjavo?\n"
"\n"
-"Opomba: \xC8e \x9Eelite vedno obdr\x9Eati razli\xE8ne prehode v drugo vrsto, izberite 'Prezri razli\xE8nost prehoda v drugo vrsto...' v tabulatorskem primerjanju nastavitev dialoga (dostopno pod Urajanje/Nastavitve."
+"Opomba: \xC8e jih \x9Eelite vedno obravnavati kot enake, nastavite mo\x9Enost 'Prezri razli\xE8nost tipa znakov za zaklju\xE8ke vrstic (EOL)' na listi\xE8u Primerjave dialoga nastavitev (dostopen pod Urejanje/Nastavitve)."
#: Merge.rc:2439
#, c-format
@@ -4740,9 +4743,9 @@
" With the current options, they will be unified to the main type.\n"
" Do you want to change the options and preserve the different EOL ?"
msgstr ""
-"Zaklju\xE8ki vrstic (EOL) so razli\xE8nega tipa (Windows/Unix/Mac) v datoteki '%1'.\n"
+"Znaki za zaklju\xE8ke vrstic (EOL) so razli\xE8nega tipa (Windows/Unix/Mac) v datoteki '%1'.\n"
"S trenutno nastavitvijo, bodo poenotene v glavnem tipu.\n"
-"Ali \x9Eelite spremeniti nastavitev in ohraniti razli\xE8ne zaklju\xE8ke vrstic?"
+"Ali \x9Eelite spremeniti mo\x9Enosti in ohraniti razli\xE8ne zaklju\xE8ke vrstic?"
#: Merge.rc:2440
#, c-format
@@ -4752,12 +4755,12 @@
#: Merge.rc:2441
#, c-format
msgid "The selected folder is invalid."
-msgstr "Izbrana mapa je napa\xE8na"
+msgstr "Izbrana mapa ni veljavna."
#: Merge.rc:2442
#, c-format
msgid "Cannot open a binary file to editor."
-msgstr "Ni mogo\xE8e odpreti binarne datoteke v urejevalniku"
+msgstr "V urejevalniku ne morem odpreti binarne datoteke."
#: Merge.rc:2443
#, c-format
@@ -4768,11 +4771,11 @@
"%1\n"
"to the other side and open these folders?"
msgstr ""
-"Datoteka obstaja samo na drugi strani in je ni mogo\xE8e odpreti.\n"
+"Mapa obstaja samo na drugi strani, zato je ne morem odpreti.\n"
"\n"
-"ali \x9Eelite ustvariti ujemajo\xE8o mapo:\n"
+"Ali jo \x9Eelite ustvariti:\n"
"%1\n"
-"na drugi strani in odpreti to mapo?"
+"na drugi strani in jo odpreti?"
#: Merge.rc:2449
#, c-format
@@ -4781,14 +4784,14 @@
"Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n"
"Would you like to treat both files as being in the default windows codepage (recommended)?"
msgstr ""
-"Razli\xE8ne kodne tabele so najdene v levi (cp%d) in desni (cp%d) datoteki. \n"
-"Prikaz posamezne datoteke v svoji kodni tabeli bo povzro\xE8ilo bol\x9Ai prikaz toda zdru\x9Eevanje/kopiranje bo nevarno.\n"
-"Ali \x9Eelite tretirati,da sta obe datoteka vidna v isti privzeti windows kodni tabeli (priporo\xE8ljivo)?"
+"Leva (cp%d) in desna (cp%d) datoteka sta v razli\xE8nih kodnih tabelah. \n"
+"Prikaz posamezne datoteke v svoji kodni tabeli bo omogo\xE8ilo bolj\x9Ai prikaz, a zdru\x9Eevanje/kopiranje bo nevarno.\n"
+"Ali \x9Eelite obravnavati obe datoteki kot da sta v isti privzeti windows kodni tabeli (priporo\xE8ljivo)?"
#: Merge.rc:2450
#, c-format
msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss."
-msgstr "Opozorilo: Datoteki uporabljata razli\xE8ni kodiranji, levo=%s in desno=%s, in s spajanjem je mogo\xE8e izgubiti informacije"
+msgstr "Opozorilo: Datoteki uporabljata razli\xE8ni kodiranji, levo=%s in desno=%s. Zdru\x9Eevanje lahko povzro\xE8i izgubo informacije."
#: Merge.rc:2451
#, c-format
@@ -4813,17 +4816,17 @@
#: Merge.rc:2460
#, c-format
msgid "Line difference"
-msgstr "Vrsti\xE8ne razlike"
+msgstr "Razlika v vrstici"
#: Merge.rc:2466
#, c-format
msgid "Replaced %1 string(s)."
-msgstr "Zamenjan %1 znak(i)."
+msgstr "Zamenjan %1 niz(i)."
#: Merge.rc:2467
#, c-format
msgid "Cannot find string \"%s\""
-msgstr "Ni mogo\xE8e najti znaka \"%s\""
+msgstr "Ne morem najti niza \"%s\""
#: Merge.rc:2473
#, c-format
@@ -4838,12 +4841,12 @@
#: Merge.rc:2480
#, c-format
msgid "Location Pane"
-msgstr "Polo\x9Eaj panela"
+msgstr "Polo\x9Eajni okvir"
#: Merge.rc:2481
#, c-format
msgid "Diff Pane"
-msgstr "Razlika panelov"
+msgstr "Okvir razlik"
#: Merge.rc:2487
#, c-format
@@ -4868,7 +4871,7 @@
#: Merge.rc:2491
#, c-format
msgid "[%1 files selected]"
-msgstr "[%1 datoteka izbrana]"
+msgstr "[%1 izbranih datotek]"
#: Merge.rc:2492
#, c-format
@@ -4878,7 +4881,7 @@
#: Merge.rc:2493
#, c-format
msgid "Context"
-msgstr "Sobesedilo"
+msgstr "Pomen"
#: Merge.rc:2494
#, c-format
@@ -4888,7 +4891,7 @@
#: Merge.rc:2495
#, c-format
msgid "Could not write to file %1."
-msgstr "Ni mogo\xE8e zapisato v datoteko %1."
+msgstr "Ne morem pisati v datoteko %1."
#: Merge.rc:2496
#, c-format
@@ -4903,12 +4906,12 @@
#: Merge.rc:2498
#, c-format
msgid "Cannot create a patch file from binary files."
-msgstr "Ni mogo\xE8e izdelati datoteke s popravki iz binarnih datotek."
+msgstr "Iz binarnih datotek ne morem izdelati datoteke s popravki."
#: Merge.rc:2499
#, c-format
msgid "Cannot create a patch file from directories."
-msgstr "Ni mogo\xE8e izdelati datoteke s popravki iz iz map."
+msgstr "Iz map ne morem izdelati datoteke s popravki."
#: Merge.rc:2500
#, c-format
@@ -4939,8 +4942,8 @@
"See manual for more info about archive support and how to enable it."
msgstr ""
"Delo z arhivskimi datotekami ni omogo\xE8eno.\n"
-"Vse rabljene komponente (7-zip in/ali Merge7z*.dll) za arhivno podporo ni mogo\xE8e najti.\n"
-"Za ve\xE8 informacij poglejte v rubriko pomo\xE8 o podpori arhivskih datotek."
+"Vseh potrebnih komponent (7-zip in/ali Merge7z*.dll) za to ne morem najti.\n"
+"Za ve\xE8 informacij poglejte v rubriko pomo\xE8 o podpori arhivskih datotek in kako jo omogo\xE8iti."
#: Merge.rc:2508
#, c-format
@@ -4958,17 +4961,17 @@
"Note: 7-Zip integration is restricted to standalone operation in WinMerge settings....
[truncated message content] |
|
From: <ge...@us...> - 2010-01-16 08:21:35
|
Revision: 7112
http://winmerge.svn.sourceforge.net/winmerge/?rev=7112&view=rev
Author: gerundt
Date: 2010-01-16 08:21:28 +0000 (Sat, 16 Jan 2010)
Log Message:
-----------
Change version nummer from 2.3.11 to 2.13.11 in change log
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-01-15 19:01:44 UTC (rev 7111)
+++ trunk/Docs/Users/ChangeLog.txt 2010-01-16 08:21:28 UTC (rev 7112)
@@ -3,7 +3,7 @@
to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL:
http://winmerge.org/tracker/[tracker-id]
-WinMerge 2.3.11 - 2010-01-15 (r7111)
+WinMerge 2.13.11 - 2010-01-15 (r7111)
Write config log as UTF-8 file (r7057)
Update PCRE to version 8.00 (r7068)
Update SCEW to version 1.1.1 (r7079)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-01-15 19:01:51
|
Revision: 7111
http://winmerge.svn.sourceforge.net/winmerge/?rev=7111&view=rev
Author: kimmov
Date: 2010-01-15 19:01:44 +0000 (Fri, 15 Jan 2010)
Log Message:
-----------
WinMerge experimental release 2.3.11. (SVN r7111)
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-01-15 18:48:24 UTC (rev 7110)
+++ trunk/Docs/Users/ChangeLog.txt 2010-01-15 19:01:44 UTC (rev 7111)
@@ -3,7 +3,7 @@
to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL:
http://winmerge.org/tracker/[tracker-id]
-WinMerge 2.3.11
+WinMerge 2.3.11 - 2010-01-15 (r7111)
Write config log as UTF-8 file (r7057)
Update PCRE to version 8.00 (r7068)
Update SCEW to version 1.1.1 (r7079)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-01-15 18:48:35
|
Revision: 7110
http://winmerge.svn.sourceforge.net/winmerge/?rev=7110&view=rev
Author: kimmov
Date: 2010-01-15 18:48:24 +0000 (Fri, 15 Jan 2010)
Log Message:
-----------
Update version numbers for 2.13.11 experimental release.
Modified Paths:
--------------
trunk/versions.ini
Modified: trunk/versions.ini
===================================================================
--- trunk/versions.ini 2010-01-15 17:47:58 UTC (rev 7109)
+++ trunk/versions.ini 2010-01-15 18:48:24 UTC (rev 7110)
@@ -7,19 +7,19 @@
description = WinMerge InnoSetup installer
path = Installer/InnoSetup/WinMerge.iss
macro = AppVersion
-version = "2.13.10"
+version = "2.13.11"
[Executable]
type = WinRC
description = WinMerge executable
path = Src/Merge.rc
-version = "2.13.10"
+version = "2.13.11"
[Dll]
type = WinRC
description = ShellExtension
path = ShellExtension/ShellExtension.rc
-version = "1.16.1"
+version = "1.16.2"
[Manual]
type = Docbook
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-01-15 17:48:04
|
Revision: 7109
http://winmerge.svn.sourceforge.net/winmerge/?rev=7109&view=rev
Author: gerundt
Date: 2010-01-15 17:47:58 +0000 (Fri, 15 Jan 2010)
Log Message:
-----------
PATCH: [ 2932094 ] Updated Slovenian translation for stable and unstable trunk
Submitted by Filip Komar
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/Languages/Slovenian.po
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2010-01-15 17:46:17 UTC (rev 7108)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2010-01-15 17:47:58 UTC (rev 7109)
@@ -8,7 +8,7 @@
Translation updates:
- Dutch (#2804979)
- French (#2850842)
- - Slovenian (#2917796)
+ - Slovenian (#2917796, #2932094)
- Spanish (#2930734)
- Turkish (#2825132, #2827817)
- Ukrainian (#2817835)
Modified: branches/R2_12/Src/Languages/Slovenian.po
===================================================================
--- branches/R2_12/Src/Languages/Slovenian.po 2010-01-15 17:46:17 UTC (rev 7108)
+++ branches/R2_12/Src/Languages/Slovenian.po 2010-01-15 17:47:58 UTC (rev 7109)
@@ -13,8 +13,8 @@
"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: 2009-12-19 20:52+0100\n"
-"Last-Translator: Filip Komar <filip.komar at gmail.com>\n"
+"PO-Revision-Date: 2010-01-15 11:17+0100\n"
+"Last-Translator: Filip Komar <fil...@gm...>\n"
"Language-Team: Slovenian <win...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CP1250\n"
@@ -272,7 +272,7 @@
#: Merge.rc:449
#, c-format
msgid "&Generate Patch..."
-msgstr "&Generiraj paket..."
+msgstr "&Generiraj datoteko s popravki..."
#: Merge.rc:148
#: Merge.rc:269
@@ -293,21 +293,21 @@
#: Merge.rc:456
#, c-format
msgid "&Manual Unpacking"
-msgstr "&Ro\xE8no razpakiranje"
+msgstr "&Ro\xE8no pretvarjanje"
#: Merge.rc:153
#: Merge.rc:274
#: Merge.rc:457
#, c-format
msgid "&Automatic Unpacking"
-msgstr "&Samodejno razpakiranje"
+msgstr "&Samodejno pretvarjanje"
#: Merge.rc:155
#: Merge.rc:276
#: Merge.rc:459
#, c-format
msgid "&Edit with Unpacker"
-msgstr "&Uredi v arhiverju"
+msgstr "&Uredi s pretvornikom"
#: Merge.rc:157
#: Merge.rc:278
@@ -647,12 +647,12 @@
#: Merge.rc:340
#, c-format
msgid "&Convert Line Endings to"
-msgstr "&Pretvori konec vrstice v"
+msgstr "&Pretvori konce vrstice v"
#: Merge.rc:342
#, c-format
msgid "&Windows (CRLF)"
-msgstr "&Okna (CRLF)"
+msgstr "&Windows (CRLF)"
#: Merge.rc:343
#, c-format
@@ -687,7 +687,7 @@
#: Merge.rc:358
#, c-format
msgid "Cu&t\tCtrl+X"
-msgstr "Od&re\x9Ei\tCtrl+X"
+msgstr "Iz&re\x9Ei\tCtrl+X"
#: Merge.rc:359
#, c-format
@@ -859,7 +859,7 @@
#: Merge.rc:461
#, c-format
msgid "&Prediffer"
-msgstr "&dodatki"
+msgstr "&Predpregled razlik"
#: Merge.rc:502
#, c-format
@@ -1023,17 +1023,17 @@
#: Merge.rc:577
#, c-format
msgid "Prediffer Settings"
-msgstr "Pred-nastavljene nastavitve"
+msgstr "Nastavitve predpregleda razlik"
#: Merge.rc:579
#, c-format
msgid "&No prediffer"
-msgstr "&Brez pred-nastavitev"
+msgstr "&Brez predpregleda razlik"
#: Merge.rc:580
#, c-format
msgid "Auto prediffer"
-msgstr "Samodejne pred-nastavitve"
+msgstr "Samodejen predpregled razlik"
#: Merge.rc:588
#, c-format
@@ -1073,7 +1073,7 @@
#: Merge.rc:670
#, c-format
msgid "Visit the WinMerge HomePage!"
-msgstr "Obi\x9A\xE8i WinMergino doma\xE8o stran"
+msgstr "Obi\x9A\xE8i doma\xE8o stran programa WinMerge"
#: Merge.rc:673
#: Merge.rc:705
@@ -1143,7 +1143,7 @@
#: Merge.rc:698
#, c-format
msgid "&Unpacker:"
-msgstr "&Arhiver:"
+msgstr "&Pretvornik:"
#: Merge.rc:701
#, c-format
@@ -1230,7 +1230,7 @@
#: Merge.rc:734
#, c-format
msgid "Check Out"
-msgstr "Preveri"
+msgstr "Check Out"
#: Merge.rc:735
#: Merge.rc:871
@@ -1365,13 +1365,13 @@
#: Merge.rc:845
#, c-format
msgid "Match &case"
-msgstr "Ujemanje z primerom"
+msgstr "Ujemanje z velikostjo \xE8rk"
#: Merge.rc:817
#: Merge.rc:847
#, c-format
msgid "Regular &expression"
-msgstr "&Stalen izraz"
+msgstr "&Regularni izraz"
#: Merge.rc:819
#, c-format
@@ -1448,7 +1448,7 @@
#: Merge.rc:869
#, c-format
msgid "CheckOut"
-msgstr "Preveri"
+msgstr "CheckOut"
#: Merge.rc:874
#: Merge.rc:1179
@@ -1459,7 +1459,7 @@
#: Merge.rc:877
#, c-format
msgid "CheckIn after checkout"
-msgstr "Ponovno preveri"
+msgstr "CheckIn po CheckOut-u"
#: Merge.rc:883
#, c-format
@@ -1474,7 +1474,7 @@
#: Merge.rc:889
#, c-format
msgid "Regular Expressions (one per line):"
-msgstr "Pravilni izrazi(eden na vrstico): "
+msgstr "Regularni izrazi (eden na vrstico): "
#: Merge.rc:896
#, c-format
@@ -1621,7 +1621,7 @@
#: Merge.rc:1013
#, c-format
msgid "Patch Generator"
-msgstr "Generator paketov"
+msgstr "Generator datotek s popravki..."
#: Merge.rc:1016
#, c-format
@@ -1721,22 +1721,22 @@
#: Merge.rc:1090
#, c-format
msgid "Select Unpacker"
-msgstr "Izberite orodje za odpakiranje"
+msgstr "Izberite Pretvornik"
#: Merge.rc:1095
#, c-format
msgid "File unpacker:"
-msgstr "Arhivske datoteke:"
+msgstr "Pretvornik za datoteke:"
#: Merge.rc:1098
#, c-format
msgid "Display all unpackers, don't check the extension"
-msgstr "Prika\x9Ei vsa orodja za stiskanje, ne preverjaj kon\xE8nice"
+msgstr "Prika\x9Ei vse pretvornike, ne glede na kon\xE8nico"
#: Merge.rc:1101
#, c-format
msgid "Extensions list:"
-msgstr "Popis kon\xE8nic"
+msgstr "Popis kon\xE8nic:"
#: Merge.rc:1102
#, c-format
@@ -1787,7 +1787,7 @@
#: Merge.rc:1139
#, c-format
msgid "Goto what"
-msgstr "V datoteki"
+msgstr "Pojdi na"
#: Merge.rc:1140
#, c-format
@@ -1879,7 +1879,7 @@
#: Merge.rc:1943
#, c-format
msgid "Editor"
-msgstr "Urejevanlnik"
+msgstr "Urejevalnik"
#: Merge.rc:1190
#, c-format
@@ -1894,7 +1894,7 @@
#: Merge.rc:1194
#, c-format
msgid "&Preserve original EOL chars"
-msgstr "Obdr\x9Ei izvorni na\xE8in ozna\xE8evanje"
+msgstr "Obdr\x9Ei izvorni na\xE8in znakov za konec vrstice (EOL)"
#: Merge.rc:1196
#, c-format
@@ -2016,7 +2016,7 @@
#: Merge.rc:1268
#, c-format
msgid "Default Codepage"
-msgstr "Standartna kodna tabela"
+msgstr "Standardna kodna tabela"
#: Merge.rc:1269
#, c-format
@@ -2025,8 +2025,12 @@
#: Merge.rc:1271
#, c-format
-msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session"
-msgstr "Zaznaj kodno tabelo za datoteke s kon\xE8nico: .html, .rc, .xml \npotreben je ponovni zagon seje"
+msgid ""
+"Detect codepage info for these files: .html, .rc, .xml \n"
+"need to restart session"
+msgstr ""
+"Zaznaj kodno tabelo za datoteke s kon\xE8nico: .html, .rc, .xml \n"
+"potreben je ponovni zagon seje"
#: Merge.rc:1274
#, c-format
@@ -2036,7 +2040,7 @@
#: Merge.rc:1276
#, c-format
msgid "According to WinMerge User Interface"
-msgstr "Po mnenju WinMerge uporabni\x9Akega vmesnika"
+msgstr "Glede na WinMerge uporabni\x9Aki vmesnik"
#: Merge.rc:1278
#, c-format
@@ -2064,7 +2068,7 @@
#: Merge.rc:1294
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
-msgstr "Name\x9A\xE8eni morajo biti tudi pravi vmesniki (Merge7z*.dll) na poti do njega"
+msgstr "Name\x9A\xE8eni morajo biti tudi prave raz\x9Airitve (Merge7z*.dll) na sistemski poti (PATH)."
#: Merge.rc:1296
#, c-format
@@ -2072,8 +2076,8 @@
"Please use the version of 7-Zip recommended below until interface plugins for later\n"
"versions become available."
msgstr ""
-"Prosim, uporabite razli\xE8ico programa 7-Zip ni\x9Ejo verzijo, dokler ne bodo dostopne nove raz\x9Airitve\n"
-"razli\xE8ice postanejo razpolo\x9Eljive"
+"Prosim, uporabite razli\xE8ico programa 7-Zip priporo\xE8eno ni\x9Eje, dokler ne bo na voljo\n"
+"raz\x9Airitev za nove razli\xE8ice."
#: Merge.rc:1298
#, c-format
@@ -2134,7 +2138,7 @@
#: Merge.rc:1319
#, c-format
msgid "Plugins on path:"
-msgstr "Pot do vmesnikov"
+msgstr "Raz\x9Airitve na poti:"
#: Merge.rc:1320
#, c-format
@@ -2148,7 +2152,7 @@
#: Merge.rc:1324
#, c-format
msgid "Plugin Download"
-msgstr "Prenos vti\xE8nikov"
+msgstr "Prenos raz\x9Airitev"
#: Merge.rc:1333
#, c-format
@@ -2203,7 +2207,7 @@
#: Merge.rc:1361
#, c-format
msgid "Preprocessor:"
-msgstr "Preprocesirano"
+msgstr "Preprocesirano:"
#: Merge.rc:1362
#, c-format
@@ -2285,12 +2289,12 @@
#: Merge.rc:1452
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
-msgstr "Podpora za arhivske datoteke zahteva 7-zip name\x9A\xE8en vti\xE8nik:"
+msgstr "Podpora za arhivske datoteke zahteva name\x9A\xE8eno raz\x9Airitev 7-zip:"
#: Merge.rc:1454
#, c-format
msgid "Download 7-zip Plugin"
-msgstr "Prenosi 7-zip vti\xE8nik"
+msgstr "Prenesi 7-zip raz\x9Airitev"
#: Merge.rc:1455
#, c-format
@@ -2583,23 +2587,23 @@
#: Merge.rc:1657
#, c-format
msgid "Plugins"
-msgstr ""
+msgstr "Raz\x9Airitve"
#: Merge.rc:1660
#, c-format
msgid "&Enable plugins"
-msgstr ""
+msgstr "&Omogo\xE8i raz\x9Airitve"
#: Merge.rc:1671
#: Merge.rc:1952
#, c-format
msgid "Shell Integration"
-msgstr ""
+msgstr "Integracija v lupino"
#: Merge.rc:1674
#, c-format
msgid "Explorer"
-msgstr ""
+msgstr "Explorer"
#: Merge.rc:1675
#, c-format
@@ -2762,17 +2766,17 @@
#: Merge.rc:1770
#, c-format
msgid "Toggle tree mode"
-msgstr ""
+msgstr "Zamenjaj drevesni na\xE8in"
#: Merge.rc:1771
#, c-format
msgid "Expand all subfolders"
-msgstr ""
+msgstr "Raz\x9Airi vse podmape"
#: Merge.rc:1772
#, c-format
msgid "Collapse all subfolders"
-msgstr ""
+msgstr "Skr\xE8i vse podmape"
#: Merge.rc:1778
#, c-format
@@ -2879,7 +2883,7 @@
"Arrange windows so they overlap\n"
"Cascade Windows"
msgstr ""
-"Zarvrsti okna kaskadno\n"
+"Razvrsti okna kaskadno, s prekrivanjem \n"
"Kaskadno"
#: Merge.rc:1824
@@ -3117,7 +3121,7 @@
#: Merge.rc:1888
#, c-format
msgid "Preserve original EOL chars"
-msgstr "Zadr\x9Ei izvorne znake EOL"
+msgstr "Obdr\x9Ei izvorne znake za konec vrstice (EOL)"
#: Merge.rc:1895
#, c-format
@@ -3142,7 +3146,7 @@
#: Merge.rc:1909
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."
-msgstr "WinMerge je program brez GARANCIJE. To je brezpla\xE8na programska oprema, izdana pod GNU licenco.Ve\xE8 podatkov najdete v meniju pomo\xE8."
+msgstr "WinMerge prihaja POPOLNOMA BREZ GARANCIJE. To je brezpla\xE8na programska oprema, dobrodo\x9Ali ste za njeno raz\x9Airjanje pod dolo\xE8enimi pogoji, ve\xE8 v GNU licenci v meniju Pomo\xE8."
#: Merge.rc:1915
#, c-format
@@ -3267,7 +3271,7 @@
#: Merge.rc:1971
#, c-format
msgid "X64"
-msgstr ""
+msgstr "X64"
#: Merge.rc:1977
#, c-format
@@ -3486,7 +3490,7 @@
#: Merge.rc:2043
#, c-format
msgid "Locate filter file to install"
-msgstr "Lociraj filter datoteko za name\x9A\xE8anje"
+msgstr "Poi\x9A\xE8i filter datoteko za namestitev"
#: Merge.rc:2045
#, c-format
@@ -3507,17 +3511,23 @@
#: Merge.rc:2053
#, c-format
msgid "Regular expression"
-msgstr "Reden izraz"
+msgstr "Regularni izraz"
#: Merge.rc:2059
#, c-format
-msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
+msgid ""
+"Filters were updated. Do you want to refresh all open folder compares?\n"
+"\n"
+"If you do not want to refresh all compares now you can select No and refresh compares later."
msgstr ""
+"Filtri so bili posodobljeni. Ali \x9Eelite osve\x9Eiti vse odprte mape za primerjavo?\n"
+"\n"
+"\xC8e jih ne \x9Eelite osve\x9Eiti sedaj, lahko izberete Ne in osve\x9Eite primerjave kasneje."
#: Merge.rc:2066
#, c-format
msgid "&Path to SS.EXE:"
-msgstr ""
+msgstr "&Pot do SS.EXE:"
#: Merge.rc:2072
#, c-format
@@ -3602,17 +3612,17 @@
#: Merge.rc:2093
#, c-format
msgid "Undoing the last operation..."
-msgstr ""
+msgstr "Razveljavi zadnje dejanje..."
#: Merge.rc:2094
#, c-format
msgid "Redoing the previous operation..."
-msgstr ""
+msgstr "Ponovi zadnje dejanje..."
#: Merge.rc:2100
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
-msgstr "Vr: %s St: %d/%d znak: %d/%d mesto: %s"
+msgstr "Vr: %s St: %d/%d znak: %d/%d EOL: %s"
#: Merge.rc:2101
#, c-format
@@ -3648,7 +3658,7 @@
#: Merge.rc:2107
#, c-format
msgid "RO"
-msgstr "RO"
+msgstr "SZB"
#: Merge.rc:2113
#, c-format
@@ -3693,7 +3703,7 @@
#: Merge.rc:2126
#, c-format
msgid "Choose two files to enable unpacker selection."
-msgstr "Izberi dve datoteki, da boste omogo\xE8ili izbiro arhiverja"
+msgstr "Izberi dve datoteki, da boste omogo\xE8ili izbiro pretvornika"
#: Merge.rc:2127
#, c-format
@@ -3708,7 +3718,7 @@
#: Merge.rc:2134
#, c-format
msgid "File not unpacked: %1"
-msgstr "Datoteka ni razpakirana: %1"
+msgstr "Datoteka ni pretvorjena: %1"
#: Merge.rc:2135
#, c-format
@@ -3757,7 +3767,7 @@
#: Merge.rc:2146
#, c-format
msgid "Error checking destination writeability"
-msgstr "Napaka pri preverjanju cilja mo\x9Enosti zapisovanja"
+msgstr "Napaka pri preverjanju mo\x9Enosti zapisovanja cilja"
#: Merge.rc:2147
#, c-format
@@ -3803,7 +3813,7 @@
"\n"
"Do you want to save the unpacked version to another file?"
msgstr ""
-"Dodatek '%2' ne more zapakirati va\x9Aih sprememb v levo datoteko (nazaj v njo) '%1'.\n"
+"Raz\x9Airitev '%2' ne more zapakirati va\x9Aih sprememb nazaj v levo datoteko '%1'.\n"
"\n"
"Izvorna datoteka ne bo spremenjena.\n"
"\n"
@@ -3818,9 +3828,9 @@
"\n"
"Do you want to save the unpacked version to another file?"
msgstr ""
-"Dodatek '%2' ne more zapakirati va\x9Aih sprememb v desno datoteko (nazaj v njo) '%1'.\n"
+"Raz\x9Airitev '%2' ne more zapakirati va\x9Aih sprememb nazaj v desno datoteko '%1'.\n"
"\n"
-"Izvorna datoteka ni spremenjena.\n"
+"Izvorna datoteka ne bo spremenjena.\n"
"\n"
"Ali \x9Eelite shraniti nezapakirano razli\xE8ico v drugo datoteko?"
@@ -3846,12 +3856,22 @@
"is marked read-only. Would you like to override the read-only item?"
msgstr ""
"%1\n"
-"je ozna\xE8ena samo za branje.\x8Eelite prepisati predmet samo za branje?"
+"je ozna\xE8ena samo za branje. \x8Eelite prepisati predmet samo za branje?"
#: Merge.rc:2155
#, c-format
-msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
+msgid ""
+"Another application has updated file\n"
+"%1\n"
+"since WinMerge scanned it last time.\n"
+"\n"
+"Do you want to reload the file?"
msgstr ""
+"Drug program je posodobil datoteko\n"
+"%1\n"
+"odkar jo je WinMerge pregledal zadnji\xE8.\n"
+"\n"
+"Ali \x9Eelite posodobljeno ponovno nalo\x9Eiti?"
#: Merge.rc:2156
#, c-format
@@ -3865,8 +3885,14 @@
#: Merge.rc:2158
#, c-format
-msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
+msgid ""
+"The file\n"
+"%1\n"
+"has disappeared. Please save a copy of the file to continue."
msgstr ""
+"Datoteke\n"
+"%1\n"
+"ne najdem ve\xE8. Prosim shranite kopijo datoteke za nadaljevanje."
#: Merge.rc:2164
#, c-format
@@ -3887,12 +3913,12 @@
#: Merge.rc:2171
#, c-format
msgid "Checkout files from VSS..."
-msgstr "Preveri datoteke iz VSS ..."
+msgstr "CheckOut datotek iz VSS ..."
#: Merge.rc:2172
#, c-format
msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..."
-msgstr "Versioning System je vrnil napako medtem ko je posku\x9Aal preveriti datoteko. Ni mogo\xE8e nadaljevati..."
+msgstr "Versioning System je vrnil napako medtem ko je posku\x9Aal dostopati do datoteke. Ni mogo\xE8e nadaljevati..."
#: Merge.rc:2173
#, c-format
@@ -3921,9 +3947,9 @@
" Please, check config spec of used view.\n"
" Undo checkout operation?"
msgstr ""
-"Versioning System vra\xE8a napako med preverjanjem datoteke...\n"
+"Versioning System je vrnil napako med preverjanjem datoteke...\n"
"Prosim preverite nastavitvene specifikacije uporabljenega pogleda.\n"
-" Zavrzi pregledno operacijo?"
+"Zavrzi pregledno operacijo?"
#: Merge.rc:2178
#, c-format
@@ -3953,12 +3979,12 @@
#: Merge.rc:2188
#, c-format
msgid "Break at whitespace"
-msgstr "Prelomi na praznini"
+msgstr "Prelom na presledku"
#: Merge.rc:2189
#, c-format
msgid "Break at whitespace or punctuation"
-msgstr "Prelomi na praznini ali lo\xE8ilu"
+msgstr "Prelom na presledku ali lo\xE8ilu"
#: Merge.rc:2195
#: Merge.rc:2197
@@ -4000,22 +4026,22 @@
#: Merge.rc:2204
#, c-format
msgid "Right to Left (%1)"
-msgstr "Od desne proti levi (%1)"
+msgstr "Z desne proti levi (%1)"
#: Merge.rc:2205
#, c-format
msgid "Left to Right (%1)"
-msgstr "Od leve proti desni (%1)"
+msgstr "Z leve proti desni (%1)"
#: Merge.rc:2206
#, c-format
msgid "Right to Left (%1 of %2)"
-msgstr "Od desne proti levi (%1 od %2)"
+msgstr "Z desne proti levi (%1 od %2)"
#: Merge.rc:2207
#, c-format
msgid "Left to Right (%1 of %2)"
-msgstr "Od leve proti desni (%1 od %2)"
+msgstr "Z leve proti desni (%1 od %2)"
#: Merge.rc:2208
#: Merge.rc:2224
@@ -4285,7 +4311,7 @@
#: Merge.rc:2293
#, c-format
msgid "Extension"
-msgstr "Raz\x9Airitev"
+msgstr "Kon\xE8nica"
#: Merge.rc:2294
#, c-format
@@ -4350,12 +4376,12 @@
#: Merge.rc:2311
#, c-format
msgid "Left EOL"
-msgstr "Konec dela levo"
+msgstr "Znake za konec vrstice (EOL) na levi"
#: Merge.rc:2312
#, c-format
msgid "Right EOL"
-msgstr "Konec dela desno"
+msgstr "Znake za konec vrstice (EOL) na desni"
#: Merge.rc:2318
#, c-format
@@ -4501,7 +4527,7 @@
#: Merge.rc:2367
#, c-format
msgid "File's extension."
-msgstr "Datote\xE8ne raz\x9Airitve"
+msgstr "Datote\xE8na kon\xE8nica."
#: Merge.rc:2368
#, c-format
@@ -4566,12 +4592,12 @@
#: Merge.rc:2385
#, c-format
msgid "Left side file EOL type"
-msgstr "Leva stran datoteke EOL tipa"
+msgstr "Tip znakov za konec vrstice (EOL) na levi"
#: Merge.rc:2386
#, c-format
msgid "Right side file EOL type"
-msgstr "Desna stran datoteke EOL tipa"
+msgstr "Tip znakov za konec vrstice (EOL) na desni"
#: Merge.rc:2392
#, c-format
@@ -4660,7 +4686,7 @@
#: Merge.rc:2419
#, c-format
msgid "Temporary files could not be created. Check your temporary path settings."
-msgstr "Za\xE8asne datoteko ne morejo biti ustvarjene. Preverite nastavitve za va\x9Ao za\xE8asno pot."
+msgstr "Za\xE8asne datoteko ne morejo biti ustvarjene. Preverite nastavitve za va\x9Ao pot zanje (PATH)."
#: Merge.rc:2420
#, c-format
@@ -4684,14 +4710,14 @@
" With the current options, they will be unified to the main type.\n"
" Do you want to change the options and preserve the different EOL ?"
msgstr ""
-"EOL razli\xE8ni formati (Windows/Unix/Mac) v datoteki '%1'.\n"
-"Z trenutnimi opcijami, bodo nedefinirane v osnovnem tipu.\n"
-"Ali \x9Eelite spremeniti opcije in prepre\xE8iti razli\xE8ne EOL ?"
+"Zaklju\xE8ki vrstic (EOL) so razli\xE8nega tipa (Windows/Unix/Mac) v datoteki '%1'.\n"
+"S trenutno nastavitvijo, bodo poenotene v glavnem tipu.\n"
+"Ali \x9Eelite spremeniti nastavitev in ohraniti razli\xE8ne zaklju\xE8ke vrstic?"
#: Merge.rc:2422
#, c-format
msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
-msgstr "Pojavila se je napaka med 'prediffing' datoteke '%1' z dodatkom '%2'. Prediffing se ne bo ve\xE8 izvajal"
+msgstr "Pojavila se je napaka med predpregledom razlik datoteke '%1' z raz\x9Airitvijo '%2'. Predpregled razlik se ne bo ve\xE8 izvajal."
#: Merge.rc:2423
#, c-format
@@ -4752,7 +4778,7 @@
#: Merge.rc:2441
#, c-format
msgid "No difference"
-msgstr "Ni razlike"
+msgstr "Ni razlik"
#: Merge.rc:2442
#, c-format
@@ -4792,7 +4818,7 @@
#: Merge.rc:2469
#, c-format
msgid "Patch file successfully written."
-msgstr "Paketna datoteka je bila uspe\x9Ano zapisana"
+msgstr "Datoteka s popravki je bila uspe\x9Ano zapisana"
#: Merge.rc:2470
#, c-format
@@ -4807,7 +4833,7 @@
#: Merge.rc:2472
#, c-format
msgid "The patch file already exists. Do you want to overwrite it?"
-msgstr "Paketna datoteka \x9Ee obstaja. Jo \x9Eelite prepisati?"
+msgstr "Datoteka s popravki \x9Ee obstaja. Jo \x9Eelite prepisati?"
#: Merge.rc:2473
#, c-format
@@ -4847,12 +4873,12 @@
#: Merge.rc:2480
#, c-format
msgid "Cannot create a patch file from binary files."
-msgstr "Ni mogo\xE8e izdelati paketne datotek iz binarnih datotek"
+msgstr "Ni mogo\xE8e izdelati datoteke s popravki iz binarnih datotek."
#: Merge.rc:2481
#, c-format
msgid "Cannot create a patch file from directories."
-msgstr "Ne morem izdelati paketne datoteke iz map"
+msgstr "Ni mogo\xE8e izdelati datoteke s popravki iz iz map."
#: Merge.rc:2482
#, c-format
@@ -4863,7 +4889,7 @@
msgstr ""
"Prosimo, najprej shranite vse datoteke.\n"
" \n"
-"Izdelava paketa zahteva, da so vse datoteke predhodno shranjene."
+"Izdelava datoteke s popravki zahteva, da so vse datoteke predhodno shranjene."
#: Merge.rc:2483
#, c-format
@@ -4917,7 +4943,7 @@
#: Merge.rc:2494
#, c-format
msgid "Options imported from the file."
-msgstr "Mo\x9Enosti uvo\x9Eene iz datoteko"
+msgstr "Mo\x9Enosti uvo\x9Eene iz datoteke"
#: Merge.rc:2495
#, c-format
@@ -4948,12 +4974,12 @@
#: Merge.rc:2504
#, c-format
msgid "Regular expression error"
-msgstr "Napaka algoritma"
+msgstr "Napaka regularnega izraza "
#: Merge.rc:2505
#, c-format
msgid "No match"
-msgstr "Ni povezave"
+msgstr "Ni enakosti"
#: Merge.rc:2506
#, c-format
@@ -4978,22 +5004,22 @@
#: Merge.rc:2510
#, c-format
msgid "Invalid back reference"
-msgstr "Neveljavna zadnje priporo\xE8ilo"
+msgstr "Neveljavno zadnje priporo\xE8ilo"
#: Merge.rc:2511
#, c-format
msgid "Unmatched [ or [^"
-msgstr "Naujemajo\xE8e: [ ali [^"
+msgstr "Neujemajo\xE8e: [ ali [^"
#: Merge.rc:2512
#, c-format
msgid "Unmatched ( or \\("
-msgstr "Naujemajo\xE8e: ( ali \\("
+msgstr "Neujemajo\xE8e: ( ali \\("
#: Merge.rc:2513
#, c-format
msgid "Unmatched \\{"
-msgstr "Naujemajo\xE8e: \\{"
+msgstr "Neujemajo\xE8e: \\{"
#: Merge.rc:2514
#, c-format
@@ -5008,27 +5034,27 @@
#: Merge.rc:2516
#, c-format
msgid "Out of memory"
-msgstr "Pomankanje pomnilnika"
+msgstr "Pomanjkanje pomnilnika"
#: Merge.rc:2517
#, c-format
msgid "Invalid preceding regular expression"
-msgstr "Napa\xE8en stalen izraz"
+msgstr "Napa\xE8en predhodni regularni izraz"
#: Merge.rc:2518
#, c-format
msgid "Premature end of regular expression"
-msgstr "Pred\xE8asen konec danega izraza"
+msgstr "Pred\xE8asen konec regularnega izraza"
#: Merge.rc:2519
#, c-format
msgid "Regular expression too big"
-msgstr "Dani izraz je prevelik"
+msgstr "Regularni izraz je prevelik"
#: Merge.rc:2524
#, c-format
msgid "Unmatched ) or \\)"
-msgstr "Naujemajo\xE8e ) ali \\)"
+msgstr "Neujemajo\xE8e ) ali \\)"
#: Merge.rc:2530
#, c-format
@@ -5369,12 +5395,12 @@
#: Merge.rc:2656
#, c-format
msgid "Unpacker"
-msgstr "arhiver"
+msgstr "Pretvornik"
#: Merge.rc:2657
#, c-format
msgid "Prediffer"
-msgstr "Prediffer"
+msgstr "Predpregled razlik"
#: Merge.rc:2658
#, c-format
@@ -5414,17 +5440,17 @@
#: Merge.rc:2671
#, c-format
msgid "Convert EOL to Windows mode"
-msgstr "Pretvori EOL v Windows na\xE8in"
+msgstr "Pretvori znake za konec vrstice (EOL) v Windows na\xE8in"
#: Merge.rc:2672
#, c-format
msgid "Convert EOL to Unix mode"
-msgstr "Pretvori EOL v Unix na\xE8in"
+msgstr "Pretvori znake za konec vrstice (EOL) v Unix na\xE8in"
#: Merge.rc:2673
#, c-format
msgid "Convert EOL to Mac mode"
-msgstr "Pretvori EOL v Mac na\xE8in"
+msgstr "Pretvori znake za konec vrstice (EOL) v Mac na\xE8in"
#: Merge.rc:2674
#, c-format
@@ -5785,7 +5811,7 @@
#: Merge.rc:2747
#, c-format
msgid "Generate a patch-file"
-msgstr "Izdelaj paketno datoteko "
+msgstr "Izdelaj datoteko s popravki"
#: Merge.rc:2748
#, c-format
@@ -5805,37 +5831,37 @@
#: Merge.rc:2756
#, c-format
msgid "The user selects the unpacker (no unpacking when comparing dir)"
-msgstr "Uporabnik izbere arhiver (razpakiranje ne deluje med primerjanjem map)"
+msgstr "Uporabnik izbere pretvornik (brez pretvarjanja med primerjanjem map)"
#: Merge.rc:2757
#, c-format
msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
-msgstr "Prilagojen arhiver je uporaben na obeh datotekah (samo ena datoteka potrebuje raz\x9Airitev)"
+msgstr "Izbran pretvornik je uporabljen na obeh datotekah (samo ena datoteka potrebuje kon\xE8nico)"
#: Merge.rc:2758
#, c-format
msgid "Select an unpacker to edit this file"
-msgstr "Izberite arhiver za urejanje naslednje datoteke"
+msgstr "Izberite pretvornik za urejanje te datoteke"
#: Merge.rc:2759
#, c-format
msgid "No prediffer (normal)"
-msgstr "Brez datotek (obi\xE8ajno)"
+msgstr "Brez predpregleda razlik (obi\xE8ajno)"
#: Merge.rc:2760
#, c-format
msgid "Suggested plugins"
-msgstr "Priporo\xE8ljivi dodatki"
+msgstr "Priporo\xE8ene raz\x9Airitve"
#: Merge.rc:2761
#, c-format
msgid "Other plugins"
-msgstr "Ostali dodatki"
+msgstr "Ostale raz\x9Airitve"
#: Merge.rc:2762
#, c-format
msgid "Unload all plugins and reload them (for developers)"
-msgstr "Ponovno nalo\x9Ei vse dodatke(za izdelovalce)"
+msgstr "Ponovno nalo\x9Ei vse raz\x9Airitve (za razvijalce)"
#: Merge.rc:2768
#, c-format
@@ -5896,17 +5922,17 @@
#: Merge.rc:2786
#, c-format
msgid "Plugin Settings"
-msgstr "Nastavitve vmesnika"
+msgstr "Nastavitve raz\x9Airitev"
#: Merge.rc:2787
#, c-format
msgid "No prediffer"
-msgstr "Brez dodatkov"
+msgstr "Brez predpregleda razlik"
#: Merge.rc:2788
#, c-format
msgid "Prediff if possible"
-msgstr "Prediff \xE8e je mogo\xE8e"
+msgstr "Predpregled razlik, \xE8e je mogo\xE8e"
#: Merge.rc:2790
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-01-15 17:46:28
|
Revision: 7108
http://winmerge.svn.sourceforge.net/winmerge/?rev=7108&view=rev
Author: gerundt
Date: 2010-01-15 17:46:17 +0000 (Fri, 15 Jan 2010)
Log Message:
-----------
PATCH: [ 2932094 ] Updated Slovenian translation for stable and unstable trunk
Submitted by Filip Komar
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Translations/ShellExtension/Slovenian.po
trunk/Translations/WinMerge/Slovenian.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-01-14 21:43:14 UTC (rev 7107)
+++ trunk/Docs/Users/ChangeLog.txt 2010-01-15 17:46:17 UTC (rev 7108)
@@ -18,7 +18,7 @@
Bugfix: Automatic rescanning was not disabled everywhere (r7086,r7089)
Bugfix: Quick contents compare didn't ignore EOL byte differences (#2929005)
Translation updates:
- - Slovenian (#2917796)
+ - Slovenian (#2917796, #2932094)
- Spanish (#2930734)
WinMerge 2.13.10 2009-12-21 (r7051)
Modified: trunk/Translations/ShellExtension/Slovenian.po
===================================================================
--- trunk/Translations/ShellExtension/Slovenian.po 2010-01-14 21:43:14 UTC (rev 7107)
+++ trunk/Translations/ShellExtension/Slovenian.po 2010-01-15 17:46:17 UTC (rev 7108)
@@ -1,6 +1,9 @@
# This file is part from WinMerge <http://winmerge.org/>
# Released under the "GNU General Public License"
#
+# Translators:
+# * Filip Komar <filip.komar at gmail.com>
+#
# ID line follows -- this is updated by SVN
# $Id$
#
@@ -9,11 +12,11 @@
"Project-Id-Version: WinMerge Shell Extension\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
+"PO-Revision-Date: 2010-01-14 19:36+0100\n"
+"Last-Translator: Filip Komar <fil...@gm...>\n"
"Language-Team: Slovenian <win...@li...>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=CP1250\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Slovenian\n"
"X-Poedit-SourceCharset: CP1250\n"
@@ -40,50 +43,50 @@
#: ShellExtensionTemplate.rc:42
#, c-format
msgid "ShellExtension"
-msgstr ""
+msgstr "Raz\x9Airitev integracije v lupino"
#: ShellExtensionTemplate.rc:43
#, c-format
msgid "WinMerge"
-msgstr ""
+msgstr "WinMerge"
-#: ShellExtensionTemplate.rc:44
+#: ShellExtensionTemplate.rc:43
#, c-format
msgid "Open with WinMerge"
-msgstr ""
+msgstr "Odpri z WinMerge"
-#: ShellExtensionTemplate.rc:45
+#: ShellExtensionTemplate.rc:44
#, c-format
msgid "Please select no more than 2 items"
-msgstr ""
+msgstr "Prosimo izberite najve\xE8 2 predmeta"
#: ShellExtensionTemplate.rc:46
#, c-format
msgid "Compare"
-msgstr ""
+msgstr "Primerjaj"
#: ShellExtensionTemplate.rc:47
#, c-format
msgid "Compare..."
-msgstr ""
+msgstr "Primerjaj..."
#: ShellExtensionTemplate.rc:48
#, c-format
msgid "Compare To"
-msgstr ""
+msgstr "Primerjaj z"
#: ShellExtensionTemplate.rc:49
#, c-format
msgid "Save this path. Select another path to compare with this path."
-msgstr ""
+msgstr "Shrani tole pot. Izberi \x9Ae drugo pot za primerjavo s tole."
#: ShellExtensionTemplate.rc:50
#, c-format
msgid "Compare to saved path (%1)"
-msgstr ""
+msgstr "Primerjaj s shranjeno potjo (%1)"
#: ShellExtensionTemplate.rc:51
#, c-format
msgid "Re-select First"
-msgstr ""
+msgstr "Ponovno izberite prvega"
Modified: trunk/Translations/WinMerge/Slovenian.po
===================================================================
--- trunk/Translations/WinMerge/Slovenian.po 2010-01-14 21:43:14 UTC (rev 7107)
+++ trunk/Translations/WinMerge/Slovenian.po 2010-01-15 17:46:17 UTC (rev 7108)
@@ -13,8 +13,8 @@
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2009-12-19 20:52+0100\n"
-"Last-Translator: Filip Komar <filip.komar at gmail.com>\n"
+"PO-Revision-Date: 2010-01-14 15:24+0100\n"
+"Last-Translator: Filip Komar <fil...@gm...>\n"
"Language-Team: Slovenian <win...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CP1250\n"
@@ -272,7 +272,7 @@
#: Merge.rc:452
#, c-format
msgid "&Generate Patch..."
-msgstr "&Generiraj paket..."
+msgstr "&Generiraj datoteko s popravki..."
#: Merge.rc:148
#: Merge.rc:272
@@ -291,33 +291,33 @@
#: Merge.rc:152
#, c-format
msgid "Ma&nual Prediffer"
-msgstr ""
+msgstr "&Ro\xE8ni predpregled razlik"
#: Merge.rc:153
#, c-format
msgid "A&utomatic Prediffer"
-msgstr ""
+msgstr "&Samodejni predpregled razlik"
#: Merge.rc:155
#: Merge.rc:276
#: Merge.rc:459
#, c-format
msgid "&Manual Unpacking"
-msgstr "&Ro\xE8no razpakiranje"
+msgstr "&Ro\xE8no pretvarjanje"
#: Merge.rc:156
#: Merge.rc:277
#: Merge.rc:460
#, c-format
msgid "&Automatic Unpacking"
-msgstr "&Samodejno razpakiranje"
+msgstr "&Samodejno pretvarjanje"
#: Merge.rc:158
#: Merge.rc:279
#: Merge.rc:462
#, c-format
msgid "&Edit with Unpacker"
-msgstr "&Uredi v arhiverju"
+msgstr "&Uredi s pretvornikom"
#: Merge.rc:160
#: Merge.rc:281
@@ -657,12 +657,12 @@
#: Merge.rc:343
#, c-format
msgid "&Convert Line Endings to"
-msgstr "&Pretvori konec vrstice v"
+msgstr "&Pretvori konce vrstice v"
#: Merge.rc:345
#, c-format
msgid "&Windows (CRLF)"
-msgstr "&Okna (CRLF)"
+msgstr "&Windows (CRLF)"
#: Merge.rc:346
#, c-format
@@ -697,7 +697,7 @@
#: Merge.rc:361
#, c-format
msgid "Cu&t\tCtrl+X"
-msgstr "Od&re\x9Ei\tCtrl+X"
+msgstr "Iz&re\x9Ei\tCtrl+X"
#: Merge.rc:362
#, c-format
@@ -839,7 +839,7 @@
#: Merge.rc:424
#, c-format
msgid "Diff &Pane"
-msgstr "Panel &razlika"
+msgstr "Panel &razlik"
#: Merge.rc:425
#, c-format
@@ -869,7 +869,7 @@
#: Merge.rc:464
#, c-format
msgid "&Prediffer"
-msgstr "&dodatki"
+msgstr "&Predpregled razlik"
#: Merge.rc:505
#, c-format
@@ -889,7 +889,7 @@
#: Merge.rc:509
#, c-format
msgid "&HEX"
-msgstr ""
+msgstr "&HEX"
#: Merge.rc:514
#, c-format
@@ -1038,17 +1038,17 @@
#: Merge.rc:581
#, c-format
msgid "Prediffer Settings"
-msgstr "Pred-nastavljene nastavitve"
+msgstr "Nastavitve predpregleda razlik"
#: Merge.rc:583
#, c-format
msgid "&No prediffer"
-msgstr "&Brez pred-nastavitev"
+msgstr "&Brez predpregleda razlik"
#: Merge.rc:584
#, c-format
msgid "Auto prediffer"
-msgstr "Samodejne pred-nastavitve"
+msgstr "Samodejen predpregled razlik"
#: Merge.rc:592
#, c-format
@@ -1088,7 +1088,7 @@
#: Merge.rc:676
#, c-format
msgid "Visit the WinMerge HomePage!"
-msgstr "Obi\x9A\xE8i WinMergino doma\xE8o stran"
+msgstr "Obi\x9A\xE8i doma\xE8o stran programa WinMerge"
#: Merge.rc:679
#: Merge.rc:711
@@ -1158,7 +1158,7 @@
#: Merge.rc:704
#, c-format
msgid "&Unpacker:"
-msgstr "&Arhiver:"
+msgstr "&Pretvornik:"
#: Merge.rc:707
#, c-format
@@ -1245,7 +1245,7 @@
#: Merge.rc:740
#, c-format
msgid "Check Out"
-msgstr "Preveri"
+msgstr "Check Out"
#: Merge.rc:741
#: Merge.rc:877
@@ -1381,13 +1381,13 @@
#: Merge.rc:851
#, c-format
msgid "Match &case"
-msgstr "Ujemanje z primerom"
+msgstr "Ujemanje z velikostjo \xE8rk"
#: Merge.rc:823
#: Merge.rc:853
#, c-format
msgid "Regular &expression"
-msgstr "&Stalen izraz"
+msgstr "&Regularni izraz"
#: Merge.rc:825
#, c-format
@@ -1464,7 +1464,7 @@
#: Merge.rc:875
#, c-format
msgid "CheckOut"
-msgstr "Preveri"
+msgstr "CheckOut"
#: Merge.rc:880
#: Merge.rc:1175
@@ -1475,7 +1475,7 @@
#: Merge.rc:883
#, c-format
msgid "CheckIn after checkout"
-msgstr "Ponovno preveri"
+msgstr "CheckIn po CheckOut-u"
#: Merge.rc:889
#, c-format
@@ -1490,7 +1490,7 @@
#: Merge.rc:895
#, c-format
msgid "Regular Expressions (one per line):"
-msgstr "Pravilni izrazi(eden na vrstico): "
+msgstr "Regularni izrazi (eden na vrstico): "
#: Merge.rc:902
#, c-format
@@ -1639,7 +1639,7 @@
#: Merge.rc:1025
#, c-format
msgid "Patch Generator"
-msgstr "Generator paketov"
+msgstr "Generator datotek s popravki..."
#: Merge.rc:1028
#, c-format
@@ -1739,22 +1739,22 @@
#: Merge.rc:1102
#, c-format
msgid "Select Unpacker"
-msgstr "Izberite orodje za odpakiranje"
+msgstr "Izberite Pretvornik"
#: Merge.rc:1107
#, c-format
msgid "File unpacker:"
-msgstr "Arhivske datoteke:"
+msgstr "Pretvornik za datoteke:"
#: Merge.rc:1110
#, c-format
msgid "Display all unpackers, don't check the extension"
-msgstr "Prika\x9Ei vsa orodja za stiskanje, ne preverjaj kon\xE8nice"
+msgstr "Prika\x9Ei vse pretvornike, ne glede na kon\xE8nico"
#: Merge.rc:1113
#, c-format
msgid "Extensions list:"
-msgstr "Popis kon\xE8nic"
+msgstr "Popis kon\xE8nic:"
#: Merge.rc:1114
#, c-format
@@ -1805,7 +1805,7 @@
#: Merge.rc:1151
#, c-format
msgid "Goto what"
-msgstr "V datoteki"
+msgstr "Pojdi na"
#: Merge.rc:1152
#, c-format
@@ -1882,7 +1882,7 @@
#: Merge.rc:1958
#, c-format
msgid "Editor"
-msgstr "Urejevanlnik"
+msgstr "Urejevalnik"
#: Merge.rc:1185
#, c-format
@@ -1897,7 +1897,7 @@
#: Merge.rc:1189
#, c-format
msgid "&Preserve original EOL chars"
-msgstr "Obdr\x9Ei izvorni na\xE8in ozna\xE8evanje"
+msgstr "Obdr\x9Ei izvorni na\xE8in znakov za konec vrstice (EOL)"
#: Merge.rc:1191
#, c-format
@@ -1942,7 +1942,7 @@
#: Merge.rc:1209
#, c-format
msgid "W&ord break characters:"
-msgstr ""
+msgstr "&Znak za konec besede"
#: Merge.rc:1222
#, c-format
@@ -2012,7 +2012,7 @@
#: Merge.rc:1255
#, c-format
msgid "Disca&rd All"
-msgstr ""
+msgstr "&Zavr\x9Ei vse"
#: Merge.rc:1262
#: Merge.rc:1510
@@ -2024,7 +2024,7 @@
#: Merge.rc:1265
#, c-format
msgid "Default Codepage"
-msgstr "Standartna kodna tabela"
+msgstr "Standardna kodna tabela"
#: Merge.rc:1266
#, c-format
@@ -2033,8 +2033,12 @@
#: Merge.rc:1268
#, c-format
-msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session"
-msgstr "Zaznaj kodno tabelo za datoteke s kon\xE8nico: .html, .rc, .xml \npotreben je ponovni zagon seje"
+msgid ""
+"Detect codepage info for these files: .html, .rc, .xml \n"
+"need to restart session"
+msgstr ""
+"Zaznaj kodno tabelo za datoteke s kon\xE8nico: .html, .rc, .xml \n"
+"potreben je ponovni zagon seje"
#: Merge.rc:1271
#, c-format
@@ -2044,7 +2048,7 @@
#: Merge.rc:1273
#, c-format
msgid "According to WinMerge User Interface"
-msgstr "Po mnenju WinMerge uporabni\x9Akega vmesnika"
+msgstr "Glede na WinMerge uporabni\x9Aki vmesnik"
#: Merge.rc:1275
#, c-format
@@ -2072,7 +2076,7 @@
#: Merge.rc:1291
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
-msgstr "Name\x9A\xE8eni morajo biti tudi pravi vmesniki (Merge7z*.dll) na poti do njega"
+msgstr "Name\x9A\xE8eni morajo biti tudi prave raz\x9Airitve (Merge7z*.dll) na sistemski poti (PATH)."
#: Merge.rc:1293
#, c-format
@@ -2080,8 +2084,8 @@
"Please use the version of 7-Zip recommended below until interface plugins for later\n"
"versions become available."
msgstr ""
-"Prosim, uporabite razli\xE8ico programa 7-Zip ni\x9Ejo verzijo, dokler ne bodo dostopne nove raz\x9Airitve\n"
-"razli\xE8ice postanejo razpolo\x9Eljive"
+"Prosim, uporabite razli\xE8ico programa 7-Zip priporo\xE8eno ni\x9Eje, dokler ne bo na voljo\n"
+"raz\x9Airitev za nove razli\xE8ice."
#: Merge.rc:1295
#, c-format
@@ -2094,7 +2098,7 @@
"Plugin required\n"
"(dllbuild %04u)"
msgstr ""
-"Potreben vti\xE8nik\n"
+"Potrebna raz\x9Airitev\n"
"(dllbuild %04u)"
#: Merge.rc:1299
@@ -2142,7 +2146,7 @@
#: Merge.rc:1316
#, c-format
msgid "Plugins on path:"
-msgstr "Pot do vmesnikov"
+msgstr "Raz\x9Airitve na poti:"
#: Merge.rc:1317
#, c-format
@@ -2156,7 +2160,7 @@
#: Merge.rc:1321
#, c-format
msgid "Plugin Download"
-msgstr "Prenos vti\xE8nikov"
+msgstr "Prenos raz\x9Airitev"
#: Merge.rc:1330
#, c-format
@@ -2211,7 +2215,7 @@
#: Merge.rc:1358
#, c-format
msgid "Preprocessor:"
-msgstr "Preprocesirano"
+msgstr "Preprocesirano:"
#: Merge.rc:1359
#, c-format
@@ -2293,12 +2297,12 @@
#: Merge.rc:1449
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
-msgstr "Podpora za arhivske datoteke zahteva 7-zip name\x9A\xE8en vti\xE8nik:"
+msgstr "Podpora za arhivske datoteke zahteva name\x9A\xE8eno raz\x9Airitev 7-zip:"
#: Merge.rc:1451
#, c-format
msgid "Download 7-zip Plugin"
-msgstr "Prenosi 7-zip vti\xE8nik"
+msgstr "Prenesi 7-zip raz\x9Airitev"
#: Merge.rc:1452
#, c-format
@@ -2386,13 +2390,13 @@
#: Merge.rc:1513
#, c-format
msgid "Affects"
-msgstr "Spremembe"
+msgstr "Vpliva"
#: Merge.rc:1516
#: Merge.rc:1519
#, c-format
msgid "(Affects)"
-msgstr "(spremembe)"
+msgstr "(Vpliva)"
#: Merge.rc:1520
#, c-format
@@ -2591,23 +2595,23 @@
#: Merge.rc:1654
#, c-format
msgid "Plugins"
-msgstr ""
+msgstr "&Raz\x9Airitve"
#: Merge.rc:1657
#, c-format
msgid "&Enable plugins"
-msgstr ""
+msgstr "&Omogo\xE8i raz\x9Airitve"
#: Merge.rc:1668
#: Merge.rc:1967
#, c-format
msgid "Shell Integration"
-msgstr ""
+msgstr "Integracija v lupino"
#: Merge.rc:1671
#, c-format
msgid "Explorer"
-msgstr ""
+msgstr "Explorer"
#: Merge.rc:1672
#, c-format
@@ -2644,7 +2648,7 @@
#: Merge.rc:1689
#, c-format
msgid "&Compare method:"
-msgstr ""
+msgstr "&Metoda primerjave:"
#: Merge.rc:1691
#, c-format
@@ -2659,12 +2663,12 @@
#: Merge.rc:1695
#, c-format
msgid "&Include unique subfolders contents"
-msgstr ""
+msgstr "&Vklju\xE8i enkratne subfolders contents"
#: Merge.rc:1697
#, c-format
msgid "&Quick compare limit (MB):"
-msgstr ""
+msgstr "&Meja hitre primerjave (MB):"
#. StringFileInfo.Block
#: Merge.rc:1723
@@ -2802,17 +2806,17 @@
#: Merge.rc:1785
#, c-format
msgid "Toggle tree mode"
-msgstr ""
+msgstr "Zamenjaj drevesni na\xE8in"
#: Merge.rc:1786
#, c-format
msgid "Expand all subfolders"
-msgstr ""
+msgstr "Raz\x9Airi vse mape"
#: Merge.rc:1787
#, c-format
msgid "Collapse all subfolders"
-msgstr ""
+msgstr "Skr\xE8i vse mape"
#: Merge.rc:1793
#, c-format
@@ -2918,8 +2922,7 @@
msgid ""
"Arrange windows so they overlap\n"
"Cascade Windows"
-msgstr ""
-"Zarvrsti okna kaskadno\n"
+"Razvrsti okna kaskadno, s prekrivanjem \n"
"Kaskadno"
#: Merge.rc:1839
@@ -3157,7 +3160,7 @@
#: Merge.rc:1903
#, c-format
msgid "Preserve original EOL chars"
-msgstr "Zadr\x9Ei izvorne znake EOL"
+msgstr "Obdr\x9Ei izvorne znake za konec vrstice (EOL)"
#: Merge.rc:1910
#, c-format
@@ -3182,7 +3185,7 @@
#: Merge.rc:1924
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."
-msgstr "WinMerge je program brez GARANCIJE. To je brezpla\xE8na programska oprema, izdana pod GNU licenco.Ve\xE8 podatkov najdete v meniju pomo\xE8."
+msgstr "WinMerge prihaja POPOLNOMA BREZ GARANCIJE. To je brezpla\xE8na programska oprema, dobrodo\x9Ali ste za njeno raz\x9Airjanje pod dolo\xE8enimi pogoji, ve\xE8 v GNU licenci v meniju Pomo\xE8."
#: Merge.rc:1930
#, c-format
@@ -3257,7 +3260,7 @@
#: Merge.rc:1961
#, c-format
msgid "Syntax"
-msgstr ""
+msgstr "Sintaksa"
#: Merge.rc:1963
#, c-format
@@ -3308,7 +3311,7 @@
#: Merge.rc:1989
#, c-format
msgid "X64"
-msgstr ""
+msgstr "X64"
#: Merge.rc:1995
#, c-format
@@ -3527,7 +3530,7 @@
#: Merge.rc:2061
#, c-format
msgid "Locate filter file to install"
-msgstr "Lociraj filter datoteko za name\x9A\xE8anje"
+msgstr "Poi\x9A\xE8i filter datoteko za namestitev"
#: Merge.rc:2063
#, c-format
@@ -3548,17 +3551,23 @@
#: Merge.rc:2071
#, c-format
msgid "Regular expression"
-msgstr "Reden izraz"
+msgstr "Regularni izraz"
#: Merge.rc:2077
#, c-format
-msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
+msgid ""
+"Filters were updated. Do you want to refresh all open folder compares?\n"
+"\n"
+"If you do not want to refresh all compares now you can select No and refresh compares later."
msgstr ""
+"Filtri so bili posodobljeni. Ali \x9Eelite osve\x9Eiti vse odprte mape za primerjavo?\n"
+"\n"
+"\xC8e jih ne \x9Eelite osve\x9Eiti sedaj, lahko izberete Ne in osve\x9Eite primerjave kasneje."
#: Merge.rc:2084
#, c-format
msgid "&Path to SS.EXE:"
-msgstr ""
+msgstr "&Pot do SS.EXE:"
#: Merge.rc:2090
#, c-format
@@ -3643,17 +3652,17 @@
#: Merge.rc:2111
#, c-format
msgid "Undoing the last operation..."
-msgstr ""
+msgstr "Razveljavi zadnje dejanje..."
#: Merge.rc:2112
#, c-format
msgid "Redoing the previous operation..."
-msgstr ""
+msgstr "Ponovi zadnje dejanje..."
#: Merge.rc:2118
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
-msgstr "Vr: %s St: %d/%d znak: %d/%d mesto: %s"
+msgstr "Vr: %s St: %d/%d znak: %d/%d EOL: %s"
#: Merge.rc:2119
#, c-format
@@ -3689,7 +3698,7 @@
#: Merge.rc:2125
#, c-format
msgid "RO"
-msgstr "RO"
+msgstr "SZB"
#: Merge.rc:2131
#, c-format
@@ -3734,7 +3743,7 @@
#: Merge.rc:2144
#, c-format
msgid "Choose two files to enable unpacker selection."
-msgstr "Izberi dve datoteki, da boste omogo\xE8ili izbiro arhiverja"
+msgstr "Izberi dve datoteki, da boste omogo\xE8ili izbiro pretvornika"
#: Merge.rc:2145
#, c-format
@@ -3749,7 +3758,7 @@
#: Merge.rc:2152
#, c-format
msgid "File not unpacked: %1"
-msgstr "Datoteka ni razpakirana: %1"
+msgstr "Datoteka ni pretvorjena: %1"
#: Merge.rc:2153
#, c-format
@@ -3798,7 +3807,7 @@
#: Merge.rc:2164
#, c-format
msgid "Error checking destination writeability"
-msgstr "Napaka pri preverjanju cilja mo\x9Enosti zapisovanja"
+msgstr "Napaka pri preverjanju mo\x9Enosti zapisovanja cilja"
#: Merge.rc:2165
#, c-format
@@ -3844,7 +3853,7 @@
"\n"
"Do you want to save the unpacked version to another file?"
msgstr ""
-"Dodatek '%2' ne more zapakirati va\x9Aih sprememb v levo datoteko (nazaj v njo) '%1'.\n"
+"Raz\x9Airitev '%2' ne more zapakirati va\x9Aih sprememb nazaj v levo datoteko '%1'.\n"
"\n"
"Izvorna datoteka ne bo spremenjena.\n"
"\n"
@@ -3859,9 +3868,9 @@
"\n"
"Do you want to save the unpacked version to another file?"
msgstr ""
-"Dodatek '%2' ne more zapakirati va\x9Aih sprememb v desno datoteko (nazaj v njo) '%1'.\n"
+"Raz\x9Airitev '%2' ne more zapakirati va\x9Aih sprememb nazaj v desno datoteko '%1'.\n"
"\n"
-"Izvorna datoteka ni spremenjena.\n"
+"Izvorna datoteka ne bo spremenjena.\n"
"\n"
"Ali \x9Eelite shraniti nezapakirano razli\xE8ico v drugo datoteko?"
@@ -3887,12 +3896,22 @@
"is marked read-only. Would you like to override the read-only item?"
msgstr ""
"%1\n"
-"je ozna\xE8ena samo za branje.\x8Eelite prepisati predmet samo za branje?"
+"je ozna\xE8ena samo za branje. \x8Eelite prepisati predmet samo za branje?"
#: Merge.rc:2173
#, c-format
-msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
+msgid ""
+"Another application has updated file\n"
+"%1\n"
+"since WinMerge scanned it last time.\n"
+"\n"
+"Do you want to reload the file?"
msgstr ""
+"Drug program je posodobil datoteko\n"
+"%1\n"
+"odkar jo je WinMerge pregledal zadnji\xE8.\n"
+"\n"
+"Ali \x9Eelite posodobljeno ponovno nalo\x9Eiti?"
#: Merge.rc:2174
#, c-format
@@ -3906,8 +3925,14 @@
#: Merge.rc:2176
#, c-format
-msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
+msgid ""
+"The file\n"
+"%1\n"
+"has disappeared. Please save a copy of the file to continue."
msgstr ""
+"Datoteke\n"
+"%1\n"
+"ne najdem ve\xE8. Prosim shranite kopijo datoteke za nadaljevanje."
#: Merge.rc:2182
#, c-format
@@ -3928,12 +3953,12 @@
#: Merge.rc:2189
#, c-format
msgid "Checkout files from VSS..."
-msgstr "Preveri datoteke iz VSS ..."
+msgstr "CheckOut datotek iz VSS ..."
#: Merge.rc:2190
#, c-format
msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..."
-msgstr "Versioning System je vrnil napako medtem ko je posku\x9Aal preveriti datoteko. Ni mogo\xE8e nadaljevati..."
+msgstr "Versioning System je vrnil napako medtem ko je posku\x9Aal dostopati do datoteke. Ni mogo\xE8e nadaljevati..."
#: Merge.rc:2191
#, c-format
@@ -3962,9 +3987,9 @@
" Please, check config spec of used view.\n"
" Undo checkout operation?"
msgstr ""
-"Versioning System vra\xE8a napako med preverjanjem datoteke...\n"
+"Versioning System je vrnil napako med preverjanjem datoteke...\n"
"Prosim preverite nastavitvene specifikacije uporabljenega pogleda.\n"
-" Zavrzi pregledno operacijo?"
+"Zavrzi pregledno operacijo?"
#: Merge.rc:2196
#, c-format
@@ -3994,12 +4019,12 @@
#: Merge.rc:2206
#, c-format
msgid "Break at whitespace"
-msgstr "Prelomi na praznini"
+msgstr "Prelom na presledku"
#: Merge.rc:2207
#, c-format
msgid "Break at whitespace or punctuation"
-msgstr "Prelomi na praznini ali lo\xE8ilu"
+msgstr "Prelom na presledku ali lo\xE8ilu"
#: Merge.rc:2213
#: Merge.rc:2215
@@ -4041,22 +4066,22 @@
#: Merge.rc:2222
#, c-format
msgid "Right to Left (%1)"
-msgstr "Od desne proti levi (%1)"
+msgstr "Z desne proti levi (%1)"
#: Merge.rc:2223
#, c-format
msgid "Left to Right (%1)"
-msgstr "Od leve proti desni (%1)"
+msgstr "Z leve proti desni (%1)"
#: Merge.rc:2224
#, c-format
msgid "Right to Left (%1 of %2)"
-msgstr "Od desne proti levi (%1 od %2)"
+msgstr "Z desne proti levi (%1 od %2)"
#: Merge.rc:2225
#, c-format
msgid "Left to Right (%1 of %2)"
-msgstr "Od leve proti desni (%1 od %2)"
+msgstr "Z leve proti desni (%1 od %2)"
#: Merge.rc:2226
#: Merge.rc:2242
@@ -4321,7 +4346,7 @@
#: Merge.rc:2311
#, c-format
msgid "Extension"
-msgstr "Raz\x9Airitev"
+msgstr "Kon\xE8nica"
#: Merge.rc:2312
#, c-format
@@ -4386,12 +4411,12 @@
#: Merge.rc:2329
#, c-format
msgid "Left EOL"
-msgstr "Konec dela levo"
+msgstr "Znake za konec vrstice (EOL) na levi"
#: Merge.rc:2330
#, c-format
msgid "Right EOL"
-msgstr "Konec dela desno"
+msgstr "Znake za konec vrstice (EOL) na desni"
#: Merge.rc:2336
#, c-format
@@ -4532,7 +4557,7 @@
#: Merge.rc:2385
#, c-format
msgid "File's extension."
-msgstr "Datote\xE8ne raz\x9Airitve"
+msgstr "Datote\xE8na kon\xE8nica."
#: Merge.rc:2386
#, c-format
@@ -4597,12 +4622,12 @@
#: Merge.rc:2403
#, c-format
msgid "Left side file EOL type"
-msgstr "Leva stran datoteke EOL tipa"
+msgstr "Tip znakov za konec vrstice (EOL) na levi"
#: Merge.rc:2404
#, c-format
msgid "Right side file EOL type"
-msgstr "Desna stran datoteke EOL tipa"
+msgstr "Tip znakov za konec vrstice (EOL) na desni"
#: Merge.rc:2410
#, c-format
@@ -4691,7 +4716,7 @@
#: Merge.rc:2437
#, c-format
msgid "Temporary files could not be created. Check your temporary path settings."
-msgstr "Za\xE8asne datoteko ne morejo biti ustvarjene. Preverite nastavitve za va\x9Ao za\xE8asno pot."
+msgstr "Za\xE8asne datoteko ne morejo biti ustvarjene. Preverite nastavitve za va\x9Ao pot zanje (PATH)."
#: Merge.rc:2438
#, c-format
@@ -4715,14 +4740,14 @@
" With the current options, they will be unified to the main type.\n"
" Do you want to change the options and preserve the different EOL ?"
msgstr ""
-"EOL razli\xE8ni formati (Windows/Unix/Mac) v datoteki '%1'.\n"
-"Z trenutnimi opcijami, bodo nedefinirane v osnovnem tipu.\n"
-"Ali \x9Eelite spremeniti opcije in prepre\xE8iti razli\xE8ne EOL ?"
+"Zaklju\xE8ki vrstic (EOL) so razli\xE8nega tipa (Windows/Unix/Mac) v datoteki '%1'.\n"
+"S trenutno nastavitvijo, bodo poenotene v glavnem tipu.\n"
+"Ali \x9Eelite spremeniti nastavitev in ohraniti razli\xE8ne zaklju\xE8ke vrstic?"
#: Merge.rc:2440
#, c-format
msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more."
-msgstr "Pojavila se je napaka med 'prediffing' datoteke '%1' z dodatkom '%2'. Prediffing se ne bo ve\xE8 izvajal"
+msgstr "Pojavila se je napaka med predpregledom razlik datoteke '%1' z raz\x9Airitvijo '%2'. Predpregled razlik se ne bo ve\xE8 izvajal."
#: Merge.rc:2441
#, c-format
@@ -4783,7 +4808,7 @@
#: Merge.rc:2459
#, c-format
msgid "No difference"
-msgstr "Ni razlike"
+msgstr "Ni razlik"
#: Merge.rc:2460
#, c-format
@@ -4823,7 +4848,7 @@
#: Merge.rc:2487
#, c-format
msgid "Patch file successfully written."
-msgstr "Paketna datoteka je bila uspe\x9Ano zapisana"
+msgstr "Datoteka s popravki je bila uspe\x9Ano zapisana"
#: Merge.rc:2488
#, c-format
@@ -4838,7 +4863,7 @@
#: Merge.rc:2490
#, c-format
msgid "The patch file already exists. Do you want to overwrite it?"
-msgstr "Paketna datoteka \x9Ee obstaja. Jo \x9Eelite prepisati?"
+msgstr "Datoteka s popravki \x9Ee obstaja. Jo \x9Eelite prepisati?"
#: Merge.rc:2491
#, c-format
@@ -4878,12 +4903,12 @@
#: Merge.rc:2498
#, c-format
msgid "Cannot create a patch file from binary files."
-msgstr "Ni mogo\xE8e izdelati paketne datotek iz binarnih datotek"
+msgstr "Ni mogo\xE8e izdelati datoteke s popravki iz binarnih datotek."
#: Merge.rc:2499
#, c-format
msgid "Cannot create a patch file from directories."
-msgstr "Ne morem izdelati paketne datoteke iz map"
+msgstr "Ni mogo\xE8e izdelati datoteke s popravki iz iz map."
#: Merge.rc:2500
#, c-format
@@ -4894,7 +4919,7 @@
msgstr ""
"Prosimo, najprej shranite vse datoteke.\n"
" \n"
-"Izdelava paketa zahteva, da so vse datoteke predhodno shranjene."
+"Izdelava datoteke s popravki zahteva, da so vse datoteke predhodno shranjene."
#: Merge.rc:2501
#, c-format
@@ -4924,7 +4949,7 @@
"Note: 7-Zip integration is disabled in WinMerge settings."
msgstr ""
"\n"
-"Sporo\xE8ilo: 7-Zip intergracija je onemogo\xE8ena v WinMerge nastavitvah."
+"Sporo\xE8ilo: 7-Zip integracija je onemogo\xE8ena v WinMerge nastavitvah."
#: Merge.rc:2509
#, c-format
@@ -4948,7 +4973,7 @@
#: Merge.rc:2512
#, c-format
msgid "Options imported from the file."
-msgstr "Mo\x9Enosti uvo\x9Eene iz datoteko"
+msgstr "Mo\x9Enosti uvo\x9Eene iz datoteke"
#: Merge.rc:2513
#, c-format
@@ -4979,17 +5004,17 @@
#: Merge.rc:2522
#, c-format
msgid "Regular expression error"
-msgstr "Napaka algoritma"
+msgstr "Napaka regularnega izraza"
#: Merge.rc:2523
#, c-format
msgid "No match"
-msgstr "Ni povezave"
+msgstr "Ni enakosti"
#: Merge.rc:2524
#, c-format
msgid "Invalid regular expression"
-msgstr "Neveljaven reden izraz"
+msgstr "Neveljaven regularni izraz"
#: Merge.rc:2525
#, c-format
@@ -5014,17 +5039,17 @@
#: Merge.rc:2529
#, c-format
msgid "Unmatched [ or [^"
-msgstr "Naujemajo\xE8e: [ ali [^"
+msgstr "Neujemajo\xE8e: [ ali [^"
#: Merge.rc:2530
#, c-format
msgid "Unmatched ( or \\("
-msgstr "Naujemajo\xE8e: ( ali \\("
+msgstr "Neujemajo\xE8e: ( ali \\("
#: Merge.rc:2531
#, c-format
msgid "Unmatched \\{"
-msgstr "Naujemajo\xE8e: \\{"
+msgstr "Neujemajo\xE8e: \\{"
#: Merge.rc:2532
#, c-format
@@ -5039,27 +5064,27 @@
#: Merge.rc:2534
#, c-format
msgid "Out of memory"
-msgstr "Pomankanje pomnilnika"
+msgstr "Pomanjkanje pomnilnika"
#: Merge.rc:2535
#, c-format
msgid "Invalid preceding regular expression"
-msgstr "Napa\xE8en stalen izraz"
+msgstr "Napa\xE8en predhodni regularni izraz"
#: Merge.rc:2536
#, c-format
msgid "Premature end of regular expression"
-msgstr "Pred\xE8asen konec danega izraza"
+msgstr "Pred\xE8asen konec regularnega izraza"
#: Merge.rc:2537
#, c-format
msgid "Regular expression too big"
-msgstr "Dani izraz je prevelik"
+msgstr "Regularni izraz je prevelik"
#: Merge.rc:2542
#, c-format
msgid "Unmatched ) or \\)"
-msgstr "Naujemajo\xE8e ) ali \\)"
+msgstr "Neujemajo\xE8e ) ali \\)"
#: Merge.rc:2548
#, c-format
@@ -5134,12 +5159,12 @@
#: Merge.rc:2575
#, c-format
msgid "Unpacker"
-msgstr "arhiver"
+msgstr "Pretvornik"
#: Merge.rc:2576
#, c-format
msgid "Prediffer"
-msgstr "Prediffer"
+msgstr "Predpregled razlik"
#: Merge.rc:2577
#, c-format
@@ -5179,17 +5204,17 @@
#: Merge.rc:2590
#, c-format
msgid "Convert EOL to Windows mode"
-msgstr "Pretvori EOL v Windows na\xE8in"
+msgstr "Pretvori znake za konec vrstice (EOL) v Windows na\xE8in"
#: Merge.rc:2591
#, c-format
msgid "Convert EOL to Unix mode"
-msgstr "Pretvori EOL v Unix na\xE8in"
+msgstr "Pretvori znake za konec vrstice (EOL) v Unix na\xE8in"
#: Merge.rc:2592
#, c-format
msgid "Convert EOL to Mac mode"
-msgstr "Pretvori EOL v Mac na\xE8in"
+msgstr "Pretvori znake za konec vrstice (EOL) v Mac na\xE8in"
#: Merge.rc:2593
#, c-format
@@ -5550,7 +5575,7 @@
#: Merge.rc:2666
#, c-format
msgid "Generate a patch-file"
-msgstr "Izdelaj paketno datoteko "
+msgstr "Izdelaj datoteko s popravki"
#: Merge.rc:2667
#, c-format
@@ -5570,37 +5595,37 @@
#: Merge.rc:2675
#, c-format
msgid "The user selects the unpacker (no unpacking when comparing dir)"
-msgstr "Uporabnik izbere arhiver (razpakiranje ne deluje med primerjanjem map)"
+msgstr "Uporabnik izbere pretvornik (brez pretvarjanja med primerjanjem map)"
#: Merge.rc:2676
#, c-format
msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
-msgstr "Prilagojen arhiver je uporaben na obeh datotekah (samo ena datoteka potrebuje raz\x9Airitev)"
+msgstr "Izbran pretvornik je uporabljen na obeh datotekah (samo ena datoteka potrebuje kon\xE8nico)"
#: Merge.rc:2677
#, c-format
msgid "Select an unpacker to edit this file"
-msgstr "Izberite arhiver za urejanje naslednje datoteke"
+msgstr "Izberite pretvornik za urejanje te datoteke"
#: Merge.rc:2678
#, c-format
msgid "No prediffer (normal)"
-msgstr "Brez datotek (obi\xE8ajno)"
+msgstr "Brez predpregleda razlik (obi\xE8ajno)"
#: Merge.rc:2679
#, c-format
msgid "Suggested plugins"
-msgstr "Priporo\xE8ljivi dodatki"
+msgstr "Priporo\xE8ene raz\x9Airitve"
#: Merge.rc:2680
#, c-format
msgid "Other plugins"
-msgstr "Ostali dodatki"
+msgstr "Ostale raz\x9Airitve"
#: Merge.rc:2681
#, c-format
msgid "Unload all plugins and reload them (for developers)"
-msgstr "Ponovno nalo\x9Ei vse dodatke(za izdelovalce)"
+msgstr "Ponovno nalo\x9Ei vse raz\x9Airitve (za razvijalce)"
#: Merge.rc:2687
#, c-format
@@ -5661,17 +5686,17 @@
#: Merge.rc:2705
#, c-format
msgid "Plugin Settings"
-msgstr "Nastavitve vmesnika"
+msgstr "Nastavitve raz\x9Airitev"
#: Merge.rc:2706
#, c-format
msgid "No prediffer"
-msgstr "Brez dodatkov"
+msgstr "Brez predpregleda razlik"
#: Merge.rc:2707
#, c-format
msgid "Prediff if possible"
-msgstr "Prediff \xE8e je mogo\xE8e"
+msgstr "Predpregled razlik, \xE8e je mogo\xE8e"
#: Merge.rc:2709
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-01-14 21:43:28
|
Revision: 7107
http://winmerge.svn.sourceforge.net/winmerge/?rev=7107&view=rev
Author: kimmov
Date: 2010-01-14 21:43:14 +0000 (Thu, 14 Jan 2010)
Log Message:
-----------
PATCH: [ 2931558 ] some smal cleanups
mergedoc7097.patch
Submitted by Matthias Mayer
Modified Paths:
--------------
trunk/Src/MergeDoc.cpp
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2010-01-14 21:29:10 UTC (rev 7106)
+++ trunk/Src/MergeDoc.cpp 2010-01-14 21:43:14 UTC (rev 7107)
@@ -451,6 +451,7 @@
if (AfxMessageBox(msg, MB_YESNO | MB_ICONWARNING) == IDYES)
{
ReloadDoc(0);
+ return RESCAN_OK;
}
}
else if (rightFileChanged == FileChanged)
@@ -460,6 +461,7 @@
if (AfxMessageBox(msg, MB_YESNO | MB_ICONWARNING) == IDYES)
{
ReloadDoc(1);
+ return RESCAN_OK;
}
}
@@ -1437,6 +1439,7 @@
// Show possible error after updating screen
if (nRescanResult != RESCAN_SUPPRESSED)
ShowRescanError(nRescanResult, bIdentical);
+ m_LastRescan = COleDateTime::GetCurrentTime();
}
/**
@@ -2511,7 +2514,7 @@
}
BOOL bBinary = FALSE;
- nRescanResult = Rescan(bBinary, bIdentical);
+ nRescanResult = Rescan(bBinary, bIdentical, TRUE);
// Open filed if rescan succeed and files are not binaries
if (nRescanResult == RESCAN_OK)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-01-14 21:29:27
|
Revision: 7106
http://winmerge.svn.sourceforge.net/winmerge/?rev=7106&view=rev
Author: kimmov
Date: 2010-01-14 21:29:10 +0000 (Thu, 14 Jan 2010)
Log Message:
-----------
PATCH: [ 2931558 ] some smal cleanups
ccrystaltextbuffer7097.patch
Submitted by Matthias Mayer
Modified Paths:
--------------
trunk/Src/editlib/ccrystaltextbuffer.cpp
Modified: trunk/Src/editlib/ccrystaltextbuffer.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextbuffer.cpp 2010-01-14 21:14:22 UTC (rev 7105)
+++ trunk/Src/editlib/ccrystaltextbuffer.cpp 2010-01-14 21:29:10 UTC (rev 7106)
@@ -193,8 +193,8 @@
{
ASSERT(nLength != -1);
- LineInfo li;
- li.Create(pszLine, nLength);
+ LineInfo line;
+ line.Create(pszLine, nLength);
// nPosition not defined ? Insert at end of array
if (nPosition == -1)
@@ -202,12 +202,14 @@
// insert all lines in one pass
vector<LineInfo>::iterator iter = m_aLines.begin() + nPosition;
- m_aLines.insert(iter, nCount, li);
+ m_aLines.insert(iter, nCount, line);
- // duplicate the text data for lines after the first one
+ // create text data for lines after the first one
for (int ic = 1; ic < nCount; ic++)
{
- m_aLines[nPosition+ic].CopyFrom(li);
+ LineInfo li ;
+ li.Create(pszLine, nLength);
+ m_aLines[nPosition + ic] = li;
}
#ifdef _DEBUG
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-01-14 21:14:41
|
Revision: 7105
http://winmerge.svn.sourceforge.net/winmerge/?rev=7105&view=rev
Author: kimmov
Date: 2010-01-14 21:14:22 +0000 (Thu, 14 Jan 2010)
Log Message:
-----------
PATCH: [ 2931558 ] some smal cleanups
Difflist7097.patch
Submitted by Matthias Mayer
Modified Paths:
--------------
trunk/Src/DiffList.cpp
Modified: trunk/Src/DiffList.cpp
===================================================================
--- trunk/Src/DiffList.cpp 2010-01-14 11:19:08 UTC (rev 7104)
+++ trunk/Src/DiffList.cpp 2010-01-14 21:14:22 UTC (rev 7105)
@@ -206,7 +206,7 @@
{
if (nDiff < (int) m_diffs.size())
{
- m_diffs[nDiff] = di;
+ m_diffs[nDiff].diffrange = di;
return true;
}
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-01-14 11:19:20
|
Revision: 7104
http://winmerge.svn.sourceforge.net/winmerge/?rev=7104&view=rev
Author: gerundt
Date: 2010-01-14 11:19:08 +0000 (Thu, 14 Jan 2010)
Log Message:
-----------
Fix wrong Content-Type meta declaration in Slovenian.po
Modified Paths:
--------------
branches/R2_12/Src/Languages/Slovenian.po
Modified: branches/R2_12/Src/Languages/Slovenian.po
===================================================================
--- branches/R2_12/Src/Languages/Slovenian.po 2010-01-13 22:43:54 UTC (rev 7103)
+++ branches/R2_12/Src/Languages/Slovenian.po 2010-01-14 11:19:08 UTC (rev 7104)
@@ -17,7 +17,7 @@
"Last-Translator: Filip Komar <filip.komar at gmail.com>\n"
"Language-Team: Slovenian <win...@li...>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=CP1250\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Slovenian\n"
"X-Poedit-SourceCharset: CP1250\n"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-01-13 22:44:00
|
Revision: 7103
http://winmerge.svn.sourceforge.net/winmerge/?rev=7103&view=rev
Author: kimmov
Date: 2010-01-13 22:43:54 +0000 (Wed, 13 Jan 2010)
Log Message:
-----------
Buildscript: Build 64-bit ShellExtension with the script.
Modified Paths:
--------------
trunk/Tools/Scripts/create_release.py
Modified: trunk/Tools/Scripts/create_release.py
===================================================================
--- trunk/Tools/Scripts/create_release.py 2010-01-13 22:27:27 UTC (rev 7102)
+++ trunk/Tools/Scripts/create_release.py 2010-01-13 22:43:54 UTC (rev 7103)
@@ -29,7 +29,7 @@
# - updates POT and PO files
# - builds libraries (expat, scew, pcre)
# - builds WinMerge.exe and WinMergeU.exe
-# - builds 32-bit ShellExtension targets
+# - builds 32-bit and 64-bit ShellExtension targets
# - builds user manual
# - builds the InnoSetup installer
# - creates per-version distribution folder
@@ -37,7 +37,6 @@
# - creates binary distribution folder
#Tasks not done (TODO?):
-# - building 64-bit ShellExtension
# - creating packages from source and binary folders
# - running virus check
# - creating SHA-1 hashes for distributed files
@@ -72,6 +71,10 @@
root_path = ''
prog_ver = ''
+# Build 64-bit targets? This requires 64-bit cross-compile cabable VS version.
+# If disabled, 64-bit versions must be compiled before running this script
+build_64bit = True
+
# END CONFIGURATION - you don't need to edit anything below...
from subprocess import *
@@ -293,7 +296,10 @@
return False
def build_shellext(vs_cmd):
- """Builds 32-bit ShellExtension."""
+ '''Builds 32-bit and 64-bit ShellExtension.
+
+ 64-bit ShellExtension is build only if build_64bit is enabled in config.
+ '''
cur_path = os.getcwd()
solution_path = os.path.join(cur_path, 'ShellExtension\\ShellExtension.vcproj')
@@ -306,11 +312,20 @@
else:
print 'ERROR: Failed to build ANSI target of ShellExtension!'
return False
+
+ if ret == 0:
+ if build_64bit == True:
+ ret = call([vs_cmd, solution_path, '/rebuild', 'X64 Release|x64'])
+ else:
+ return True
+ else:
+ print 'ERROR: Failed to build Unicode target of ShellExtension!'
+ return False
if ret == 0:
return True
else:
- print 'ERROR: Failed to build Unicode target of ShellExtension!'
+ print 'ERROR: Failed to build 64-bit target of ShellExtension!'
return False
def build_manual():
@@ -464,13 +479,13 @@
return True
def check_x64shellext():
- """Checks that 64-bit ShellExtension is compiled prior to running this
+ '''Checks that 64-bit ShellExtension is compiled prior to running this
script.
- This is due to the fact we can't compile 64-bit ShellExtension without some
- environment tweaks, so it won't work (currently) from this script. And the
- ShellExtension must be compiled separately.
- """
+ If we haven't enabled building 64-bit targets we must ensure the 64-bit
+ ShellExtension is already compiled.
+ '''
+
if not os.path.exists('build/shellextension/x64 release/ShellExtensionX64.dll'):
print 'ERROR: cannot create a release:'
print 'You must compile 64-bit ShellExtension (ShellExtensionX64.dll)'
@@ -543,8 +558,8 @@
if check_tools() == False:
sys.exit()
- # Check 64-bit ShellExtension is compiled
- if check_x64shellext() == False:
+ # Check 64-bit ShellExtension is compiled if not building 64-bit
+ if build_64bit == False and check_x64shellext() == False:
sys.exit()
# Create the distribution folder if it doesn't exist
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-01-13 22:27:35
|
Revision: 7102
http://winmerge.svn.sourceforge.net/winmerge/?rev=7102&view=rev
Author: kimmov
Date: 2010-01-13 22:27:27 +0000 (Wed, 13 Jan 2010)
Log Message:
-----------
Fix building ANSI release. Was missing scew.lib linkage
Modified Paths:
--------------
trunk/Src/Merge.vcproj
Modified: trunk/Src/Merge.vcproj
===================================================================
--- trunk/Src/Merge.vcproj 2010-01-13 21:40:05 UTC (rev 7101)
+++ trunk/Src/Merge.vcproj 2010-01-13 22:27:27 UTC (rev 7102)
@@ -397,7 +397,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/verbose:lib"
- AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib libexpat.lib pcre.lib"
+ AdditionalDependencies="version.lib shlwapi.lib imm32.lib HtmlHelp.lib scew.lib libexpat.lib pcre.lib"
OutputFile="..\Build\MergeRelease/WinMerge.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-01-13 21:40:12
|
Revision: 7101
http://winmerge.svn.sourceforge.net/winmerge/?rev=7101&view=rev
Author: gerundt
Date: 2010-01-13 21:40:05 +0000 (Wed, 13 Jan 2010)
Log Message:
-----------
PATCH: [ 2917796 ] Updated and corrected Slovenian translation
Submitted by Filip Komar
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Docs/Users/Contributors.txt
branches/R2_12/Src/Languages/Slovenian.po
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2010-01-13 21:39:03 UTC (rev 7100)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2010-01-13 21:40:05 UTC (rev 7101)
@@ -8,6 +8,7 @@
Translation updates:
- Dutch (#2804979)
- French (#2850842)
+ - Slovenian (#2917796)
- Spanish (#2930734)
- Turkish (#2825132, #2827817)
- Ukrainian (#2817835)
Modified: branches/R2_12/Docs/Users/Contributors.txt
===================================================================
--- branches/R2_12/Docs/Users/Contributors.txt 2010-01-13 21:39:03 UTC (rev 7100)
+++ branches/R2_12/Docs/Users/Contributors.txt 2010-01-13 21:40:05 UTC (rev 7101)
@@ -112,6 +112,7 @@
* Slovenian:
Iztok Osredkar <izt...@in...>
+ Filip Komar <fil...@gm...>
* Spanish:
Mario Angel <mar...@gm...>
Modified: branches/R2_12/Src/Languages/Slovenian.po
===================================================================
--- branches/R2_12/Src/Languages/Slovenian.po 2010-01-13 21:39:03 UTC (rev 7100)
+++ branches/R2_12/Src/Languages/Slovenian.po 2010-01-13 21:40:05 UTC (rev 7101)
@@ -3,9 +3,8 @@
#
# Translators:
# * Iztok Osredkar <iztok.osredkar at institut-oko.si>
+# * Filip Komar <filip.komar at gmail.com>
#
-#
-#
# ID line follows -- this is updated by SVN
# $Id$
#
@@ -14,8 +13,8 @@
"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"
+"PO-Revision-Date: 2009-12-19 20:52+0100\n"
+"Last-Translator: Filip Komar <filip.komar at gmail.com>\n"
"Language-Team: Slovenian <win...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
@@ -287,7 +286,7 @@
#: Merge.rc:454
#, c-format
msgid "&List..."
-msgstr ""
+msgstr "&Seznam"
#: Merge.rc:152
#: Merge.rc:273
@@ -378,14 +377,14 @@
#: Merge.rc:481
#, c-format
msgid "Tile &Vertically"
-msgstr "Navpi\xE8na &okna"
+msgstr "&Navpi\xE8na okna"
#: Merge.rc:173
#: Merge.rc:294
#: Merge.rc:482
#, c-format
msgid "&Cascade"
-msgstr "Kaskadna &okna"
+msgstr "&Kaskadna okna"
#: Merge.rc:175
#: Merge.rc:296
@@ -428,7 +427,7 @@
#: Merge.rc:491
#, c-format
msgid "A&rchive Support disabled..."
-msgstr "&Podpora arhiviranju onemogo\xE8ena"
+msgstr "&Podpora arhivskim datotekam onemogo\xE8ena"
#: Merge.rc:184
#: Merge.rc:305
@@ -470,7 +469,7 @@
#: Merge.rc:215
#, c-format
msgid "Show &Identical Items"
-msgstr "Prika\x9Ei &identiene predmete"
+msgstr "Prika\x9Ei &identi\xE8ne predmete"
#: Merge.rc:216
#, c-format
@@ -490,7 +489,7 @@
#: Merge.rc:219
#, c-format
msgid "Show S&kipped Items"
-msgstr "Prika\x9Ei &preskoeene predmete"
+msgstr "Prika\x9Ei &presko\xE8ene predmete"
#: Merge.rc:220
#, c-format
@@ -505,17 +504,17 @@
#: Merge.rc:224
#, c-format
msgid "Tree &Mode"
-msgstr ""
+msgstr "&Drevesni na\xE8in"
#: Merge.rc:225
#, c-format
msgid "E&xpand All Subfolders"
-msgstr ""
+msgstr "Ra&z\x9Airi vse mape"
#: Merge.rc:226
#, c-format
msgid "&Collapse All Subfolders"
-msgstr ""
+msgstr "S&kr\xE8i vse mape"
#: Merge.rc:239
#, c-format
@@ -1299,7 +1298,7 @@
#: Merge.rc:774
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
-msgstr ""
+msgstr "Prika\x9Ei pogovorno okno \"Izberite datoteke ali mape\" ob zagonu"
#: Merge.rc:776
#, c-format
@@ -1328,7 +1327,7 @@
msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
msgstr ""
"WinMerge omogo\xE8a skrivanje skupnih sporo\xE8ilnih okvirjev.\n"
-"Pritisnite gumb za ponovni zagon, da bodo postala vsa sporo\xE8ilna okna vidna."
+"Pritisnite gumb Ponastavi, da bodo postala vsa sporo\xE8ilna okna vidna."
#: Merge.rc:787
#, c-format
@@ -1727,17 +1726,17 @@
#: Merge.rc:1095
#, c-format
msgid "File unpacker:"
-msgstr "Arhiver datoteke:"
+msgstr "Arhivske datoteke:"
#: Merge.rc:1098
#, c-format
msgid "Display all unpackers, don't check the extension"
-msgstr "Prika\x9Ei vsa orodja za stiskanje, ne preverjaj ekstenzije"
+msgstr "Prika\x9Ei vsa orodja za stiskanje, ne preverjaj kon\xE8nice"
#: Merge.rc:1101
#, c-format
msgid "Extensions list:"
-msgstr "Popis ekstenzij"
+msgstr "Popis kon\xE8nic"
#: Merge.rc:1102
#, c-format
@@ -1925,7 +1924,7 @@
#: Merge.rc:1206
#, c-format
msgid "View line differences"
-msgstr "Poglej vrstiene razlike"
+msgstr "Poglej vrsti\xE8ne razlike"
#: Merge.rc:1208
#, c-format
@@ -2027,7 +2026,7 @@
#: Merge.rc:1271
#, c-format
msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session"
-msgstr ""
+msgstr "Zaznaj kodno tabelo za datoteke s kon\xE8nico: .html, .rc, .xml \npotreben je ponovni zagon seje"
#: Merge.rc:1274
#, c-format
@@ -2042,12 +2041,12 @@
#: Merge.rc:1278
#, c-format
msgid "Custom codepage:"
-msgstr ""
+msgstr "Kodna tabela po meri:"
#: Merge.rc:1286
#, c-format
msgid "WinMerge - Archive support disabled"
-msgstr "WinMerge - Arhivna podpora onemogo\xE8ena"
+msgstr "WinMerge - podpora Arhivskim datotekam onemogo\xE8ena"
#: Merge.rc:1289
#, c-format
@@ -2060,7 +2059,7 @@
msgid ""
"Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n"
"essential components to be copied to the program directory for standalone operation."
-msgstr "Delo z arhivi zahteva program 7-Zip 3.11 ali njegovo novej\x9Ao razli\xE8ico name\x9A\xE8eno na va\x9Aem ra\xE8unalniku"
+msgstr "Delo z arhivskimi datotekami zahteva program 7-Zip 3.11 ali njegovo novej\x9Ao razli\xE8ico name\x9A\xE8eno na va\x9Aem ra\xE8unalniku"
#: Merge.rc:1294
#, c-format
@@ -2281,12 +2280,12 @@
#: Merge.rc:1950
#, c-format
msgid "Archive Support"
-msgstr "Podpora arhivom"
+msgstr "Podpora arhivskim datotekam"
#: Merge.rc:1452
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
-msgstr "Arhivna podpora zahteva 7-zip name\x9A\xE8en vti\xE8nik:"
+msgstr "Podpora za arhivske datoteke zahteva 7-zip name\x9A\xE8en vti\xE8nik:"
#: Merge.rc:1454
#, c-format
@@ -2296,7 +2295,7 @@
#: Merge.rc:1455
#, c-format
msgid "&Enable archive file support"
-msgstr "Omogu\xE8i delo z &arhivi"
+msgstr "Omogo\xE8i delo z &arhivskimi datotekami"
#: Merge.rc:1457
#, c-format
@@ -2311,7 +2310,7 @@
#: Merge.rc:1462
#, c-format
msgid "&Detect archive type from file signature"
-msgstr "&Razberi tip arhiva iz podpisa datoteke"
+msgstr "&Razberi tip arhivske datoteke iz podpisa datoteke"
#: Merge.rc:1470
#, c-format
@@ -2543,7 +2542,7 @@
#: Merge.rc:1629
#, c-format
msgid "&Append .bak -extension"
-msgstr "&Dodaj .bak ekstenzijo"
+msgstr "&Dodaj .bak kon\xE8nico"
#: Merge.rc:1631
#, c-format
@@ -2554,7 +2553,7 @@
#: Merge.rc:2243
#, c-format
msgid "Confirm Copy"
-msgstr "Potrdi klopiranje"
+msgstr "Potrdi kopiranje"
#: Merge.rc:1642
#, c-format
@@ -2615,17 +2614,17 @@
#: Merge.rc:1679
#, c-format
msgid "&Add to context menu"
-msgstr ""
+msgstr "&Dodaj k raz\x9Airjenemu meniju"
#: Merge.rc:1681
#, c-format
msgid "Folder compare"
-msgstr ""
+msgstr "Primerjava map"
#: Merge.rc:1682
#, c-format
msgid "Add &Shell menu to context menu"
-msgstr ""
+msgstr "Dodaj obstoje\xE8i meni k &raz\x9Airjenemu meniju"
#. StringFileInfo.Block
#: Merge.rc:1708
@@ -2952,7 +2951,7 @@
"Replace specific text with different text\n"
"Replace"
msgstr ""
-"Zamenjaj specifieeno besedilo z druga\xE8nim besedilom\n"
+"Zamenjaj specifi\xE8no besedilo z druga\xE8nim besedilom\n"
"Zamenjaj"
#: Merge.rc:1837
@@ -3203,7 +3202,7 @@
#: Merge.rc:1932
#, c-format
msgid "Skip &all"
-msgstr "Preskoei &vse"
+msgstr "Presko\xE8i &vse"
#: Merge.rc:1934
#, c-format
@@ -3385,7 +3384,7 @@
#: Merge.rc:2020
#, c-format
msgid "Modified Date"
-msgstr "Datum spemembe"
+msgstr "Datum spremembe"
#: Merge.rc:2021
#, c-format
@@ -3694,7 +3693,7 @@
#: Merge.rc:2126
#, c-format
msgid "Choose two files to enable unpacker selection."
-msgstr "Izberi dve datoteki,da boste omogo\xE8ili izbiro arhiverja"
+msgstr "Izberi dve datoteki, da boste omogo\xE8ili izbiro arhiverja"
#: Merge.rc:2127
#, c-format
@@ -3763,7 +3762,7 @@
#: Merge.rc:2147
#, c-format
msgid "Error backing up file"
-msgstr "Napaka pri shranjevanju arhive"
+msgstr "Napaka pri shranjevanju arhiva"
#: Merge.rc:2149
#, c-format
@@ -3773,7 +3772,7 @@
"\n"
"Continue anyway?"
msgstr ""
-"Ni mogo\xE8e shraniti arhive originalne datoteke:\n"
+"Ni mogo\xE8e shraniti arhiva originalne datoteke:\n"
"%1\n"
"\n"
"Vseeno nadaljujem?"
@@ -3883,7 +3882,7 @@
#: Merge.rc:2170
#, c-format
msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)"
-msgstr "Navesti morate pot SourceSafe projekta \xE8e \x9Eelite nadaljevati (ie: $/MyProject)"
+msgstr "Navesti morate pot SourceSafe projekta \xE8e \x9Eelite nadaljevati (npr: $/MyProject)"
#: Merge.rc:2171
#, c-format
@@ -3932,7 +3931,7 @@
"Versioning System returned an error while attempting to undo checkout the file.\n"
" Please, check config spec of used view. "
msgstr ""
-"Versioninh System vra\xE8a napako med preverjanjem datoteke.\n"
+"Sistem za verzije vra\xE8a napako med preverjanjem datoteke.\n"
"Prosim preverite nastavitvene specifikacije uporabljenega pogleda"
#: Merge.rc:2184
@@ -4141,17 +4140,17 @@
#: Merge.rc:2241
#, c-format
msgid "Are you sure you want to move:"
-msgstr ""
+msgstr "Ali ste prepri\xE8ani, da \x9Eelite premakniti:"
#: Merge.rc:2242
#, c-format
msgid "Are you sure you want to move %d items:"
-msgstr ""
+msgstr "Ali ste prepri\xE8ani, da \x9Eelite premakniti: %d predmetov"
#: Merge.rc:2244
#, c-format
msgid "Confirm Move"
-msgstr ""
+msgstr "Potrdi premik"
#: Merge.rc:2250
#, c-format
@@ -4191,7 +4190,7 @@
#: Merge.rc:2257
#, c-format
msgid "Unknown extension on external editor: %1"
-msgstr "Nepoznana ekstenzija na zunanjem urejevalniku: %1"
+msgstr "Nepoznana kon\xE8nica datoteke na zunanjem urejevalniku: %1"
#: Merge.rc:2258
#, c-format
@@ -4216,12 +4215,12 @@
#: Merge.rc:2267
#, c-format
msgid "Left Shell menu"
-msgstr ""
+msgstr "Levi raz\x9Airitveni meni"
#: Merge.rc:2268
#, c-format
msgid "Right Shell menu"
-msgstr ""
+msgstr "Desni raz\x9Airitveni meni"
#: Merge.rc:2274
#, c-format
@@ -4432,7 +4431,7 @@
#: Merge.rc:2338
#, c-format
msgid "Folders are different"
-msgstr ""
+msgstr "Mapi sta razli\xE8ni"
#: Merge.rc:2339
#, c-format
@@ -4452,12 +4451,12 @@
#: Merge.rc:2343
#, c-format
msgid "Text files are identical"
-msgstr ""
+msgstr "Tekstovni datoteki sta enaki"
#: Merge.rc:2348
#, c-format
msgid "Text files are different"
-msgstr ""
+msgstr "Tekstovni datoteki sta razli\xE8ni"
#: Merge.rc:2354
#, c-format
@@ -4651,7 +4650,7 @@
#: Merge.rc:2417
#, c-format
msgid "The selected files are identical."
-msgstr "Izbrane datoteko so identi\xE8ne."
+msgstr "Izbrani datoteki sta identi\xE8ni."
#: Merge.rc:2418
#, c-format
@@ -4883,9 +4882,9 @@
"All needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found.\n"
"See manual for more info about archive support and how to enable it."
msgstr ""
-"Delo z arhivi ni omogo\xE8eno.\n"
-"Vse rabljene komponente (7-zip in/ali Merge7z*.dll) za arhivno podporo ni mogo\xE8e najdti.\n"
-"Za ve\xE8 informacij poglejte v rubriko pomo\xE8 o podpori arhivom."
+"Delo z arhivskimi datotekami ni omogo\xE8eno.\n"
+"Vse rabljene komponente (7-zip in/ali Merge7z*.dll) za arhivno podporo ni mogo\xE8e najti.\n"
+"Za ve\xE8 informacij poglejte v rubriko pomo\xE8 o podpori arhivskih datotek."
#: Merge.rc:2490
#, c-format
@@ -5365,22 +5364,22 @@
#: Merge.rc:2654
#, c-format
msgid "Type"
-msgstr ""
+msgstr "Tip"
#: Merge.rc:2656
#, c-format
msgid "Unpacker"
-msgstr ""
+msgstr "arhiver"
#: Merge.rc:2657
#, c-format
msgid "Prediffer"
-msgstr ""
+msgstr "Prediffer"
#: Merge.rc:2658
#, c-format
msgid "Editor script"
-msgstr ""
+msgstr "Script urejevalnika"
#: Merge.rc:2665
#, c-format
@@ -5405,12 +5404,12 @@
#: Merge.rc:2669
#, c-format
msgid "Change left side file/folder read-only status"
-msgstr ""
+msgstr "Spremeni status Samo za branje za levo datoteko ali mapo"
#: Merge.rc:2670
#, c-format
msgid "Change right side file/folder read-only status"
-msgstr ""
+msgstr "Spremeni status Samo za branje za desno datoteko ali mapo"
#: Merge.rc:2671
#, c-format
@@ -5620,7 +5619,7 @@
"Show Line Difference"
msgstr ""
"Prika\x9Ei razlike znotraj vrstic z razli\xE8nimi barvami\n"
-"Prika\x9Ei vrstiene razlike"
+"Prika\x9Ei vrsti\xE8ne razlike"
#: Merge.rc:2716
#, c-format
@@ -5801,7 +5800,7 @@
#: Merge.rc:2755
#, c-format
msgid "Shows a list of available plugins"
-msgstr ""
+msgstr "Prika\x9Ei seznam raz\x9Airitev, ki so na voljo"
#: Merge.rc:2756
#, c-format
@@ -5811,7 +5810,7 @@
#: Merge.rc:2757
#, c-format
msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
-msgstr "Prilagojen arhiver je uporaben na obeh datotekah(samo ena datoteka potrebuje raz\x9Airitev)"
+msgstr "Prilagojen arhiver je uporaben na obeh datotekah (samo ena datoteka potrebuje raz\x9Airitev)"
#: Merge.rc:2758
#, c-format
@@ -5821,7 +5820,7 @@
#: Merge.rc:2759
#, c-format
msgid "No prediffer (normal)"
-msgstr "Brez datotek (obieajno)"
+msgstr "Brez datotek (obi\xE8ajno)"
#: Merge.rc:2760
#, c-format
@@ -5987,7 +5986,7 @@
#: Merge.rc:2825
#, c-format
msgid "No Highlighting"
-msgstr ""
+msgstr "Brez osvetljevanja"
#: Merge.rc:2826
#, c-format
@@ -6142,7 +6141,7 @@
#: Merge.rc:2856
#, c-format
msgid "Verilog"
-msgstr ""
+msgstr "Verilog"
#: Merge.rc:2857
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-01-13 21:39:16
|
Revision: 7100
http://winmerge.svn.sourceforge.net/winmerge/?rev=7100&view=rev
Author: gerundt
Date: 2010-01-13 21:39:03 +0000 (Wed, 13 Jan 2010)
Log Message:
-----------
PATCH: [ 2917796 ] Updated and corrected Slovenian translation
Submitted by Filip Komar
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Docs/Users/Contributors.txt
trunk/Translations/WinMerge/Slovenian.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-01-13 20:45:28 UTC (rev 7099)
+++ trunk/Docs/Users/ChangeLog.txt 2010-01-13 21:39:03 UTC (rev 7100)
@@ -18,6 +18,7 @@
Bugfix: Automatic rescanning was not disabled everywhere (r7086,r7089)
Bugfix: Quick contents compare didn't ignore EOL byte differences (#2929005)
Translation updates:
+ - Slovenian (#2917796)
- Spanish (#2930734)
WinMerge 2.13.10 2009-12-21 (r7051)
Modified: trunk/Docs/Users/Contributors.txt
===================================================================
--- trunk/Docs/Users/Contributors.txt 2010-01-13 20:45:28 UTC (rev 7099)
+++ trunk/Docs/Users/Contributors.txt 2010-01-13 21:39:03 UTC (rev 7100)
@@ -116,6 +116,7 @@
* Slovenian:
Iztok Osredkar <izt...@in...>
+ Filip Komar <fil...@gm...>
* Spanish:
Mario Angel <mar...@gm...>
Modified: trunk/Translations/WinMerge/Slovenian.po
===================================================================
--- trunk/Translations/WinMerge/Slovenian.po 2010-01-13 20:45:28 UTC (rev 7099)
+++ trunk/Translations/WinMerge/Slovenian.po 2010-01-13 21:39:03 UTC (rev 7100)
@@ -3,9 +3,8 @@
#
# Translators:
# * Iztok Osredkar <iztok.osredkar at institut-oko.si>
+# * Filip Komar <filip.komar at gmail.com>
#
-#
-#
# ID line follows -- this is updated by SVN
# $Id$
#
@@ -14,8 +13,8 @@
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2008-06-16 00:11+0100\n"
-"Last-Translator: Iztok Osredkar <izt...@in...>\n"
+"PO-Revision-Date: 2009-12-19 20:52+0100\n"
+"Last-Translator: Filip Komar <filip.komar at gmail.com>\n"
"Language-Team: Slovenian <win...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CP1250\n"
@@ -287,7 +286,7 @@
#: Merge.rc:457
#, c-format
msgid "&List..."
-msgstr ""
+msgstr "&Seznam"
#: Merge.rc:152
#, c-format
@@ -388,19 +387,19 @@
#: Merge.rc:484
#, c-format
msgid "Tile &Vertically"
-msgstr "Navpi\xE8na &okna"
+msgstr "&Navpi\xE8na okna"
#: Merge.rc:176
#: Merge.rc:297
#: Merge.rc:485
#, c-format
msgid "&Cascade"
-msgstr "Kaskadna &okna"
+msgstr "&Kaskadna okna"
#: Merge.rc:178
#: Merge.rc:299
#: Merge.rc:487
-#: Merge.rc:1947
+#: Merge.rc:1948
#, c-format
msgid "&Help"
msgstr "&Pomo\xE8"
@@ -438,7 +437,7 @@
#: Merge.rc:494
#, c-format
msgid "A&rchive Support disabled..."
-msgstr "&Podpora arhiviranju onemogo\xE8ena"
+msgstr "&Podpora arhivskim datotekam onemogo\xE8ena"
#: Merge.rc:187
#: Merge.rc:308
@@ -480,7 +479,7 @@
#: Merge.rc:218
#, c-format
msgid "Show &Identical Items"
-msgstr "Prika\x9Ei &identiene predmete"
+msgstr "Prika\x9Ei &identi\xE8ne predmete"
#: Merge.rc:219
#, c-format
@@ -500,7 +499,7 @@
#: Merge.rc:222
#, c-format
msgid "Show S&kipped Items"
-msgstr "Prika\x9Ei &preskoeene predmete"
+msgstr "Prika\x9Ei &presko\xE8ene predmete"
#: Merge.rc:223
#, c-format
@@ -515,17 +514,17 @@
#: Merge.rc:227
#, c-format
msgid "Tree &Mode"
-msgstr ""
+msgstr "&Drevesni na\xE8in"
#: Merge.rc:228
#, c-format
msgid "E&xpand All Subfolders"
-msgstr ""
+msgstr "Ra&z\x9Airi vse mape"
#: Merge.rc:229
#, c-format
msgid "&Collapse All Subfolders"
-msgstr ""
+msgstr "S&kr\xE8i vse mape"
#: Merge.rc:242
#, c-format
@@ -731,7 +730,7 @@
msgstr "&Skripte"
#: Merge.rc:373
-#: Merge.rc:2803
+#: Merge.rc:2708
#, c-format
msgid "< Empty >"
msgstr "< Prazno >"
@@ -934,14 +933,14 @@
#: Merge.rc:526
#: Merge.rc:1147
-#: Merge.rc:1531
+#: Merge.rc:1514
#, c-format
msgid "&Left"
msgstr "&Levo"
#: Merge.rc:527
#: Merge.rc:1149
-#: Merge.rc:1534
+#: Merge.rc:1517
#, c-format
msgid "&Right"
msgstr "&Desno"
@@ -1098,12 +1097,12 @@
#: Merge.rc:1066
#: Merge.rc:1095
#: Merge.rc:1105
-#: Merge.rc:1273
-#: Merge.rc:1337
-#: Merge.rc:1350
-#: Merge.rc:1442
-#: Merge.rc:1457
-#: Merge.rc:1679
+#: Merge.rc:1256
+#: Merge.rc:1320
+#: Merge.rc:1333
+#: Merge.rc:1425
+#: Merge.rc:1440
+#: Merge.rc:1662
#, c-format
msgid "OK"
msgstr "Vredu"
@@ -1119,7 +1118,7 @@
msgstr "Izberite datoteke ali mape"
#: Merge.rc:690
-#: Merge.rc:1608
+#: Merge.rc:1591
#, c-format
msgid "&Left:"
msgstr "&Levo"
@@ -1133,7 +1132,7 @@
msgstr "&Brskaj..."
#: Merge.rc:695
-#: Merge.rc:1612
+#: Merge.rc:1595
#, c-format
msgid "&Right:"
msgstr "&Desni panel:"
@@ -1145,13 +1144,13 @@
msgstr "&Brskaj..."
#: Merge.rc:700
-#: Merge.rc:1616
+#: Merge.rc:1599
#, c-format
msgid "&Filter:"
msgstr "&Filter:"
#: Merge.rc:703
-#: Merge.rc:1618
+#: Merge.rc:1601
#, c-format
msgid "Select..."
msgstr "Iz&beri..."
@@ -1167,7 +1166,7 @@
msgstr "&Izberi..."
#: Merge.rc:708
-#: Merge.rc:1619
+#: Merge.rc:1602
#, c-format
msgid "&Include Subfolders"
msgstr "&Vklju\xE8i podmape"
@@ -1187,17 +1186,17 @@
#: Merge.rc:1096
#: Merge.rc:1106
#: Merge.rc:1157
-#: Merge.rc:1274
-#: Merge.rc:1351
-#: Merge.rc:1443
-#: Merge.rc:1458
-#: Merge.rc:1680
+#: Merge.rc:1257
+#: Merge.rc:1334
+#: Merge.rc:1426
+#: Merge.rc:1441
+#: Merge.rc:1663
#, c-format
msgid "Cancel"
msgstr "Prekli\xE8i"
#: Merge.rc:713
-#: Merge.rc:1352
+#: Merge.rc:1335
#, c-format
msgid "Help"
msgstr "Pomo\xE8"
@@ -1265,13 +1264,14 @@
msgstr "&Izbor programa:"
#: Merge.rc:753
-#: Merge.rc:2079
+#: Merge.rc:2083
#, c-format
msgid "&Path to cleartool.exe:"
msgstr "&Pot do cleartool.exe:"
#: Merge.rc:760
-#: Merge.rc:1955
+#: Merge.rc:1956
+#: Merge.rc:1969
#, c-format
msgid "General"
msgstr "Splo\x9Ano"
@@ -1314,7 +1314,7 @@
#: Merge.rc:780
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
-msgstr ""
+msgstr "Prika\x9Ei pogovorno okno \"Izberite datoteke ali mape\" ob zagonu"
#: Merge.rc:782
#, c-format
@@ -1327,13 +1327,13 @@
msgstr "Omogo\xE8i ve\xE8kratno primerjanje oken za"
#: Merge.rc:787
-#: Merge.rc:1631
+#: Merge.rc:1614
#, c-format
msgid "&Folder compare"
msgstr "Primerjava &map"
#: Merge.rc:789
-#: Merge.rc:1633
+#: Merge.rc:1616
#, c-format
msgid "Fil&e compare"
msgstr "Primerjva &datotek"
@@ -1343,7 +1343,7 @@
msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
msgstr ""
"WinMerge omogo\xE8a skrivanje skupnih sporo\xE8ilnih okvirjev.\n"
-"Pritisnite gumb za ponovni zagon, da bodo postala vsa sporo\xE8ilna okna vidna."
+"Pritisnite gumb Ponastavi, da bodo postala vsa sporo\xE8ilna okna vidna."
#: Merge.rc:793
#, c-format
@@ -1456,7 +1456,7 @@
msgstr "Zamenjaj &vse"
#: Merge.rc:872
-#: Merge.rc:2201
+#: Merge.rc:2205
#, c-format
msgid "Rational ClearCase"
msgstr "Racionalno jasen primer"
@@ -1467,7 +1467,7 @@
msgstr "Preveri"
#: Merge.rc:880
-#: Merge.rc:1191
+#: Merge.rc:1175
#, c-format
msgid "Comments"
msgstr "Komentarji"
@@ -1513,7 +1513,7 @@
msgstr "Odstrani"
#: Merge.rc:910
-#: Merge.rc:1958
+#: Merge.rc:1959
#, c-format
msgid "Colors"
msgstr "Barve"
@@ -1529,7 +1529,7 @@
msgstr "Izbrane razlike"
#: Merge.rc:921
-#: Merge.rc:1583
+#: Merge.rc:1566
#, c-format
msgid "Background"
msgstr "Ozadje"
@@ -1540,8 +1540,9 @@
msgstr "Izbrisano"
#: Merge.rc:935
-#: Merge.rc:1378
-#: Merge.rc:1584
+#: Merge.rc:1361
+#: Merge.rc:1567
+#: Merge.rc:1960
#, c-format
msgid "Text"
msgstr "Besedilo"
@@ -1574,21 +1575,22 @@
#: Merge.rc:986
#: Merge.rc:1065
#: Merge.rc:1094
-#: Merge.rc:1194
-#: Merge.rc:1424
+#: Merge.rc:1177
+#: Merge.rc:1407
+#: Merge.rc:1699
#, c-format
msgid "Defaults"
msgstr "Privzeto"
#: Merge.rc:992
-#: Merge.rc:1366
-#: Merge.rc:1572
+#: Merge.rc:1349
+#: Merge.rc:1555
#, c-format
msgid "Dialog"
msgstr "Dialog"
#: Merge.rc:1002
-#: Merge.rc:1961
+#: Merge.rc:1962
#, c-format
msgid "System"
msgstr "Sistem"
@@ -1742,17 +1744,17 @@
#: Merge.rc:1107
#, c-format
msgid "File unpacker:"
-msgstr "Arhiver datoteke:"
+msgstr "Arhivske datoteke:"
#: Merge.rc:1110
#, c-format
msgid "Display all unpackers, don't check the extension"
-msgstr "Prika\x9Ei vsa orodja za stiskanje, ne preverjaj ekstenzije"
+msgstr "Prika\x9Ei vsa orodja za stiskanje, ne preverjaj kon\xE8nice"
#: Merge.rc:1113
#, c-format
msgid "Extensions list:"
-msgstr "Popis ekstenzij"
+msgstr "Popis kon\xE8nic"
#: Merge.rc:1114
#, c-format
@@ -1765,7 +1767,7 @@
msgstr "Napredek primerjanja map"
#: Merge.rc:1128
-#: Merge.rc:1908
+#: Merge.rc:1909
#, c-format
msgid "Stop"
msgstr "Ustavi"
@@ -1821,7 +1823,7 @@
msgstr "Pojdi &na"
#: Merge.rc:1162
-#: Merge.rc:1956
+#: Merge.rc:1957
#, c-format
msgid "Compare"
msgstr "Primerjaj"
@@ -1836,258 +1838,243 @@
msgid "&Compare"
msgstr "&Primerjaj"
-#: Merge.rc:1168
+#: Merge.rc:1167
#, c-format
msgid "&Ignore change"
msgstr "&Ignoriraj spremembe"
-#: Merge.rc:1170
+#: Merge.rc:1168
#, c-format
msgid "I&gnore all"
msgstr "Ig&noriraj vse"
-#: Merge.rc:1172
+#: Merge.rc:1169
#, c-format
msgid "Ignore blan&k lines"
msgstr "Ignoriraj prazne &vrstice"
-#: Merge.rc:1174
+#: Merge.rc:1170
#, c-format
msgid "Ignore &case"
msgstr "Zanemari &primere"
-#: Merge.rc:1176
+#: Merge.rc:1171
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
msgstr "&Zanemari razli\xE8nost vrnitev oznak zaklju\xE8ka (Windows/Unix/Mac)"
-#: Merge.rc:1179
+#: Merge.rc:1173
#, c-format
msgid "E&nable moved block detection"
msgstr "Omogo\xE8i &razlikovanje premaknjenih blokov"
-#: Merge.rc:1181
+#: Merge.rc:1174
#, c-format
msgid "&Match similar lines"
msgstr "&Ozna\xE8i enake vrstice"
-#: Merge.rc:1183
+#: Merge.rc:1176
#, c-format
-msgid "Ign&ore time differences less than 3 seconds"
-msgstr "&Zanemari razlike manj\x9Ae od 3 sekund"
-
-#: Merge.rc:1186
-#, c-format
-msgid "&File Compare method:"
-msgstr "&Metoda za primerjanje dototek:"
-
-#: Merge.rc:1189
-#, c-format
-msgid "S&top after first difference"
-msgstr "&Ustavi na prvi razliki"
-
-#: Merge.rc:1192
-#, c-format
msgid "Filter Comments"
msgstr "Filtriraj komentarje"
-#: Merge.rc:1199
-#: Merge.rc:1957
+#: Merge.rc:1182
+#: Merge.rc:1958
#, c-format
msgid "Editor"
msgstr "Urejevanlnik"
-#: Merge.rc:1202
+#: Merge.rc:1185
#, c-format
msgid "&Highlight syntax"
msgstr "&Poudari skladnjo"
-#: Merge.rc:1204
+#: Merge.rc:1187
#, c-format
msgid "&Automatic rescan"
msgstr "&Samodejno ponovno iskanje"
-#: Merge.rc:1206
+#: Merge.rc:1189
#, c-format
msgid "&Preserve original EOL chars"
msgstr "Obdr\x9Ei izvorni na\xE8in ozna\xE8evanje"
-#: Merge.rc:1208
+#: Merge.rc:1191
#, c-format
msgid "Tabs"
msgstr "Tabulatorji"
-#: Merge.rc:1209
+#: Merge.rc:1192
#, c-format
msgid "&Tab size:"
msgstr "&Velikost tabel"
-#: Merge.rc:1212
+#: Merge.rc:1195
#, c-format
msgid "&Insert Tabs"
msgstr "&Vstavi tabele"
-#: Merge.rc:1214
+#: Merge.rc:1197
#, c-format
msgid "Insert &Spaces"
msgstr "&Vstavi presledeke"
-#: Merge.rc:1216
+#: Merge.rc:1199
#, c-format
msgid "Line Difference Coloring"
msgstr "Obarvaj razlike v vrstici"
-#: Merge.rc:1218
+#: Merge.rc:1201
#, c-format
msgid "View line differences"
-msgstr "Poglej vrstiene razlike"
+msgstr "Poglej vrsti\xE8ne razlike"
-#: Merge.rc:1220
+#: Merge.rc:1203
#, c-format
msgid "&Character level"
msgstr "&Zna\xE8ajski nivo"
-#: Merge.rc:1222
+#: Merge.rc:1205
#, c-format
msgid "&Word-level:"
msgstr "&Nivo besede"
-#: Merge.rc:1226
+#: Merge.rc:1209
#, c-format
msgid "W&ord break characters:"
msgstr ""
-#: Merge.rc:1239
+#: Merge.rc:1222
#, c-format
msgid "Filefilters"
msgstr "Datote\xE8ni filtri"
-#: Merge.rc:1245
+#: Merge.rc:1228
#, c-format
msgid "Test"
msgstr "Test"
-#: Merge.rc:1246
+#: Merge.rc:1229
#, c-format
msgid "Install..."
msgstr "Namesti..."
-#: Merge.rc:1247
+#: Merge.rc:1230
#, c-format
msgid "New..."
msgstr "Nova..."
-#: Merge.rc:1248
+#: Merge.rc:1231
#, c-format
msgid "Edit..."
msgstr "Uredi..."
-#: Merge.rc:1249
+#: Merge.rc:1232
#, c-format
msgid "Delete..."
msgstr "Izbri\x9Ai..."
-#: Merge.rc:1255
+#: Merge.rc:1238
#, c-format
msgid "Save modified files?"
msgstr "Shrani spremenjene datoteke?"
-#: Merge.rc:1258
+#: Merge.rc:1241
#, c-format
msgid "Left side file"
msgstr "Leva stran datoteke"
-#: Merge.rc:1261
+#: Merge.rc:1244
#, c-format
msgid "&Save changes"
msgstr "&Shrani spremembe"
-#: Merge.rc:1263
+#: Merge.rc:1246
#, c-format
msgid "&Discard changes"
msgstr "&Zavr\x9Ei spremembe"
-#: Merge.rc:1265
+#: Merge.rc:1248
#, c-format
msgid "Right side file"
msgstr "Desna stran datoteke"
-#: Merge.rc:1268
+#: Merge.rc:1251
#, c-format
msgid "S&ave changes"
msgstr "Shrani spremembe"
-#: Merge.rc:1270
+#: Merge.rc:1253
#, c-format
msgid "Dis&card changes"
msgstr "Zavr\x9Ei spremembe"
-#: Merge.rc:1272
+#: Merge.rc:1255
#, c-format
msgid "Disca&rd All"
msgstr ""
-#: Merge.rc:1279
-#: Merge.rc:1527
-#: Merge.rc:1963
+#: Merge.rc:1262
+#: Merge.rc:1510
+#: Merge.rc:1964
#, c-format
msgid "Codepage"
msgstr "Kodna tabela"
-#: Merge.rc:1282
+#: Merge.rc:1265
#, c-format
msgid "Default Codepage"
msgstr "Standartna kodna tabela"
-#: Merge.rc:1283
+#: Merge.rc:1266
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr "Izberi splo\x9Ano kodno tabelo ko se nalagajo non-Unicode datoteke:"
-#: Merge.rc:1285
+#: Merge.rc:1268
#, c-format
msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session"
-msgstr ""
+msgstr "Zaznaj kodno tabelo za datoteke s kon\xE8nico: .html, .rc, .xml \npotreben je ponovni zagon seje"
-#: Merge.rc:1288
+#: Merge.rc:1271
#, c-format
msgid "System codepage"
msgstr "Sistemska kodna tabela"
-#: Merge.rc:1290
+#: Merge.rc:1273
#, c-format
msgid "According to WinMerge User Interface"
msgstr "Po mnenju WinMerge uporabni\x9Akega vmesnika"
-#: Merge.rc:1292
+#: Merge.rc:1275
#, c-format
msgid "Custom codepage:"
-msgstr ""
+msgstr "Kodna tabela po meri:"
-#: Merge.rc:1300
+#: Merge.rc:1283
#, c-format
msgid "WinMerge - Archive support disabled"
-msgstr "WinMerge - Arhivna podpora onemogo\xE8ena"
+msgstr "WinMerge - podpora Arhivskim datotekam onemogo\xE8ena"
-#: Merge.rc:1303
+#: Merge.rc:1286
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
msgstr "Ni mogo\xE8e zaznati 7-zip verzijo (ni name\x9A\xE8ena?)"
# Removed \n because of lack of space!
-#: Merge.rc:1306
+#: Merge.rc:1289
#, c-format
msgid ""
"Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n"
"essential components to be copied to the program directory for standalone operation."
-msgstr "Delo z arhivi zahteva program 7-Zip 3.11 ali njegovo novej\x9Ao razli\xE8ico name\x9A\xE8eno na va\x9Aem ra\xE8unalniku"
+msgstr "Delo z arhivskimi datotekami zahteva program 7-Zip 3.11 ali njegovo novej\x9Ao razli\xE8ico name\x9A\xE8eno na va\x9Aem ra\xE8unalniku"
-#: Merge.rc:1308
+#: Merge.rc:1291
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
msgstr "Name\x9A\xE8eni morajo biti tudi pravi vmesniki (Merge7z*.dll) na poti do njega"
-#: Merge.rc:1310
+#: Merge.rc:1293
#, c-format
msgid ""
"Please use the version of 7-Zip recommended below until interface plugins for later\n"
@@ -2096,12 +2083,12 @@
"Prosim, uporabite razli\xE8ico programa 7-Zip ni\x9Ejo verzijo, dokler ne bodo dostopne nove raz\x9Airitve\n"
"razli\xE8ice postanejo razpolo\x9Eljive"
-#: Merge.rc:1312
+#: Merge.rc:1295
#, c-format
msgid "Version"
msgstr "Verzija"
-#: Merge.rc:1314
+#: Merge.rc:1297
#, c-format
msgid ""
"Plugin required\n"
@@ -2110,54 +2097,54 @@
"Potreben vti\xE8nik\n"
"(dllbuild %04u)"
-#: Merge.rc:1316
+#: Merge.rc:1299
#, c-format
msgid "Recommended version of 7-Zip:"
msgstr "Priporo\xE8ljiva verzija 7-zip:"
-#: Merge.rc:1319
-#: Merge.rc:1322
+#: Merge.rc:1302
+#: Merge.rc:1305
#, c-format
msgid "present"
msgstr "Predstavlja"
-#: Merge.rc:1320
+#: Merge.rc:1303
#, c-format
msgid "Merge7z000U.dll"
msgstr "Zdru\x9Ei 7z000U.dll"
-#: Merge.rc:1323
+#: Merge.rc:1306
#, c-format
msgid "7-Zip software installed on your computer:"
msgstr "7-Zip programska oprema je name\x9A\xE8ena na ra\xE8unalniku:"
-#: Merge.rc:1325
-#: Merge.rc:1330
+#: Merge.rc:1308
+#: Merge.rc:1313
#, c-format
msgid "none"
msgstr "Ni\xE8"
-#: Merge.rc:1327
+#: Merge.rc:1310
#, c-format
msgid "missing"
msgstr "pogre\x9Aan"
-#: Merge.rc:1328
+#: Merge.rc:1311
#, c-format
msgid "7-Zip components for standalone operation:"
msgstr "7-Zip komponente za samostojno delovanje:"
-#: Merge.rc:1332
+#: Merge.rc:1315
#, c-format
msgid "outdated"
msgstr "Zastarelo"
-#: Merge.rc:1333
+#: Merge.rc:1316
#, c-format
msgid "Plugins on path:"
msgstr "Pot do vmesnikov"
-#: Merge.rc:1334
+#: Merge.rc:1317
#, c-format
msgid ""
"Don't display this &message again.\n"
@@ -2166,535 +2153,567 @@
"Ne prika\x9Ei ponovno tega sporo\xE8ila.\n"
"(Vedno lahko dostopate do tega sporo\xE8ila iz menija pomo\xE8.)"
-#: Merge.rc:1338
+#: Merge.rc:1321
#, c-format
msgid "Plugin Download"
msgstr "Prenos vti\xE8nikov"
-#: Merge.rc:1347
+#: Merge.rc:1330
#, c-format
msgid "Options"
msgstr "Opcije"
-#: Merge.rc:1358
+#: Merge.rc:1341
#, c-format
msgid " Categories"
msgstr " Kategorije"
-#: Merge.rc:1360
+#: Merge.rc:1343
#, c-format
msgid "Import..."
msgstr "Uvozi..."
-#: Merge.rc:1361
+#: Merge.rc:1344
#, c-format
msgid "Export..."
msgstr "Izvozi..."
-#: Merge.rc:1369
+#: Merge.rc:1352
#, c-format
msgid "Keywords:"
msgstr "Klju\xE8ne Besede:"
-#: Merge.rc:1370
+#: Merge.rc:1353
#, c-format
msgid "Function names:"
msgstr "Imena funkcij:"
-#: Merge.rc:1371
+#: Merge.rc:1354
#, c-format
msgid "Comments:"
msgstr "Komentarji"
-#: Merge.rc:1372
+#: Merge.rc:1355
#, c-format
msgid "Numbers:"
msgstr "\x8Atevilke:"
-#: Merge.rc:1373
+#: Merge.rc:1356
#, c-format
msgid "Operators:"
msgstr "Operatorji"
-#: Merge.rc:1374
+#: Merge.rc:1357
#, c-format
msgid "Strings:"
msgstr "Nizi"
-#: Merge.rc:1375
+#: Merge.rc:1358
#, c-format
msgid "Preprocessor:"
msgstr "Preprocesirano"
-#: Merge.rc:1376
+#: Merge.rc:1359
#, c-format
msgid "User 1:"
msgstr "Uporabnik 1:"
-#: Merge.rc:1377
+#: Merge.rc:1360
#, c-format
msgid "User 2:"
msgstr "Uporabnik 2:"
-#: Merge.rc:1382
-#: Merge.rc:1387
-#: Merge.rc:1392
-#: Merge.rc:1397
-#: Merge.rc:1402
-#: Merge.rc:1407
-#: Merge.rc:1412
-#: Merge.rc:1417
-#: Merge.rc:1422
+#: Merge.rc:1365
+#: Merge.rc:1370
+#: Merge.rc:1375
+#: Merge.rc:1380
+#: Merge.rc:1385
+#: Merge.rc:1390
+#: Merge.rc:1395
+#: Merge.rc:1400
+#: Merge.rc:1405
#, c-format
msgid "Bold"
msgstr "Odebeljeno"
-#: Merge.rc:1430
+#: Merge.rc:1413
#, c-format
msgid "Folder Compare Report"
msgstr "Poro\xE8ilo primerjanja datotek"
-#: Merge.rc:1433
+#: Merge.rc:1416
#, c-format
msgid "Report &File:"
msgstr "Poro\xE8ilo &datoteke:"
-#: Merge.rc:1436
-#: Merge.rc:1610
-#: Merge.rc:1614
-#: Merge.rc:1641
+#: Merge.rc:1419
+#: Merge.rc:1593
+#: Merge.rc:1597
+#: Merge.rc:1624
#, c-format
msgid "Browse..."
msgstr "Brskaj..."
-#: Merge.rc:1437
+#: Merge.rc:1420
#, c-format
msgid "&Style:"
msgstr "&Stil:"
-#: Merge.rc:1440
+#: Merge.rc:1423
#, c-format
msgid "&Copy to Clipboard"
msgstr "&Kopiraj v medpomnilnik"
-#: Merge.rc:1448
+#: Merge.rc:1431
#, c-format
msgid "Shared or Private Filter"
msgstr "Skupni ali privatni filter"
-#: Merge.rc:1451
+#: Merge.rc:1434
#, c-format
msgid "Which type of filter do you want to create?"
msgstr "Kateri tip filtra \x9Eelite ustvariti"
-#: Merge.rc:1453
+#: Merge.rc:1436
#, c-format
msgid "Shared Filter (for all users on this machine)"
msgstr "Deljen filter (za vse uporabnike na tem ra\xE8unalniku)"
-#: Merge.rc:1455
+#: Merge.rc:1438
#, c-format
msgid "Private Filter (only for current user)"
msgstr "Zasebni filter (samo za dolo\xE8ene uporabnike)"
-#: Merge.rc:1463
-#: Merge.rc:1964
+#: Merge.rc:1446
+#: Merge.rc:1965
#, c-format
msgid "Archive Support"
-msgstr "Podpora arhivom"
+msgstr "Podpora arhivskim datotekam"
-#: Merge.rc:1466
+#: Merge.rc:1449
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
-msgstr "Arhivna podpora zahteva 7-zip name\x9A\xE8en vti\xE8nik:"
+msgstr "Podpora za arhivske datoteke zahteva 7-zip name\x9A\xE8en vti\xE8nik:"
-#: Merge.rc:1468
+#: Merge.rc:1451
#, c-format
msgid "Download 7-zip Plugin"
msgstr "Prenosi 7-zip vti\xE8nik"
-#: Merge.rc:1469
+#: Merge.rc:1452
#, c-format
msgid "&Enable archive file support"
-msgstr "Omogu\xE8i delo z &arhivi"
+msgstr "Omogo\xE8i delo z &arhivskimi datotekami"
-#: Merge.rc:1471
+#: Merge.rc:1454
#, c-format
msgid "&Use stand-alone 7-Zip if available"
msgstr "&Uporabi standardni 7-zip \xE8e je razpolo\x9Eljiv"
-#: Merge.rc:1474
+#: Merge.rc:1457
#, c-format
msgid "U&se local 7-Zip from WinMerge folder"
msgstr "&Uporabi lokalni 7-zip iz WinMerge mape"
-#: Merge.rc:1476
+#: Merge.rc:1459
#, c-format
msgid "&Detect archive type from file signature"
-msgstr "&Razberi tip arhiva iz podpisa datoteke"
+msgstr "&Razberi tip arhivske datoteke iz podpisa datoteke"
-#: Merge.rc:1484
+#: Merge.rc:1467
#, c-format
msgid "Compare Statistics"
msgstr "Preimerjaj statistiko"
-#: Merge.rc:1487
+#: Merge.rc:1470
#, c-format
msgid "Folders:"
msgstr "Mape:"
-#: Merge.rc:1488
+#: Merge.rc:1471
#, c-format
msgid "Files:"
msgstr "Datoteke:"
-#: Merge.rc:1489
-#: Merge.rc:2355
+#: Merge.rc:1472
+#: Merge.rc:2359
#, c-format
msgid "Different"
msgstr "Razlika"
-#: Merge.rc:1490
+#: Merge.rc:1473
#, c-format
msgid "Text:"
msgstr "Besedilo:"
-#: Merge.rc:1493
-#: Merge.rc:1512
+#: Merge.rc:1476
+#: Merge.rc:1495
#, c-format
msgid "Binary:"
msgstr "Binarno:"
-#: Merge.rc:1496
+#: Merge.rc:1479
#, c-format
msgid "Unique"
msgstr "Unikat"
-#: Merge.rc:1497
+#: Merge.rc:1480
#, c-format
msgid "Left:"
msgstr "Levo:"
-#: Merge.rc:1502
+#: Merge.rc:1485
#, c-format
msgid "Right:"
msgstr "Desno:"
-#: Merge.rc:1507
-#: Merge.rc:2349
+#: Merge.rc:1490
+#: Merge.rc:2353
#, c-format
msgid "Identical"
msgstr "Identi\xE8no"
-#: Merge.rc:1516
+#: Merge.rc:1499
#, c-format
msgid "Total:"
msgstr "Celotno:"
-#: Merge.rc:1521
+#: Merge.rc:1504
#, c-format
msgid "Close"
msgstr "Zapri"
-#: Merge.rc:1530
+#: Merge.rc:1513
#, c-format
msgid "Affects"
msgstr "Spremembe"
-#: Merge.rc:1533
-#: Merge.rc:1536
+#: Merge.rc:1516
+#: Merge.rc:1519
#, c-format
msgid "(Affects)"
msgstr "(spremembe)"
-#: Merge.rc:1537
+#: Merge.rc:1520
#, c-format
msgid "Select Codepage for"
msgstr "Izberi kodno tabelo za"
-#: Merge.rc:1538
+#: Merge.rc:1521
#, c-format
msgid "&File Loading:"
msgstr "&Nalaganje datoteke:"
-#: Merge.rc:1540
-#: Merge.rc:1543
+#: Merge.rc:1523
+#: Merge.rc:1526
#, c-format
msgid "..."
msgstr "..."
-#: Merge.rc:1541
+#: Merge.rc:1524
#, c-format
msgid "File &Saving:"
msgstr "Shranjevanje &datoteke:"
-#: Merge.rc:1544
+#: Merge.rc:1527
#, c-format
msgid "&Use same codepage for both"
msgstr "&Uporabi enako kodno tabelo za oba"
-#: Merge.rc:1547
+#: Merge.rc:1530
#, c-format
msgid "&Apply"
msgstr "&Uporabi"
-#: Merge.rc:1548
-#: Merge.rc:1930
+#: Merge.rc:1531
+#: Merge.rc:1931
#, c-format
msgid "&Cancel"
msgstr "&Prekli\xE8i"
-#: Merge.rc:1553
+#: Merge.rc:1536
#, c-format
msgid "Test Filter"
msgstr "Testni filter"
-#: Merge.rc:1556
+#: Merge.rc:1539
#, c-format
msgid "Testing filter ..."
msgstr "Testiranje filtra..."
-#: Merge.rc:1558
+#: Merge.rc:1541
#, c-format
msgid "&Enter text to test:"
msgstr "&Vnos besedila za testiranje:"
-#: Merge.rc:1560
+#: Merge.rc:1543
#, c-format
msgid "&Folder Name"
msgstr "&Ime mape"
-#: Merge.rc:1562
+#: Merge.rc:1545
#, c-format
msgid "Result:"
msgstr "Rezultat:"
-#: Merge.rc:1566
+#: Merge.rc:1549
#, c-format
msgid "&Test"
msgstr "&Test"
-#: Merge.rc:1567
+#: Merge.rc:1550
#, c-format
msgid "&Close"
msgstr "&Zapri"
-#: Merge.rc:1575
+#: Merge.rc:1558
#, c-format
msgid "&Use customized text colors"
msgstr "&Uporabi izbrane barve besedila"
-#: Merge.rc:1578
+#: Merge.rc:1561
#, c-format
msgid "Custom text colors"
msgstr "Izbrane barve besedila"
-#: Merge.rc:1580
+#: Merge.rc:1563
#, c-format
msgid "Whitespace:"
msgstr "Skriti znaki in razmaki:"
-#: Merge.rc:1581
+#: Merge.rc:1564
#, c-format
msgid "Regular text:"
msgstr "Stalno besedilo"
-#: Merge.rc:1582
+#: Merge.rc:1565
#, c-format
msgid "Selection:"
msgstr "Izbira:"
-#: Merge.rc:1605
+#: Merge.rc:1588
#, c-format
msgid "Paths"
msgstr "Poti"
-#: Merge.rc:1611
+#: Merge.rc:1594
#, c-format
msgid "R&ead-only"
msgstr "Samo za branje"
-#: Merge.rc:1615
+#: Merge.rc:1598
#, c-format
msgid "Re&ad-only"
msgstr "Samo za branje"
-#: Merge.rc:1621
+#: Merge.rc:1604
#, c-format
msgid "Open..."
msgstr "Odpri.."
-#: Merge.rc:1622
+#: Merge.rc:1605
#, c-format
msgid "Save..."
msgstr "Shrani"
-#: Merge.rc:1627
-#: Merge.rc:1965
+#: Merge.rc:1610
+#: Merge.rc:1966
#, c-format
msgid "Backup Files"
msgstr "Varnostne datoteke"
-#: Merge.rc:1630
+#: Merge.rc:1613
#, c-format
msgid "Create backup files in:"
msgstr "Ustvari varnostne datoteke v:"
-#: Merge.rc:1635
+#: Merge.rc:1618
#, c-format
msgid "Create backup files into:"
msgstr "Ustvari varnostne datoteke v:"
-#: Merge.rc:1636
+#: Merge.rc:1619
#, c-format
msgid "&Original file's folder"
msgstr "&Izvorna datote\xE8na mapa"
-#: Merge.rc:1638
+#: Merge.rc:1621
#, c-format
msgid "&Global backup folder:"
msgstr "&Globalna varnostna mapa:"
-#: Merge.rc:1642
+#: Merge.rc:1625
#, c-format
msgid "Backup filename:"
msgstr "Naziv varnostne datoteke"
-#: Merge.rc:1643
+#: Merge.rc:1626
#, c-format
msgid "&Append .bak -extension"
-msgstr "&Dodaj .bak ekstenzijo"
+msgstr "&Dodaj .bak kon\xE8nico"
-#: Merge.rc:1645
+#: Merge.rc:1628
#, c-format
msgid "A&ppend timestamp"
msgstr "&Dodaj datum in \xE8as "
-#: Merge.rc:1652
-#: Merge.rc:2257
+#: Merge.rc:1635
+#: Merge.rc:2261
#, c-format
msgid "Confirm Copy"
-msgstr "Potrdi klopiranje"
+msgstr "Potrdi kopiranje"
-#: Merge.rc:1656
+#: Merge.rc:1639
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr "Ali ste prepri\xE8ani, da \x9Eelite kopirati XXX predmete?"
-#: Merge.rc:1658
+#: Merge.rc:1641
#, c-format
msgid "From left"
msgstr "Z leve"
-#: Merge.rc:1661
+#: Merge.rc:1644
#, c-format
msgid "To right"
msgstr "Na desno"
-#: Merge.rc:1664
+#: Merge.rc:1647
#, c-format
msgid "Yes"
msgstr "Da"
-#: Merge.rc:1665
+#: Merge.rc:1648
#, c-format
msgid "No"
msgstr "Ne"
-#: Merge.rc:1671
+#: Merge.rc:1654
#, c-format
msgid "Plugins"
msgstr ""
-#: Merge.rc:1674
+#: Merge.rc:1657
#, c-format
msgid "&Enable plugins"
msgstr ""
-#: Merge.rc:1685
-#: Merge.rc:1966
+#: Merge.rc:1668
+#: Merge.rc:1967
#, c-format
msgid "Shell Integration"
msgstr ""
-#: Merge.rc:1688
+#: Merge.rc:1671
#, c-format
msgid "Explorer"
msgstr ""
-#: Merge.rc:1689
+#: Merge.rc:1672
#, c-format
msgid "E&nable advanced menu"
msgstr "Omogo\xE8i &napredni meni"
-#: Merge.rc:1691
+#: Merge.rc:1674
#, c-format
msgid "In&clude subfolders by default"
msgstr "Privzeto vklju\xE8i podmape"
-#: Merge.rc:1693
+#: Merge.rc:1676
#, c-format
msgid "&Add to context menu"
+msgstr "&Dodaj k raz\x9Airjenemu meniju"
+
+#: Merge.rc:1678
+#, c-format
+msgid "Folder compare"
+msgstr "Primerjava map"
+
+#: Merge.rc:1679
+#, c-format
+msgid "Add &Shell menu to context menu"
+msgstr "Dodaj obstoje\xE8i meni k &raz\x9Airjenemu meniju"
+
+#: Merge.rc:1686
+#: Merge.rc:1970
+#: Merge.rc:2307
+#, c-format
+msgid "Folder"
+msgstr "Mapa"
+
+#: Merge.rc:1689
+#, c-format
+msgid "&Compare method:"
msgstr ""
+#: Merge.rc:1691
+#, c-format
+msgid "S&top after first difference"
+msgstr "&Ustavi na prvi razliki"
+
+#: Merge.rc:1693
+#, c-format
+msgid "Ign&ore time differences less than 3 seconds"
+msgstr "&Zanemari razlike manj\x9Ae od 3 sekund"
+
#: Merge.rc:1695
#, c-format
-msgid "Folder compare"
+msgid "&Include unique subfolders contents"
msgstr ""
-#: Merge.rc:1696
+#: Merge.rc:1697
#, c-format
-msgid "Add &Shell menu to context menu"
+msgid "&Quick compare limit (MB):"
msgstr ""
#. StringFileInfo.Block
-#: Merge.rc:1722
+#: Merge.rc:1723
#, c-format
msgid "040904e4"
msgstr "040904e4"
#. VarFileInfo.Translation
-#: Merge.rc:1738
+#: Merge.rc:1739
#, c-format
msgid "0x409, 1252"
msgstr "0x407, 1250"
-#: Merge.rc:1753
+#: Merge.rc:1754
#, c-format
msgid "Ready"
msgstr "Pripravljen"
-#: Merge.rc:1759
+#: Merge.rc:1760
#, c-format
msgid "EXT"
msgstr "EXT"
-#: Merge.rc:1760
+#: Merge.rc:1761
#, c-format
msgid "CAP"
msgstr "CAP"
-#: Merge.rc:1761
+#: Merge.rc:1762
#, c-format
msgid "NUM"
msgstr "NUM"
-#: Merge.rc:1762
+#: Merge.rc:1763
#, c-format
msgid "SCRL"
msgstr "SCRL"
-#: Merge.rc:1763
+#: Merge.rc:1764
#, c-format
msgid "OVR"
msgstr "OVR"
-#: Merge.rc:1764
+#: Merge.rc:1765
#, c-format
msgid "REC"
msgstr "REC"
-#: Merge.rc:1770
+#: Merge.rc:1771
#, c-format
msgid ""
"Create empty documents\n"
@@ -2703,7 +2722,7 @@
"Ustvari prazne dokumente\n"
"Novi dokumenti (Ctrl+N)"
-#: Merge.rc:1771
+#: Merge.rc:1772
#, c-format
msgid ""
"Open an existing document\n"
@@ -2712,7 +2731,7 @@
"Odpri obstoj\xE8i dokument\n"
"Odpri (Ctrl+O)"
-#: Merge.rc:1772
+#: Merge.rc:1773
#, c-format
msgid ""
"Close the active document\n"
@@ -2721,7 +2740,7 @@
"Zapri aktiven dokument\n"
"Zapri"
-#: Merge.rc:1773
+#: Merge.rc:1774
#, c-format
msgid ""
"Save the active document\n"
@@ -2730,7 +2749,7 @@
"Shrani aktivni dokument\n"
"Shrani (Ctrl+S)"
-#: Merge.rc:1774
+#: Merge.rc:1775
#, c-format
msgid ""
"Save the active document with a new name\n"
@@ -2739,7 +2758,7 @@
"Shrani aktivni dokument pod novim imenom\n"
"Shrani kot"
-#: Merge.rc:1775
+#: Merge.rc:1776
#, c-format
msgid ""
"Change the printing options\n"
@@ -2748,7 +2767,7 @@
"Spremeni nastavitve tiskanja\n"
"Nastavitev strani"
-#: Merge.rc:1776
+#: Merge.rc:1777
#, c-format
msgid ""
"Change the printer and printing options\n"
@@ -2757,7 +2776,7 @@
"Zamenjajte tiskalnik in tiskalni\x9Ake nastavitve\n"
"Nastavitve tiskanja"
-#: Merge.rc:1777
+#: Merge.rc:1778
#, c-format
msgid ""
"Print the active document\n"
@@ -2766,7 +2785,7 @@
"Natisni aktivni dokument\n"
"Natisni"
-#: Merge.rc:1778
+#: Merge.rc:1779
#, c-format
msgid ""
"Display full pages\n"
@@ -2775,27 +2794,27 @@
"Prika\x9Ei vse strani\n"
"Predogledled tiskanja"
-#: Merge.rc:1783
+#: Merge.rc:1784
#, c-format
msgid "Make all hidden items visible again"
msgstr "Naredi vse skrite predmete ponovno vidne"
-#: Merge.rc:1784
+#: Merge.rc:1785
#, c-format
msgid "Toggle tree mode"
msgstr ""
-#: Merge.rc:1785
+#: Merge.rc:1786
#, c-format
msgid "Expand all subfolders"
msgstr ""
-#: Merge.rc:1786
+#: Merge.rc:1787
#, c-format
msgid "Collapse all subfolders"
msgstr ""
-#: Merge.rc:1792
+#: Merge.rc:1793
#, c-format
msgid ""
"Open project file\n"
@@ -2804,32 +2823,32 @@
"Odpri datoteko projekta\n"
"Datoteka projekta (Ctrl+J)"
-#: Merge.rc:1793
+#: Merge.rc:1794
#, c-format
msgid "Unknown error attempting to open project file"
msgstr "Neznana napaka pri odpiranju datoteke projekta"
-#: Merge.rc:1794
+#: Merge.rc:1795
#, c-format
msgid "Unknown error attempting to save project file"
msgstr "Neznana napaka pri shranjevanju datoteke projekta"
-#: Merge.rc:1795
+#: Merge.rc:1796
#, c-format
msgid "Project File"
msgstr "Datoteka projekta"
-#: Merge.rc:1796
+#: Merge.rc:1797
#, c-format
msgid "Project file successfully loaded."
msgstr "Projektna datoteka uspe\x9Ano nalo\x9Eena"
-#: Merge.rc:1797
+#: Merge.rc:1798
#, c-format
msgid "Project file successfully saved."
msgstr "Projektna datoteka uspe\x9Ano shranjena"
-#: Merge.rc:1798
+#: Merge.rc:1799
#, c-format
msgid ""
"Save current paths and options to project file\n"
@@ -2838,7 +2857,7 @@
"Shrani izbrano pot in mo\x9Enosti v projektno datoteko\n"
"Shrani projektno datoteko"
-#: Merge.rc:1803
+#: Merge.rc:1804
#, c-format
msgid ""
"Display program information, version number and copyright\n"
@@ -2847,7 +2866,7 @@
"Prika\x9Ei informacije o programu, verziji in avtorske pravice\n"
"O programu"
-#: Merge.rc:1804
+#: Merge.rc:1805
#, c-format
msgid ""
"Quit the application; prompts to save documents\n"
@@ -2856,7 +2875,6 @@
"Zapri aplikacijo; opozori shranjevanje dokumentov\n"
"Izhod"
-#: Merge.rc:1810
#: Merge.rc:1811
#: Merge.rc:1812
#: Merge.rc:1813
@@ -2872,11 +2890,12 @@
#: Merge.rc:1823
#: Merge.rc:1824
#: Merge.rc:1825
+#: Merge.rc:1826
#, c-format
msgid "Open this document"
msgstr "Odpri to datoteko"
-#: Merge.rc:1830
+#: Merge.rc:1831
#, c-format
msgid ""
"Switch to the next window pane\n"
@@ -2885,7 +2904,7 @@
"Preklopi na naslednji okenski panel\n"
"Naslednji panel"
-#: Merge.rc:1831
+#: Merge.rc:1832
#, c-format
msgid ""
"Switch back to the previous window pane\n"
@@ -2894,7 +2913,7 @@
"Preklopi nazaj na predhodni okenski panel\n"
"Predhodni panel"
-#: Merge.rc:1837
+#: Merge.rc:1838
#, c-format
msgid ""
"Arrange windows so they overlap\n"
@@ -2903,7 +2922,7 @@
"Zarvrsti okna kaskadno\n"
"Kaskadno"
-#: Merge.rc:1838
+#: Merge.rc:1839
#, c-format
msgid ""
"Arrange windows as non-overlapping tiles horizontally\n"
@@ -2912,7 +2931,7 @@
"Uredi okna vodoravno, brez prekrivanja\n"
"Okna vodoravno"
-#: Merge.rc:1839
+#: Merge.rc:1840
#, c-format
msgid ""
"Arrange windows as non-overlapping tiles vertically\n"
@@ -2921,7 +2940,7 @@
"Uredi okna vertikalno, bez prekrivanja\n"
"Okna vertikalno"
-#: Merge.rc:1845
+#: Merge.rc:1846
#, c-format
msgid ""
"Copy the selection and put it on the Clipboard\n"
@@ -2930,7 +2949,7 @@
"Kopiraj izbrano in odlo\x9Ei na odlo\x9Ei\x9A\xE8e\n"
"Kopiraj"
-#: Merge.rc:1846
+#: Merge.rc:1847
#, c-format
msgid ""
"Cut the selection and put it on the Clipboard\n"
@@ -2939,7 +2958,7 @@
"Izre\x9Ei izbrano in odlo\x9Ei na odlo\x9Ei\x9A\xE8e\n"
"Izre\x9Ei"
-#: Merge.rc:1847
+#: Merge.rc:1848
#, c-format
msgid ""
"Find the specified text\n"
@@ -2948,7 +2967,7 @@
"Najdi specifi\xE8no besedilo\n"
"Najdi"
-#: Merge.rc:1848
+#: Merge.rc:1849
#, c-format
msgid ""
"Insert Clipboard contents\n"
@@ -2957,7 +2976,7 @@
"Vstavi vsebino odlo\x9Ei\x9A\xE8a\n"
"Prilepi"
-#: Merge.rc:1849
+#: Merge.rc:1850
#, c-format
msgid ""
"Repeat the last action\n"
@@ -2966,16 +2985,16 @@
"Ponovi zadnjo operacijo\n"
"Ponovi"
-#: Merge.rc:1850
+#: Merge.rc:1851
#, c-format
msgid ""
"Replace specific text with different text\n"
"Replace"
msgstr ""
-"Zamenjaj specifieeno besedilo z druga\xE8nim besedilom\n"
+"Zamenjaj specifi\xE8no besedilo z druga\xE8nim besedilom\n"
"Zamenjaj"
-#: Merge.rc:1851
+#: Merge.rc:1852
#, c-format
msgid ""
"Select the entire document\n"
@@ -2984,7 +3003,7 @@
"Izberi celotni dokument\n"
"Ozna\xE8i vse"
-#: Merge.rc:1852
+#: Merge.rc:1853
#, c-format
msgid ""
"Undo the last action\n"
@@ -2993,7 +3012,7 @@
"Razveljavi zadno operacijo\n"
"Razveljavi (Ctrl+Z)"
-#: Merge.rc:1853
+#: Merge.rc:1854
#, c-format
msgid ""
"Redo the previously undone action\n"
@@ -3002,7 +3021,7 @@
"Ponovi prej\x9Anjo neizvedeno akcijo\n"
"Ponovi(Ctrl+Y)"
-#: Merge.rc:1859
+#: Merge.rc:1860
#, c-format
msgid ""
"Show or hide the toolbar\n"
@@ -3011,7 +3030,7 @@
"Skrij ali prika\x9Ei orodno vrstico\n"
"Orodna vrstica"
-#: Merge.rc:1860
+#: Merge.rc:1861
#, c-format
msgid ""
"Show or hide the status bar\n"
@@ -3020,7 +3039,7 @@
"Skrij ali prika\x9Ei statusno vrstico\n"
"Statusna vrstica"
-#: Merge.rc:1861
+#: Merge.rc:1862
#, c-format
msgid ""
"Show or hide the tab bar\n"
@@ -3029,7 +3048,7 @@
"Skrij ali prika\x9Ei tabulatorsko vrstico\n"
"Tabulatorska vrstica"
-#: Merge.rc:1862
+#: Merge.rc:1863
#, c-format
msgid ""
"Automatically resize panes\n"
@@ -3038,57 +3057,57 @@
"Samodejno pove\xE8aj panel\n"
"Zakleni panel"
-#: Merge.rc:1868
+#: Merge.rc:1869
#, c-format
msgid "Change the window size"
msgstr "Spremeni velikost okna"
-#: Merge.rc:1869
+#: Merge.rc:1870
#, c-format
msgid "Change the window position"
msgstr "Spremeni pozicijo okena"
-#: Merge.rc:1870
+#: Merge.rc:1871
#, c-format
msgid "Reduce the window to an icon"
msgstr "Zmanj\x9Aaj okno na velikost ikone"
-#: Merge.rc:1871
+#: Merge.rc:1872
#, c-format
msgid "Enlarge the window to full size"
msgstr "Pove\xE8aj okno v najve\xE8jo velikost"
-#: Merge.rc:1872
+#: Merge.rc:1873
#, c-format
msgid "Switch to the next document window"
msgstr "Preklopi na naslednjo okno dokumenta"
-#: Merge.rc:1873
+#: Merge.rc:1874
#, c-format
msgid "Switch to the previous document window"
msgstr "Preklopi na prej\x9Anje okno dokumenta"
-#: Merge.rc:1874
+#: Merge.rc:1875
#, c-format
msgid "Close the active window and prompts to save the documents"
msgstr "Zapri vsa aktivna okna in opozori na shranjevanje dokumenta"
-#: Merge.rc:1879
+#: Merge.rc:1880
#, c-format
msgid "Restore the window to normal size"
msgstr "Vrni okno na normalno velikost"
-#: Merge.rc:1880
+#: Merge.rc:1881
#, c-format
msgid "Activate Task List"
msgstr "Aktivni list opravil"
-#: Merge.rc:1881
+#: Merge.rc:1882
#, c-format
msgid "Activate this window"
msgstr "Aktiviraj to okno"
-#: Merge.rc:1887
+#: Merge.rc:1888
#, c-format
msgid ""
"Close print preview mode\n"
@@ -3097,7 +3116,7 @@
"Zapri mo\x9Enost predogleda tiskanja\n"
"Zapri predogled"
-#: Merge.rc:1894
+#: Merge.rc:1895
#, c-format
msgid ""
"\n"
@@ -3116,7 +3135,7 @@
"WinMerge.Primerjava datotek\n"
"WinMerge primerjava datoteke"
-#: Merge.rc:1895
+#: Merge.rc:1896
#, c-format
msgid ""
"\n"
@@ -3135,23 +3154,23 @@
"WinMerge.Primerjava map\n"
"WinMerge primerjalna mapa"
-#: Merge.rc:1902
+#: Merge.rc:1903
#, c-format
msgid "Preserve original EOL chars"
msgstr "Zadr\x9Ei izvorne znake EOL"
-#: Merge.rc:1909
+#: Merge.rc:1910
#, c-format
msgid "Press any key"
msgstr "Pritisni poljubno tipko"
-#: Merge.rc:1915
#: Merge.rc:1916
+#: Merge.rc:1917
#, c-format
msgid "Right click on the path to copy"
msgstr "Desni klik na pot za kopiranje"
-#: Merge.rc:1922
+#: Merge.rc:1923
#, c-format
msgid ""
"Developers:\n"
@@ -3160,157 +3179,158 @@
"Razvijalci:\n"
"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
-#: Merge.rc:1923
+#: Merge.rc:1924
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."
msgstr "WinMerge je program brez GARANCIJE. To je brezpla\xE8na programska oprema, izdana pod GNU licenco.Ve\xE8 podatkov najdete v meniju pomo\xE8."
-#: Merge.rc:1929
+#: Merge.rc:1930
#, c-format
msgid "&Ok"
msgstr "&Vredu"
-#: Merge.rc:1931
+#: Merge.rc:1932
#, c-format
msgid "&Abort"
msgstr "&Prekini"
-#: Merge.rc:1932
+#: Merge.rc:1933
#, c-format
msgid "&Retry"
msgstr "&Poskusi ponovno"
-#: Merge.rc:1933
+#: Merge.rc:1934
#, c-format
msgid "&Ignore"
msgstr "&Prezri"
-#: Merge.rc:1934
+#: Merge.rc:1935
#, c-format
msgid "Ignore &all"
msgstr "Prezri &vse"
-#: Merge.rc:1935
+#: Merge.rc:1936
#, c-format
msgid "&Yes"
msgstr "&Da"
-#: Merge.rc:1941
+#: Merge.rc:1942
#, c-format
msgid "Yes to &all"
msgstr "Da za &vse"
-#: Merge.rc:1942
+#: Merge.rc:1943
#, c-format
msgid "&No"
msgstr "&Ne"
-#: Merge.rc:1943
+#: Merge.rc:1944
#, c-format
msgid "No to a&ll"
msgstr "Ne za &vse"
-#: Merge.rc:1944
+#: Merge.rc:1945
#, c-format
msgid "&Continue"
msgstr "&Nadaljuj"
-#: Merge.rc:1945
+#: Merge.rc:1946
#, c-format
msgid "&Skip"
msgstr "&Presko\xE8i"
-#: Merge.rc:1946
+#: Merge.rc:1947
#, c-format
msgid "Skip &all"
-msgstr "Preskoei &vse"
+msgstr "Presko\xE8i &vse"
-#: Merge.rc:1948
+#: Merge.rc:1949
#, c-format
msgid "Don't display this &message again."
msgstr "Tega sporo\xE8ila ne ka\x9Ei ve\xE8."
-#: Merge.rc:1949
+#: Merge.rc:1950
#, c-format
msgid "Don't ask this &question again."
msgstr "Ne vpra\x9Aaj ve\xE8 tega."
-#: Merge.rc:1959
+#: Merge.rc:1961
#, c-format
-msgid "Syntax colors"
-msgstr "Barve sintakse"
+msgid "Syntax"
+msgstr ""
-#: Merge.rc:1960
+#: Merge.rc:1963
#, c-format
-msgid "Text Colors"
-msgstr "Barve besedila"
-
-#: Merge.rc:1962
-#, c-format
msgid "Version Control"
msgstr "Razli\xE8ica nadzora"
-#: Merge.rc:1973
+#: Merge.rc:1968
+#: Merge.rc:2339
#, c-format
+msgid "Differences"
+msgstr "Razlike"
+
+#: Merge.rc:1977
+#, c-format
msgid "To:"
msgstr "Do:"
-#: Merge.rc:1974
+#: Merge.rc:1978
#, c-format
msgid "From left:"
msgstr "Iz leve:"
-#: Merge.rc:1975
+#: Merge.rc:1979
#, c-format
msgid "To left:"
msgstr "Na levo:"
-#: Merge.rc:1976
+#: Merge.rc:1980
#, c-format
msgid "From right:"
msgstr "Iz desne:"
-#: Merge.rc:1977
+#: Merge.rc:1981
#, c-format
msgid "To right:"
msgstr "Na desno:"
-#: Merge.rc:1983
+#: Merge.rc:1987
#, c-format
msgid "Version %1"
msgstr "Razli\xE8ica %1"
-#: Merge.rc:1984
+#: Merge.rc:1988
#, c-format
msgid "Unicode"
msgstr "Unicode"
-#: Merge.rc:1985
+#: Merge.rc:1989
#, c-format
msgid "X64"
msgstr ""
-#: Merge.rc:1991
+#: Merge.rc:1995
#, c-format
msgid "Options (%1)"
msgstr "Mo\x9Enosti (%1)"
-#: Merge.rc:1992
+#: Merge.rc:1996
#, c-format
msgid "All message boxes are now displayed again."
msgstr "Vsa sporo\xE8ilna okna so sedaj ponovno prikazana "
-#: Merge.rc:1993
+#: Merge.rc:1997
#, c-format
msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted."
msgstr "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted."
-#: Merge.rc:1994
+#: Merge.rc:1998
#, c-format
msgid "The selected font change will not be applied to any currently visible difference windows."
msgstr "Ta izbrana sprememba pisave ne bo uporabljena na katerikoli vidni spremembi"
-#: Merge.rc:1996
+#: Merge.rc:2000
#, c-format
msgid ""
"Value in Tab size -field is not in range WinMerge accepts.\n"
@@ -3321,7 +3341,7 @@
"\n"
"Prosimo koristite vrednosti 1 - %1."
-#: Merge.rc:1998
+#: Merge.rc:2002
#, c-format
msgid ""
"Are you sure you want to reset all WinMerge options to default values?\n"
@@ -3332,129 +3352,129 @@
"\n"
"Prosim ponovno za\x9Eenite WinMerge po ponastavitvi"
-#: Merge.rc:2004
+#: Merge.rc:2008
#, c-format
msgid "Open"
msgstr "Odpri"
-#: Merge.rc:2005
+#: Merge.rc:2009
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "Programi|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
-#: Merge.rc:2006
+#: Merge.rc:2010
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr "Vse datoteke (*.*)|*.*||"
-#: Merge.rc:2007
+#: Merge.rc:2011
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "Datoteke WinMerge projekta(*.WinMerge)|*.WinMerge||"
-#: Merge.rc:2009
+#: Merge.rc:2013
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "Mo\x9Ene datoteke (*.ini)|*.ini|All Files (*.*)|*.*||"
-#: Merge.rc:2015
+#: Merge.rc:2019
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr "Besedilne datotke (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
-#: Merge.rc:2016
+#: Merge.rc:2020
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "HTML datoteke (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
-#: Merge.rc:2017
+#: Merge.rc:2021
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "XML datoteke (*.xml)|*.xml|All Files (*.*)|*.*||"
-#: Merge.rc:2023
+#: Merge.rc:2027
#, c-format
msgid "UTF-8"
msgstr "UTF-8"
-#: Merge.rc:2024
+#: Merge.rc:2028
#, c-format
msgid "UTF-8 (B)"
msgstr "UTF-8 (B)"
-#: Merge.rc:2025
+#: Merge.rc:2029
#, c-format
msgid "UCS-2 LE"
msgstr "UCS-2 LE"
-#: Merge.rc:2026
+#: Merge.rc:2030
#, c-format
msgid "UCS-2 BE"
msgstr "UCS-2 BE"
-#: Merge.rc:2032
+#: Merge.rc:2036
#, c-format
msgid "Full Contents"
msgstr "Popolna vsebina"
-#: Merge.rc:2033
+#: Merge.rc:2037
#, c-format
msgid "Quick Contents"
msgstr "Hitra vsebina"
-#: Merge.rc:2034
+#: Merge.rc:2038
#, c-format
msgid "Modified Date"
-msgstr "Datum spemembe"
+msgstr "Datum spremembe"
-#: Merge.rc:2035
+#: Merge.rc:2039
#, c-format
msgid "Modified Date and Size"
msgstr "Sprememba datuma in velikosti"
-#: Merge.rc:2036
+#: Merge.rc:2040
#, c-format
msgid "Size"
msgstr "Velikost"
-#: Merge.rc:2042
-#: Merge.rc:2667
+#: Merge.rc:2046
+#: Merge.rc:2572
#, c-format
msgid "Name"
msgstr "Ime"
-#: Merge.rc:2043
+#: Merge.rc:2047
#, c-format
msgid "Location"
msgstr "Lokacija"
-#: Merge.rc:2044
+#: Merge.rc:2048
#, c-format
msgid "Filters"
msgstr "Filtri"
-#: Merge.rc:2045
+#: Merge.rc:2049
#, c-format
msgid "[F] "
msgstr "[F] "
-#: Merge.rc:2046
-#: Merge.rc:2669
+#: Merge.rc:2050
+#: Merge.rc:2574
#, c-format
msgid "Description"
msgstr "Opis"
-#: Merge.rc:2047
+#: Merge.rc:2051
#, c-format
msgid "Select filename for new filter"
msgstr "Izberi ime datoteke za nov filter"
-#: Merge.rc:2048
+#: Merge.rc:2052
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "Datoteke filtrov (*.flt)|*.flt|Sve datoteke (*.*)|*.*||"
-#: Merge.rc:2050
+#: Merge.rc:2054
#, c-format
msgid ""
"Cannot find file filter template file!\n"
@@ -3467,7 +3487,7 @@
"Prosimo, kopirajte datoteko %1 v WinMerge/Filters -mapo:\n"
"%2."
-#: Merge.rc:2052
+#: Merge.rc:2056
#, c-format
msgid ""
"Cannot copy filter template file to filter folder:\n"
@@ -3480,7 +3500,7 @@
"\n"
"Preverite \xE8e mapa obstaja in je zapisljiva."
-#: Merge.rc:2054
+#: Merge.rc:2058
#, c-format
msgid ""
"User's filter file folder is not defined!\n"
@@ -3491,7 +3511,7 @@
"\n"
"Prosim izberite filter mape v mo\x9Enosti/Sistem."
-#: Merge.rc:2056
+#: Merge.rc:2060
#, c-format
msgid ""
"Failed to delete the filter file:\n"
@@ -3504,12 +3524,12 @@
"\n"
"Morda je datoteka za\x9A\xE8itena - samo za brananje."
-#: Merge.rc:2057
+#: Merge.rc:2061
#, c-format
msgid "Locate filter file to install"
msgstr "Lociraj filter datoteko za name\x9A\xE8anje"
-#: Merge.rc:2059
+#: Merge.rc:2063
#, c-format
msgid ""
"Installing filter file failed.\n"
@@ -3520,218 +3540,218 @@
"\n"
"Ni mogo\xE8e kopirati nove filter datoteke v filter mapo."
-#: Merge.rc:2061
+#: Merge.rc:2065
#, c-format
msgid "Filter file already exists. Overwrite existing filter?"
msgstr "Filter datoteka \x9Ee obstaja. Prepi\x9Aem obstoje\xE8i filter."
-#: Merge.rc:2067
+#: Merge.rc:2071
#, c-format
msgid "Regular expression"
msgstr "Reden izraz"
-#: Merge.rc:2073
+#: Merge.rc:2077
#, c-format
msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
msgstr ""
-#: Merge.rc:2080
+#: Merge.rc:2084
#, c-format
msgid "&Path to SS.EXE:"
msgstr ""
-#: Merge.rc:2086
+#: Merge.rc:2090
#, c-format
msgid "Folder Comparison Results"
msgstr "Rezultati primerjanja map"
-#: Merge.rc:2087
+#: Merge.rc:2091
#, c-format
msgid "File Comparison"
msgstr "Primerjanje map"
-#: Merge.rc:2088
+#: Merge.rc:2092
#, c-format
msgid "Untitled left"
msgstr "Levi neimanovan"
-#: Merge.rc:2089
+#: Merge.rc:2093
#, c-format
msgid "Untitled right"
msgstr "Desni neimenovan"
-#: Merge.rc:2090
+#: Merge.rc:2094
#, c-format
msgid "Theirs File"
msgstr "Njihova datoteka"
-#: Merge.rc:2091
+#: Merge.rc:2095
#, c-format
msgid "Mine File"
msgstr "Moja datoteka"
-#: Merge.rc:2097
+#: Merge.rc:2101
#, c-format
msgid "Scanning files..."
msgstr "Prei\x9A\xE8i datoteko..."
-#: Merge.rc:2098
+#: Merge.rc:2102
#, c-format
msgid "Opening selection"
msgstr "Odpiranje izbranega"
-#: Merge.rc:2099
+#: Merge.rc:2103
#, c-format
msgid "Copying Left to Right"
msgstr "Kopiraj z leve na desno"
-#: Merge.rc:2100
+#: Merge.rc:2104
#, c-format
msgid "Copying Right to Left"
msgstr "Kopiraj iz desne na levo"
-#: Merge.rc:2101
+#: Merge.rc:2105
#, c-format
msgid "Copying All to Left"
msgstr "Kopiraj vse na levo"
-#: Merge.rc:2102
+#: Merge.rc:2106
#, c-format
msgid "Copying All to Right"
msgstr "Kopiraj vse na desno"
-#: Merge.rc:2103
+#: Merge.rc:2107
#, c-format
msgid "Copying files..."
msgstr "Kopiranje datotek..."
-#: Merge.rc:2104
+#: Merge.rc:2108
#, c-format
msgid "Deleting files..."
msgstr "Brisanje datotek..."
-#: Merge.rc:2105
+#: Merge.rc:2109
#, c-format
msgid "Moving files..."
msgstr "Premikanje datotek..."
-#: Merge.rc:2106
+#: Merge.rc:2110
#, c-format
msgid "Creating the report..."
msgstr "Izdelava poro\xE8ila..."
-#: Merge.rc:2107
+#: Merge.rc:2111
#, c-format
msgid "Undoing the last operation..."
msgstr ""
-#: Merge.rc:2108
+#: Merge.rc:2112
#, c-format
msgid "Redoing the previous operation..."
msgstr ""
-#: Merge.rc:2114
+#: Merge.rc:2118
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr "Vr: %s St: %d/%d znak: %d/%d mesto: %s"
-#: Merge.rc:2115
+#: Merge.rc:2119
#, c-format
msgid "Line: %s"
msgstr "Vrstica: %s"
-#: Merge.rc:2116
+#: Merge.rc:2120
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr "Vr: %s St: %d/%d Zn: %d/%d"
-#: Merge.rc:2117
+#: Merge.rc:2121
#, c-format
msgid "Merge"
msgstr "Zdru\x9Ei"
-#: Merge.rc:2118
+#: Merge.rc:2122
#, c-format
msgid "Difference %1 of %2"
msgstr "Razlika %1 od %2"
-#: Merge.rc:2119
+#: Merge.rc:2123
#, c-format
msgid "%1 Differences Found"
msgstr "Najdena razlika: %1"
-#: Merge.rc:2120
+#: Merge.rc:2124
#, c-format
msgid "1 Difference Found"
msgstr "Najdena razlika: 1"
#. Abbreviation from "Read Only"
-#: Merge.rc:2121
+#: Merge.rc:2125
#, c-format
msgid "RO"
msgstr "RO"
-#: Merge.rc:2127
+#: Merge.rc:2131
#, c-format
msgid "Item %1 of %2"
msgstr "Predmet %1 od %2"
-#: Merge.rc:2128
+#: Merge.rc:2132
#, c-format
msgid "Items: %1"
msgstr "Predmet: %1"
-#: Merge.rc:2134
+#: Merge.rc:2138
#, c-format
msgid "Select two existing folders or files to compare"
msgstr "Izberi dve obstoje\xE8i mapi ali datoteki za primerjavo"
-#: Merge.rc:2135
+#: Merge.rc:2139
#, c-format
msgid "Folder Selection"
msgstr "Izbira map"
-#: Merge.rc:2136
+#: Merge.rc:2140
#, c-format
msgid "Select two folders or two files to compare."
msgstr "Izberi dve mapi ali dve datoteki za primerjavo."
-#: Merge.rc:2137
+#: Merge.rc:2141
#, c-format
msgid "Left path is invalid!"
msgstr "Leva pot je neveljavna"
-#: Merge.rc:2138
+#: Merge.rc:2142
#, c-format
msgid "Right path is invalid!"
msgstr "Desna pot je neveljavna"
-#: Merge.rc:2139
+#: Merge.rc:2143
#, c-format
msgid "Both paths are invalid!"
msgstr "Obe poti sta neveljavni"
-#: Merge.rc:2140
+#: Merge.rc:2144
#, c-format
msgid "Choose two files to enable unpacker selection."
-msgstr "Izberi dve datoteki,da boste omogo\xE8ili izbiro arhiverja"
+msgstr "Izberi dve datoteki, da boste omogo\xE8ili izbiro arhiverja"
-#: Merge.rc:2141
+#: Merge.rc:2145
#, c-format
msgid "Cannot compare file and folder!"
msgstr "Ni mogo\xE8e primerjati datoteke in mape!"
-#: Merge.rc:2147
+#: Merge.rc:2151
#, c-format
msgid "File not found: %1"
msgstr "Datoteka ni najdena: %1"
-#: Merge.rc:2148
+#: Merge.rc:2152
#, c-format
msgid "File not unpacked: %1"
msgstr "Datoteka ni razpakirana: %1"
-#: Merge.rc:2149
+#: Merge.rc:2153
#, c-format
msgid ""
"Cannot open file\n"
@@ -3744,12 +3764,12 @@
"\n"
"%2"
-#: Merge.rc:2150
+#: Merge.rc:2154
#, c-format
msgid "Failed to parse conflict file."
msgstr "Spodletelo raz\xE8lenjevanje konfliktne datoteke."
-#: Merge.rc:2151
+#: Merge.rc:2155
#, c-format
msgid ""
"The file\n"
@@ -3760,32 +3780,32 @@
"%1\n"
"ni konfliktna datoteka."
-#: Merge.rc:2157
+#: Merge.rc:2161
#, c-format
msgid "Save As"
msgstr "Shrani kot"
-#: Merge.rc:2158
+#: Merge.rc:2162
#, c-format
msgid "Save changes to %1?"
msgstr "Shrani spremembe v %1?"
-#: Merge.rc:2159
+#: Merge.rc:2163
#, c-format
msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
msgstr "%1 je samo za branje. Ali \x9Eelite prepisati to datoteko? ( Ne za shranjevanje pod novim imenom)"
-#: Merge.rc:2160
+#: Merge.rc:2164
#, c-format
msgid "Error checking destination writeability"
msgstr "Napaka pri preverjanju cilja mo\x9Enosti zapisovanja"
-#: Merge.rc:2161
+#: Merge.rc:2165
#, c-format
msgid "Error backing up file"
-msgstr "Napaka pri shranjevanju arhive"
+msgstr "Napaka pri shranjevanju arhiva"
-#: Merge.rc:2163
+#: Merge.rc:2167
#, c-format
msgid ""
"Unable to backup original file:\n"
@@ -3793,12 +3813,12 @@
"\n"
"Continue anyway?"
msgstr ""
-"Ni mogo\xE8e shraniti arhive originalne datoteke:\n"
+"Ni mogo\xE8e shraniti arhiva originalne datoteke:\n"
"%1\n"
"\n"
"Vseeno nadaljujem?"
-#: Merge.rc:2164
+#: Merge.rc:2168
#, c-format
msgid ""
"Saving file failed.\n"
@@ -3815,7 +3835,7 @@
"\t- uporabiti razli\xE8no ime datoteke (pritisnite Vredu)\n"
"\t- preklicati trenutno operacijo (pritisnite Prekli\xE8i)?"
-#: Merge.rc:2165
+#: Merge.rc:2169
#, c-format
msgid ""
"Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -3830,7 +3850,7 @@
"\n"
"Ali \x9Eelite shraniti nezapakirano razli\xE8ico v drugo datoteko?"
-#: Merge.rc:2166
+#: Merge.rc:2170
#, c-format
msgid ""
"Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -3845,7 +3865,7 @@
"\n"
"Ali \x9Eelite shraniti nezapakirano razli\xE8ico v drugo datoteko?"
-#: Merge.rc:2167
+#: Merge.rc:2171
#, c-format
msgid ""
"Another application has updated file\n"
@@ -3860,7 +3880,7 @@
"\n"
"Prepi\x9Ai spremenjeno datoteko?"
-#: Merge.rc:2168
+#: Merge.rc:2172
#, c-format
msgid ""
"%1\n"
@@ -3869,27 +3889,27 @@
"%1\n"
"je ozna\xE8ena samo za branje.\x8Eelite prepisati predmet samo za branje?"
-#: Merge.rc:2169
+#: Merge.rc:2173
#, c-format
msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
msgstr ""
-#: Merge.rc:2170
+#: Merge.rc:2174
#, c-format
msgid "Save Left File As"
msgstr "Shrani levo datoteko kot"
-#: Merge.rc:2171
+#: Merge.rc:2175
#, c-format
msgid "Save Right File As"
msgstr "Shrani desno datoteko kot"
-#: Merge.rc:2172
+#: Merge.rc:2176
#, c-format
msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
msgstr ""
-#: Merge.rc:2178
+#: Merge.rc:2182
#, c-format
msgid ""
"Cannot merge differences when documents are not in synch.\n"
@@ -3900,42 +3920,42 @@
"\n"
"Osve\x9Eite dokumente predno nadaljujete."
-#: Merge.rc:2184
+#: Merge.rc:2188
#, c-format
msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)"
-msgstr "Navesti morate pot SourceSafe projekta \xE8e \x9Eelite nadaljevati (ie: $/MyProject)"
+msgstr "Navesti morate pot SourceSafe projekta \xE8e \x9Eelite nadaljevati (npr: $/MyProject)"
-#: Merge.rc:2185
+#: Merge.rc:2189
#, c-format
msgid "Checkout files from VSS..."
msgstr "Preveri datoteke iz VSS ..."
-#: Merge.rc:2186
+#: Merge.rc:2190
#, c-format
msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..."
msgstr "Versioning System je vrnil napako medtem ko je posku\x9Aal preveriti datoteko. Ni mogo\xE8e nadaljevati..."
-#: Merge.rc:2187
+#: Merge.rc:2191
#, c-format
msgid "Error executing versioning system command."
msgstr "Napaka pri izvr\x9Aevanju sistemskega ukaza."
-#: Merge.rc:2188
+#: Merge.rc:2192
#, c-format
msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
msgstr "VSS delovna mapa in lokacija izbrane mape se ne ujemata. Nadaljujem?"
-#: Merge.rc:2189
+#: Merge.rc:2193
#, c-format
msgid "No VSS database(s) found!"
msgstr "VSS podatkovna baza ni najdena!"
-#: Merge.rc:2190
+#: Merge.rc:2194
#, c-format
msgid "Error from VSS:"
msgstr "Napaka od VSS:"
-#: Merge.rc:2191
+#: Merge.rc:2195
#, c-format
msgid ""
"Versioning System returned an error while attempting to check in the file.\n"
@@ -3946,178 +3966,178 @@
"Prosim preverite nastavitvene specifikacije uporabljenega pogleda.\n"
" Zavrzi pregledno operacijo?"
-#: Merge.rc:2192
+#: Merge.rc:2196
#, c-format
msgid ""
"Versioning System returned an error while attempting to undo checkout the file.\n"
" Please, check config spec of used view. "
msgstr ""
-"Versioninh System vra\xE8a napako med preverjanjem datoteke.\n"
+"Sistem za verzije vra\xE8a napako med preverjanjem datoteke.\n"
"Prosim preverite nastavitvene specifikacije uporabljenega pogleda"
-#: Merge.rc:2198
-#: Merge.rc:2651
+#: Merge.rc:2202
+#: Merge.rc:2556
#, c-format
msgid "None"
msgstr "Prazno"
-#: Merge.rc:2199
+#: Merge.rc:2203
#, c-format
msgid "Visual SourceSafe (less than 5.0)"
msgstr "Visual SourceSafe (manj\x9Ai od 5.0)"
-#: Merge.rc:2200
+#: Merge.rc:2204
#, c-format
msgid "Visual SourceSafe (5.0 and above)"
msgstr "Visual SourceSafe (5.0 in vi\x9Aji)"
-#: Merge.rc:2202
+#: Merge.rc:2206
#, c-format
msgid "Break at whitespace"
msgstr "Prelomi na praznini"
-#: Merge.rc:2203
+#: Merge.rc:2207
#, c-format
msgid "Break at whitespace or punctuation"
msgstr "Prelomi na praznini ali lo\xE8ilu"
-#: Merge.rc:2209
-#: Merge.rc:2211
+#: Merge.rc:2213
+#: Merge.rc:2215
#, c-format
msgid "Copy selected item to named directory"
msgstr "Kopiraj izbran predmet v imenovano mapo"
-#: Merge.rc:2210
-#: Merge.rc:2212
+#: Merge.rc:2214
+#: Merge.rc:2216
#, c-format
msgid "Copy selected item to custom directory"
msgstr "Kopiraj izbran predmet v izbrano mapo"
-#: Merge.rc:2213
+#: Merge.rc:2217
#, c-format
msgid "Delete selected item on left"
msgstr "Izbri\x9Ai izbran predmet na levi"
-#: Merge.rc:2214
+#: Merge.rc:2218
#, c-format
msgid "Delete selected item on right"
msgstr "Izbri\x9Ai izbran predmet na desni"
-#: Merge.rc:2215
+#: Merge.rc:2219
#, c-format
msgid "Delete selected item(s) on both sides"
msgstr "Izbri\x9Ai izran predmet na obeh straneh"
-#: Merge.rc:2216
+#: Merge.rc:2220
#, c-format
msgid "Hide selected item(s) (on the fly filter)"
msgstr "Skrij izbran predmet(e) (na filtru)"
-#: Merge.rc:2217
+#: Merge.rc:2221
#, c-format
msgid "Rename selected item on both sides"
msgstr "Preimenuj izbran predmet na obeh straneh"
-#: Merge.rc:2218
+#: Merge.rc:2222
#, c-format
msgid "Right to Left (%1)"
msgstr "Od desne proti levi (%1)"
-#: Merge.rc:2219
+#: Merge.rc:2223
#, c-format
msgid "Left to Right (%1)"
msgstr "Od leve proti desni (%1)"
-#: Merge.rc:2220
+#: Merge.rc:2224
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr "Od desne proti levi (%1 od %2)"
-#: Merge.rc:2221
+#: Merge.rc:2225
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr "Od leve proti desni (%1 od %2)"
-#: Merge.rc:2222
-#: Merge.rc:2238
+#: Merge.rc:2226
+#: Merge.rc:2242
#, c-format
msgid "Left to... (%1)"
msgstr "Leva do...(%1)"
-#: Merge.rc:2223
-#: Merge.rc:2239
+#: Merge.rc:2227
+#: Merge.rc:2243
#, c-format
msgid "Right to... (%1)"
msgstr "Desna do...(%1)"
-#: Merge.rc:2224
-#: Merge.rc:2240
+#: Merge.rc:2228
+#: Merge.rc:2244
#, c-format
msgid "Left to... (%1 of %2)"
msgstr "Leva do...(%1 od%2)"
-#: Merge.rc:2225
-#: Merge.rc:2241
+#: Merge.rc:2229
+#: Merge.rc:2245
#, c-format
msgid "Right to... (%1 of %2)"
msgstr "Desna do...(%1 od%2)"
-#: Merge.rc:2231
+#: Merge.rc:2235
#, c-format
msgid "Left (%1)"
msgstr "Leva (%1)"
-#: Merge.rc:2232
+#: Merge.rc:2236
#, c-format
msgid "Right (%1)"
msgstr "Desna (%1)"
-#: Merge.rc:2233
+#: Merge.rc:2237
#, c-format
msgid "Both (%1)"...
[truncated message content] |
|
From: <ge...@us...> - 2010-01-13 20:45:38
|
Revision: 7099
http://winmerge.svn.sourceforge.net/winmerge/?rev=7099&view=rev
Author: gerundt
Date: 2010-01-13 20:45:28 +0000 (Wed, 13 Jan 2010)
Log Message:
-----------
PATCH: [ 2930734 ] Winmerge 2.12.4 Spanish Update and Corrected
Submitted by Mario Angel
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/Languages/Spanish.po
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2010-01-13 20:36:19 UTC (rev 7098)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2010-01-13 20:45:28 UTC (rev 7099)
@@ -8,6 +8,7 @@
Translation updates:
- Dutch (#2804979)
- French (#2850842)
+ - Spanish (#2930734)
- Turkish (#2825132, #2827817)
- Ukrainian (#2817835)
Modified: branches/R2_12/Src/Languages/Spanish.po
===================================================================
--- branches/R2_12/Src/Languages/Spanish.po 2010-01-13 20:36:19 UTC (rev 7098)
+++ branches/R2_12/Src/Languages/Spanish.po 2010-01-13 20:45:28 UTC (rev 7099)
@@ -14,7 +14,7 @@
"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-03-04 22:34+0100\n"
+"PO-Revision-Date: 2010-01-09 14:28+0100\n"
"Last-Translator: Mario Angel <marioangel70 at gmail.com>\n"
"Language-Team: Spanish <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -287,7 +287,7 @@
#: Merge.rc:454
#, c-format
msgid "&List..."
-msgstr ""
+msgstr "&Lista..."
#: Merge.rc:152
#: Merge.rc:273
@@ -385,7 +385,7 @@
#: Merge.rc:482
#, c-format
msgid "&Cascade"
-msgstr "&Superponer"
+msgstr "&Cascada"
#: Merge.rc:175
#: Merge.rc:296
@@ -505,17 +505,17 @@
#: Merge.rc:224
#, c-format
msgid "Tree &Mode"
-msgstr ""
+msgstr "&Modo \xC1rbol"
#: Merge.rc:225
#, c-format
msgid "E&xpand All Subfolders"
-msgstr ""
+msgstr "E&xpandir Todas las Subcarpetas"
#: Merge.rc:226
#, c-format
msgid "&Collapse All Subfolders"
-msgstr ""
+msgstr "&Contraer Todas las Subcarpetas"
#: Merge.rc:239
#, c-format
@@ -560,7 +560,7 @@
#: Merge.rc:433
#, c-format
msgid "&First Difference\tAlt+Home"
-msgstr "&Primera diferencia\tAlt+Home"
+msgstr "&Primer diferencia\tAlt+Home"
#: Merge.rc:254
#: Merge.rc:434
@@ -589,7 +589,7 @@
#: Merge.rc:260
#, c-format
msgid "&Delete\tDel"
-msgstr "&Borrar\tDel"
+msgstr "&Eliminar\tDel"
#: Merge.rc:264
#: Merge.rc:562
@@ -790,7 +790,7 @@
#: Merge.rc:399
#, c-format
msgid "Syntax Highlight"
-msgstr "Destacar sintaxis"
+msgstr "Seleccionar sintaxis"
#: Merge.rc:404
#, c-format
@@ -1190,7 +1190,7 @@
#: Merge.rc:708
#, c-format
msgid "Files or Folders to Compare"
-msgstr "Objetos para Comparar"
+msgstr "Archivos o Carpetas a Comparar"
#: Merge.rc:715
#, c-format
@@ -1264,7 +1264,7 @@
#: Merge.rc:757
#, c-format
msgid "Automatically &scroll to first difference"
-msgstr "Mover&se autom\xE1ticamente a la primera diferencia"
+msgstr "Mover&se autom\xE1ticamente a la primer diferencia"
#: Merge.rc:760
#, c-format
@@ -1279,7 +1279,7 @@
#: Merge.rc:764
#, c-format
msgid "&Automatically verify paths in Open-dialog"
-msgstr "Verificar rutas &autom\xE1ticamente en la ventana de apertura"
+msgstr "Comprobar rutas &autom\xE1ticamente en la ventana de apertura"
#: Merge.rc:767
#, c-format
@@ -1299,7 +1299,7 @@
#: Merge.rc:774
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
-msgstr ""
+msgstr "Mostrar \"Seleccione archivos o carpetas\" al Iniciar"
#: Merge.rc:776
#, c-format
@@ -1579,7 +1579,7 @@
#: Merge.rc:993
#, c-format
msgid "&Send deleted files to Recycle Bin"
-msgstr "&Enviar archivos borrados a la Papelera de reciclaje."
+msgstr "&Enviar archivos eliminados a la Papelera de reciclaje."
#: Merge.rc:995
#, c-format
@@ -1867,7 +1867,7 @@
#: Merge.rc:1177
#, c-format
msgid "S&top after first difference"
-msgstr "&Parar despu\xE9s de la primera diferencia"
+msgstr "De&tener despu\xE9s de la primer diferencia"
#: Merge.rc:1180
#, c-format
@@ -1883,7 +1883,7 @@
#: Merge.rc:1190
#, c-format
msgid "&Highlight syntax"
-msgstr "Resaltar sinta&xis"
+msgstr "Seleccionar sinta&xis"
#: Merge.rc:1192
#, c-format
@@ -2024,8 +2024,12 @@
#: Merge.rc:1271
#, c-format
-msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session"
+msgid ""
+"Detect codepage info for these files: .html, .rc, .xml \n"
+"need to restart session"
msgstr ""
+"Detectar p\xE1gina de c\xF3digos para \xE9stos archivos : .html, .rc, .xml \n"
+"se necesita reiniciar"
#: Merge.rc:1274
#, c-format
@@ -2040,7 +2044,7 @@
#: Merge.rc:1278
#, c-format
msgid "Custom codepage:"
-msgstr ""
+msgstr "P\xE1gina de c\xF3digos:"
#: Merge.rc:1286
#, c-format
@@ -2138,8 +2142,12 @@
#: Merge.rc:1320
#, c-format
-msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)"
-msgstr "No mostrar este &mensaje de nuevo.\n(Puede volver a mostrar \xE9ste mensaje desde el men\xFA Ayuda.)"
+msgid ""
+"Don't display this &message again.\n"
+"(You can always recall this message from the Help menu.)"
+msgstr ""
+"No mostrar este &mensaje de nuevo.\n"
+"(Puede volver a mostrar \xE9ste mensaje desde el men\xFA Ayuda.)"
#: Merge.rc:1324
#, c-format
@@ -2374,13 +2382,13 @@
#: Merge.rc:1516
#, c-format
msgid "Affects"
-msgstr "Afecta"
+msgstr "Afectar"
#: Merge.rc:1519
#: Merge.rc:1522
#, c-format
msgid "(Affects)"
-msgstr "(Afecta)"
+msgstr "(Afectar)"
#: Merge.rc:1523
#, c-format
@@ -2538,12 +2546,12 @@
#: Merge.rc:1629
#, c-format
msgid "&Append .bak -extension"
-msgstr "&A\xF1adir extensi\xF3n .bak"
+msgstr "&Agregar extensi\xF3n .bak"
#: Merge.rc:1631
#, c-format
msgid "A&ppend timestamp"
-msgstr "A\xF1adir &fecha"
+msgstr "Agregar &fecha"
#: Merge.rc:1638
#: Merge.rc:2243
@@ -2579,23 +2587,23 @@
#: Merge.rc:1657
#, c-format
msgid "Plugins"
-msgstr ""
+msgstr "Plugins"
#: Merge.rc:1660
#, c-format
msgid "&Enable plugins"
-msgstr ""
+msgstr "&Habilitar plugins"
#: Merge.rc:1671
#: Merge.rc:1952
#, c-format
msgid "Shell Integration"
-msgstr ""
+msgstr "Integraci\xF3n"
#: Merge.rc:1674
#, c-format
msgid "Explorer"
-msgstr ""
+msgstr "Explorador"
#: Merge.rc:1675
#, c-format
@@ -2610,17 +2618,17 @@
#: Merge.rc:1679
#, c-format
msgid "&Add to context menu"
-msgstr ""
+msgstr "&Agregar al men\xFA contextual"
#: Merge.rc:1681
#, c-format
msgid "Folder compare"
-msgstr ""
+msgstr "Comparaci\xF3n de carpeta"
#: Merge.rc:1682
#, c-format
msgid "Add &Shell menu to context menu"
-msgstr ""
+msgstr "&Agregar al men\xFA contextual del explorador."
#. StringFileInfo.Block
#: Merge.rc:1708
@@ -2758,17 +2766,17 @@
#: Merge.rc:1770
#, c-format
msgid "Toggle tree mode"
-msgstr ""
+msgstr "Cambiar a modo \xE1rbol"
#: Merge.rc:1771
#, c-format
msgid "Expand all subfolders"
-msgstr ""
+msgstr "Expandir todas las Subcarpetas"
#: Merge.rc:1772
#, c-format
msgid "Collapse all subfolders"
-msgstr ""
+msgstr "Contraer todas las carpetas"
#: Merge.rc:1778
#, c-format
@@ -2983,7 +2991,7 @@
"Show or hide the toolbar\n"
"Toggle ToolBar"
msgstr ""
-"Muestra la barra de herramientas\n"
+"Muestra la Barra de Herramientas\n"
"Barra de Herramientas"
#: Merge.rc:1846
@@ -3074,13 +3082,41 @@
#: Merge.rc:1880
#, c-format
-msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare"
+msgid ""
+"\n"
+"FileCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FileCompare\n"
+"WinMerge File Compare"
msgstr ""
+"\n"
+"CompararArchivo\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.CompararArchivo\n"
+"WinMerge CompararArchivo"
#: Merge.rc:1881
#, c-format
-msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
-msgstr "\nCompararCarpeta\n\n\n\nWinMerge.CompararCarpeta\nComparar Carpeta de WinMerge"
+msgid ""
+"\n"
+"FolderCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FolderCompare\n"
+"WinMerge Folder Compare"
+msgstr ""
+"\n"
+"CompararCarpeta\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.CompararCarpeta\n"
+"Comparar Carpeta de WinMerge"
#: Merge.rc:1888
#, c-format
@@ -3096,12 +3132,16 @@
#: Merge.rc:1902
#, c-format
msgid "Right click on the path to copy"
-msgstr "Haga click derecho en la ruta para copiar"
+msgstr "Haga clic derecho en la ruta para copiar"
#: Merge.rc:1908
#, c-format
-msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
-msgstr "Desarrolladores:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
+msgid ""
+"Developers:\n"
+"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
+msgstr ""
+"Desarrolladores:\n"
+"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
#: Merge.rc:1909
#, c-format
@@ -3231,7 +3271,7 @@
#: Merge.rc:1971
#, c-format
msgid "X64"
-msgstr ""
+msgstr "X64"
#: Merge.rc:1977
#, c-format
@@ -3442,7 +3482,7 @@
"\n"
"Maybe the file is read-only?"
msgstr ""
-"Error al borrar el archivo de filtros:\n"
+"Error al eliminar el archivo de filtros:\n"
"%1\n"
"\n"
"\xBFQuiza el archivo es de solo lectura?"
@@ -3475,13 +3515,19 @@
#: Merge.rc:2059
#, c-format
-msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
+msgid ""
+"Filters were updated. Do you want to refresh all open folder compares?\n"
+"\n"
+"If you do not want to refresh all compares now you can select No and refresh compares later."
msgstr ""
+"Los Filtros fueron actualizados. \xBFQuiere actualizar todas comparaciones de carpetas abiertas?\n"
+"\n"
+"Si no quiere actualizar todas las comparaciones puede elegir No y actualizar las comparaciones despu\xE9s."
#: Merge.rc:2066
#, c-format
msgid "&Path to SS.EXE:"
-msgstr ""
+msgstr "R&uta a SS.EXE:"
#: Merge.rc:2072
#, c-format
@@ -3566,12 +3612,12 @@
#: Merge.rc:2093
#, c-format
msgid "Undoing the last operation..."
-msgstr ""
+msgstr "Deshaciendo la \xFAltima operaci\xF3n..."
#: Merge.rc:2094
#, c-format
msgid "Redoing the previous operation..."
-msgstr ""
+msgstr "Rehaciendo la operaci\xF3n anterior..."
#: Merge.rc:2100
#, c-format
@@ -3694,8 +3740,14 @@
#: Merge.rc:2137
#, c-format
-msgid "The file\n%1\nis not a conflict file."
-msgstr "El archivo\n%1\nno es conflictivo."
+msgid ""
+"The file\n"
+"%1\n"
+"is not a conflict file."
+msgstr ""
+"El archivo\n"
+"%1\n"
+"no es conflictivo."
#: Merge.rc:2143
#, c-format
@@ -3808,8 +3860,18 @@
#: Merge.rc:2155
#, c-format
-msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
+msgid ""
+"Another application has updated file\n"
+"%1\n"
+"since WinMerge scanned it last time.\n"
+"\n"
+"Do you want to reload the file?"
msgstr ""
+"Otra aplicaci\xF3n ha actualizado el archivo\n"
+"%1\n"
+"desde que WinMerge lo escane\xF3 por \xFAltima vez.\n"
+"\n"
+"\xBFDesea recargar el archivo?"
#: Merge.rc:2156
#, c-format
@@ -3823,8 +3885,14 @@
#: Merge.rc:2158
#, c-format
-msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
+msgid ""
+"The file\n"
+"%1\n"
+"has disappeared. Please save a copy of the file to continue."
msgstr ""
+"El archivo\n"
+"%1\n"
+"ha desaparecido. Por favor, guarde una copia del archivo para continuar."
#: Merge.rc:2164
#, c-format
@@ -3911,12 +3979,12 @@
#: Merge.rc:2188
#, c-format
msgid "Break at whitespace"
-msgstr "Parar en espacio en blanco"
+msgstr "Detener en espacio en blanco"
#: Merge.rc:2189
#, c-format
msgid "Break at whitespace or punctuation"
-msgstr "Parar en espacio en blanco o puntuaci\xF3n"
+msgstr "Detener en espacio en blanco o puntuaci\xF3n"
#: Merge.rc:2195
#: Merge.rc:2197
@@ -4097,17 +4165,17 @@
#: Merge.rc:2241
#, c-format
msgid "Are you sure you want to move:"
-msgstr ""
+msgstr "Est\xE1 seguro de mover:"
#: Merge.rc:2242
#, c-format
msgid "Are you sure you want to move %d items:"
-msgstr ""
+msgstr "Est\xE1 seguro de mover %d elementos:"
#: Merge.rc:2244
#, c-format
msgid "Confirm Move"
-msgstr ""
+msgstr "Confirmar Movimiento"
#: Merge.rc:2250
#, c-format
@@ -4172,12 +4240,12 @@
#: Merge.rc:2267
#, c-format
msgid "Left Shell menu"
-msgstr ""
+msgstr "Men\xFA Izquierda"
#: Merge.rc:2268
#, c-format
msgid "Right Shell menu"
-msgstr ""
+msgstr "Men\xFA Derecha"
#: Merge.rc:2274
#, c-format
@@ -4187,22 +4255,22 @@
#: Merge.rc:2275
#, c-format
msgid "Add items from left side to archive"
-msgstr "A\xF1adir elementos del lado izquierdo al archivo"
+msgstr "Agregar elementos del lado izquierdo al archivo"
#: Merge.rc:2276
#, c-format
msgid "Add items from right side to archive"
-msgstr "A\xF1adir elementos del lado derecho al archivo"
+msgstr "Agregar elementos del lado derecho al archivo"
#: Merge.rc:2277
#, c-format
msgid "Add items from both sides to archive"
-msgstr "A\xF1adir elementos de ambos lados al archivo"
+msgstr "Agregar elementos de ambos lados al archivo"
#: Merge.rc:2278
#, c-format
msgid "Add different items to archive (both sides)"
-msgstr "A\xF1adir elementos diferentes al archivo (ambos lados)"
+msgstr "Agregar elementos diferentes al archivo (ambos lados)"
#: Merge.rc:2280
#, c-format
@@ -4388,7 +4456,7 @@
#: Merge.rc:2338
#, c-format
msgid "Folders are different"
-msgstr ""
+msgstr "Las carpetas son diferentes"
#: Merge.rc:2339
#, c-format
@@ -4408,12 +4476,12 @@
#: Merge.rc:2343
#, c-format
msgid "Text files are identical"
-msgstr ""
+msgstr "Los archivos son iguales"
#: Merge.rc:2348
#, c-format
msgid "Text files are different"
-msgstr ""
+msgstr "Los archivos son diferentes"
#: Merge.rc:2354
#, c-format
@@ -4636,8 +4704,14 @@
#: Merge.rc:2421
#, c-format
-msgid "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n With the current options, they will be unified to the main type.\n Do you want to change the options and preserve the different EOL ?"
-msgstr "Los EOL son de tipos diferentes(DOS/UNIX/MAC) en el archivo '%1'.\n Con la configuraci\xF3n actual, ser\xE1n unificados al tipo principal.\n \xBFDesea cambiar las opciones y preservar los EOL diferentes?"
+msgid ""
+"The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n"
+" With the current options, they will be unified to the main type.\n"
+" Do you want to change the options and preserve the different EOL ?"
+msgstr ""
+"Los EOL son de tipos diferentes(DOS/UNIX/MAC) en el archivo '%1'.\n"
+" Con la configuraci\xF3n actual, ser\xE1n unificados al tipo principal.\n"
+" \xBFDesea cambiar las opciones y preservar los EOL diferentes?"
#: Merge.rc:2422
#, c-format
@@ -4656,8 +4730,18 @@
#: Merge.rc:2425
#, c-format
-msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?"
-msgstr "La carpeta solamente existe en el otro lado y no puede abrirse.\n\n\xBFQuiere crear una carpeta combinando:\n%1\nal otro lado y abrir \xE9stas carpetas?"
+msgid ""
+"The folder exists only in other side and cannot be opened.\n"
+"\n"
+"Do you want to create a matching folder:\n"
+"%1\n"
+"to the other side and open these folders?"
+msgstr ""
+"La carpeta solamente existe en el otro lado y no puede abrirse.\n"
+"\n"
+"\xBFQuiere crear una carpeta combinando:\n"
+"%1\n"
+"al otro lado y abrir \xE9stas carpetas?"
#: Merge.rc:2431
#, c-format
@@ -5305,22 +5389,22 @@
#: Merge.rc:2654
#, c-format
msgid "Type"
-msgstr ""
+msgstr "Tipo"
#: Merge.rc:2656
#, c-format
msgid "Unpacker"
-msgstr ""
+msgstr "Descompactador"
#: Merge.rc:2657
#, c-format
msgid "Prediffer"
-msgstr ""
+msgstr "Precomparaci\xF3n"
#: Merge.rc:2658
#, c-format
msgid "Editor script"
-msgstr ""
+msgstr "Editor de script"
#: Merge.rc:2665
#, c-format
@@ -5345,12 +5429,12 @@
#: Merge.rc:2669
#, c-format
msgid "Change left side file/folder read-only status"
-msgstr ""
+msgstr "Cambiar estado s\xF3lo lectura archivo/carpeta derecha"
#: Merge.rc:2670
#, c-format
msgid "Change right side file/folder read-only status"
-msgstr ""
+msgstr "Cambiar estado s\xF3lo lectura archivo/carpeta derecha"
#: Merge.rc:2671
#, c-format
@@ -5546,13 +5630,21 @@
#: Merge.rc:2714
#, c-format
-msgid "Select the current user interface language\nLanguage"
-msgstr "Permite seleccionar el idioma de la interfaz de usuario\nIdioma"
+msgid ""
+"Select the current user interface language\n"
+"Language"
+msgstr ""
+"Permite seleccionar el idioma de la interfaz de usuario\n"
+"Idioma"
#: Merge.rc:2715
#, c-format
-msgid "Shows differences inside lines with different colors\nShow Line Difference"
-msgstr "Muestra las diferencias en las l\xEDneas en un color diferente\nMostrar diferencias de l\xEDnea"
+msgid ""
+"Shows differences inside lines with different colors\n"
+"Show Line Difference"
+msgstr ""
+"Muestra las diferencias en las l\xEDneas en un color diferente\n"
+"Mostrar diferencias de l\xEDnea"
#: Merge.rc:2716
#, c-format
@@ -5603,28 +5695,48 @@
#: Merge.rc:2728
#, c-format
-msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
-msgstr "Ir a la diferencia anterior\nDiferencia anterior (Alt Up)"
+msgid ""
+"Scroll to the previous difference\n"
+"Previous Difference (Alt+Up)"
+msgstr ""
+"Ir a la diferencia anterior\n"
+"Diferencia anterior (Alt Up)"
#: Merge.rc:2729
#, c-format
-msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
-msgstr "Ir a la diferencia siguiente\nDiferencia siguiente (Alt Down)"
+msgid ""
+"Scroll to the next difference\n"
+"Next Difference (Alt+Down)"
+msgstr ""
+"Ir a la diferencia siguiente\n"
+"Diferencia siguiente (Alt Down)"
#: Merge.rc:2730
#, c-format
-msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
-msgstr "Ir a la primera diferencia\nPrimera diferencia (Alt+Home)"
+msgid ""
+"Scroll to the first difference\n"
+"First Difference (Alt+Home)"
+msgstr ""
+"Ir a la primer diferencia\n"
+"Primera diferencia (Alt+Home)"
#: Merge.rc:2731
#, c-format
-msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
-msgstr "Ir a la diferencia actual\nDiferencia actual (Alt+Enter)"
+msgid ""
+"Scroll to the current difference\n"
+"Current Difference (Alt+Enter)"
+msgstr ""
+"Ir a la diferencia actual\n"
+"Diferencia actual (Alt+Enter)"
#: Merge.rc:2732
#, c-format
-msgid "Scroll to the last difference\nLast Difference (Alt+End)"
-msgstr "Ir a la \xFAltima diferencia\n\xDAltima diferencia (Alt+End)"
+msgid ""
+"Scroll to the last difference\n"
+"Last Difference (Alt+End)"
+msgstr ""
+"Ir a la \xFAltima diferencia\n"
+"\xDAltima diferencia (Alt+End)"
#: Merge.rc:2733
#, c-format
@@ -5683,7 +5795,7 @@
#: Merge.rc:2739
#, c-format
msgid "Delete selected items from both directories"
-msgstr "Borra los elementos seleccionados de ambas carpetas"
+msgstr "Elimina los elementos seleccionados de ambas carpetas"
#: Merge.rc:2740
#, c-format
@@ -5713,7 +5825,7 @@
#: Merge.rc:2755
#, c-format
msgid "Shows a list of available plugins"
-msgstr ""
+msgstr "Mostrar una lista de plugins disponibles"
#: Merge.rc:2756
#, c-format
@@ -5752,8 +5864,12 @@
#: Merge.rc:2768
#, c-format
-msgid "Activates next visible file\nActivate next File"
-msgstr "Cambia al siguiente archivo visible\nCambia al siguiente archivo"
+msgid ""
+"Activates next visible file\n"
+"Activate next File"
+msgstr ""
+"Cambia al siguiente archivo visible\n"
+"Cambia al siguiente archivo"
#: Merge.rc:2769
#, c-format
@@ -5762,8 +5878,12 @@
#: Merge.rc:2775
#, c-format
-msgid "Opens the WinMerge Help\nWinMerge Help"
-msgstr "Abre la Ayuda de WinMerge\nAyuda de WinMerge"
+msgid ""
+"Opens the WinMerge Help\n"
+"WinMerge Help"
+msgstr ""
+"Abre la Ayuda de WinMerge\n"
+"Ayuda de WinMerge"
#: Merge.rc:2776
#, c-format
@@ -5782,13 +5902,21 @@
#: Merge.rc:2779
#, c-format
-msgid "Opens the release notes document\nRelease Notes"
-msgstr "Abre los documentos de las notas de versiones\nNotas de la Versi\xF3n"
+msgid ""
+"Opens the release notes document\n"
+"Release Notes"
+msgstr ""
+"Abre los documentos de las notas de versiones\n"
+"Notas de la Versi\xF3n"
#: Merge.rc:2780
#, c-format
-msgid "Opens the translations website\nTranslations"
-msgstr "Abre el sitio web de las traducciones\nTraducciones"
+msgid ""
+"Opens the translations website\n"
+"Translations"
+msgstr ""
+"Abre el sitio web de las traducciones\n"
+"Traducciones"
#: Merge.rc:2786
#, c-format
@@ -5883,7 +6011,7 @@
#: Merge.rc:2825
#, c-format
msgid "No Highlighting"
-msgstr ""
+msgstr "No Seleccionado"
#: Merge.rc:2826
#, c-format
@@ -6038,7 +6166,7 @@
#: Merge.rc:2856
#, c-format
msgid "Verilog"
-msgstr ""
+msgstr "Comprobaci\xF3n"
#: Merge.rc:2857
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2010-01-13 20:36:29
|
Revision: 7098
http://winmerge.svn.sourceforge.net/winmerge/?rev=7098&view=rev
Author: gerundt
Date: 2010-01-13 20:36:19 +0000 (Wed, 13 Jan 2010)
Log Message:
-----------
PATCH: [ 2930734 ] Winmerge 2.12.4 Spanish Update and Corrected
Submitted by Mario Angel
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Translations/WinMerge/Spanish.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2010-01-12 22:07:30 UTC (rev 7097)
+++ trunk/Docs/Users/ChangeLog.txt 2010-01-13 20:36:19 UTC (rev 7098)
@@ -17,6 +17,8 @@
an EOL byte (#2922517)
Bugfix: Automatic rescanning was not disabled everywhere (r7086,r7089)
Bugfix: Quick contents compare didn't ignore EOL byte differences (#2929005)
+ Translation updates:
+ - Spanish (#2930734)
WinMerge 2.13.10 2009-12-21 (r7051)
Visual Studio project files upgraded to VS2005 format (r7045)
Modified: trunk/Translations/WinMerge/Spanish.po
===================================================================
--- trunk/Translations/WinMerge/Spanish.po 2010-01-12 22:07:30 UTC (rev 7097)
+++ trunk/Translations/WinMerge/Spanish.po 2010-01-13 20:36:19 UTC (rev 7098)
@@ -14,7 +14,7 @@
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2008-03-04 22:34+0100\n"
+"PO-Revision-Date: 2010-01-09 14:28+0100\n"
"Last-Translator: Mario Angel <marioangel70 at gmail.com>\n"
"Language-Team: Spanish <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -287,7 +287,7 @@
#: Merge.rc:457
#, c-format
msgid "&List..."
-msgstr ""
+msgstr "&Lista..."
#: Merge.rc:152
#, c-format
@@ -395,12 +395,12 @@
#: Merge.rc:485
#, c-format
msgid "&Cascade"
-msgstr "&Superponer"
+msgstr "&Cascada"
#: Merge.rc:178
#: Merge.rc:299
#: Merge.rc:487
-#: Merge.rc:1947
+#: Merge.rc:1948
#, c-format
msgid "&Help"
msgstr "A&yuda"
@@ -515,17 +515,17 @@
#: Merge.rc:227
#, c-format
msgid "Tree &Mode"
-msgstr ""
+msgstr "&Modo \xC1rbol"
#: Merge.rc:228
#, c-format
msgid "E&xpand All Subfolders"
-msgstr ""
+msgstr "E&xpandir Todas las Subcarpetas"
#: Merge.rc:229
#, c-format
msgid "&Collapse All Subfolders"
-msgstr ""
+msgstr "&Contraer Todas las Subcarpetas"
#: Merge.rc:242
#, c-format
@@ -570,7 +570,7 @@
#: Merge.rc:436
#, c-format
msgid "&First Difference\tAlt+Home"
-msgstr "&Primera diferencia\tAlt+Home"
+msgstr "&Primer diferencia\tAlt+Home"
#: Merge.rc:257
#: Merge.rc:437
@@ -599,7 +599,7 @@
#: Merge.rc:263
#, c-format
msgid "&Delete\tDel"
-msgstr "&Borrar\tDel"
+msgstr "&Eliminar\tDel"
#: Merge.rc:267
#: Merge.rc:566
@@ -731,7 +731,7 @@
msgstr "Scri&pts"
#: Merge.rc:373
-#: Merge.rc:2803
+#: Merge.rc:2708
#, c-format
msgid "< Empty >"
msgstr "< Vac\xEDo >"
@@ -800,7 +800,7 @@
#: Merge.rc:402
#, c-format
msgid "Syntax Highlight"
-msgstr "Destacar sintaxis"
+msgstr "Seleccionar sintaxis"
#: Merge.rc:407
#, c-format
@@ -934,14 +934,14 @@
#: Merge.rc:526
#: Merge.rc:1147
-#: Merge.rc:1531
+#: Merge.rc:1514
#, c-format
msgid "&Left"
msgstr "&Derecha"
#: Merge.rc:527
#: Merge.rc:1149
-#: Merge.rc:1534
+#: Merge.rc:1517
#, c-format
msgid "&Right"
msgstr "&Izquierda"
@@ -1098,12 +1098,12 @@
#: Merge.rc:1066
#: Merge.rc:1095
#: Merge.rc:1105
-#: Merge.rc:1273
-#: Merge.rc:1337
-#: Merge.rc:1350
-#: Merge.rc:1442
-#: Merge.rc:1457
-#: Merge.rc:1679
+#: Merge.rc:1256
+#: Merge.rc:1320
+#: Merge.rc:1333
+#: Merge.rc:1425
+#: Merge.rc:1440
+#: Merge.rc:1662
#, c-format
msgid "OK"
msgstr "Aceptar"
@@ -1119,7 +1119,7 @@
msgstr "Seleccione archivos o carpetas..."
#: Merge.rc:690
-#: Merge.rc:1608
+#: Merge.rc:1591
#, c-format
msgid "&Left:"
msgstr "&Izquierda:"
@@ -1133,7 +1133,7 @@
msgstr "&Examinar..."
#: Merge.rc:695
-#: Merge.rc:1612
+#: Merge.rc:1595
#, c-format
msgid "&Right:"
msgstr "&Derecha:"
@@ -1145,13 +1145,13 @@
msgstr "E&xaminar..."
#: Merge.rc:700
-#: Merge.rc:1616
+#: Merge.rc:1599
#, c-format
msgid "&Filter:"
msgstr "&Filtro:"
#: Merge.rc:703
-#: Merge.rc:1618
+#: Merge.rc:1601
#, c-format
msgid "Select..."
msgstr "Seleccionar..."
@@ -1167,7 +1167,7 @@
msgstr "&Seleccionar..."
#: Merge.rc:708
-#: Merge.rc:1619
+#: Merge.rc:1602
#, c-format
msgid "&Include Subfolders"
msgstr "&Incluir subcarpetas"
@@ -1187,17 +1187,17 @@
#: Merge.rc:1096
#: Merge.rc:1106
#: Merge.rc:1157
-#: Merge.rc:1274
-#: Merge.rc:1351
-#: Merge.rc:1443
-#: Merge.rc:1458
-#: Merge.rc:1680
+#: Merge.rc:1257
+#: Merge.rc:1334
+#: Merge.rc:1426
+#: Merge.rc:1441
+#: Merge.rc:1663
#, c-format
msgid "Cancel"
msgstr "Cancelar"
#: Merge.rc:713
-#: Merge.rc:1352
+#: Merge.rc:1335
#, c-format
msgid "Help"
msgstr "Ayuda"
@@ -1205,7 +1205,7 @@
#: Merge.rc:714
#, c-format
msgid "Files or Folders to Compare"
-msgstr "Objetos para Comparar"
+msgstr "Archivos o Carpetas a Comparar"
#: Merge.rc:721
#, c-format
@@ -1265,13 +1265,14 @@
msgstr "Sistema de &versionado:"
#: Merge.rc:753
-#: Merge.rc:2079
+#: Merge.rc:2083
#, c-format
msgid "&Path to cleartool.exe:"
msgstr "&Ruta a cleartool.exe:"
#: Merge.rc:760
-#: Merge.rc:1955
+#: Merge.rc:1956
+#: Merge.rc:1969
#, c-format
msgid "General"
msgstr "General"
@@ -1279,7 +1280,7 @@
#: Merge.rc:763
#, c-format
msgid "Automatically &scroll to first difference"
-msgstr "Mover&se autom\xE1ticamente a la primera diferencia"
+msgstr "Mover&se autom\xE1ticamente a la primer diferencia"
#: Merge.rc:766
#, c-format
@@ -1294,7 +1295,7 @@
#: Merge.rc:770
#, c-format
msgid "&Automatically verify paths in Open-dialog"
-msgstr "Verificar rutas &autom\xE1ticamente en la ventana de apertura"
+msgstr "Comprobar rutas &autom\xE1ticamente en la ventana de apertura"
#: Merge.rc:773
#, c-format
@@ -1314,7 +1315,7 @@
#: Merge.rc:780
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
-msgstr ""
+msgstr "Mostrar \"Seleccione archivos o carpetas\" al Iniciar"
#: Merge.rc:782
#, c-format
@@ -1327,13 +1328,13 @@
msgstr "Habilitar m\xFAltiples ventanas de comparaci\xF3n para"
#: Merge.rc:787
-#: Merge.rc:1631
+#: Merge.rc:1614
#, c-format
msgid "&Folder compare"
msgstr "Comparaci\xF3n de &carpetas"
#: Merge.rc:789
-#: Merge.rc:1633
+#: Merge.rc:1616
#, c-format
msgid "Fil&e compare"
msgstr "Comparaci\xF3n de &archivos"
@@ -1454,7 +1455,7 @@
msgstr "Reempl. Tod&o"
#: Merge.rc:872
-#: Merge.rc:2201
+#: Merge.rc:2205
#, c-format
msgid "Rational ClearCase"
msgstr "Rational ClearCase"
@@ -1465,7 +1466,7 @@
msgstr "Desproteger"
#: Merge.rc:880
-#: Merge.rc:1191
+#: Merge.rc:1175
#, c-format
msgid "Comments"
msgstr "Comentarios"
@@ -1511,7 +1512,7 @@
msgstr "Eliminar"
#: Merge.rc:910
-#: Merge.rc:1958
+#: Merge.rc:1959
#, c-format
msgid "Colors"
msgstr "Colores"
@@ -1527,7 +1528,7 @@
msgstr "Diferencia seleccionada:"
#: Merge.rc:921
-#: Merge.rc:1583
+#: Merge.rc:1566
#, c-format
msgid "Background"
msgstr "Fondo"
@@ -1538,8 +1539,9 @@
msgstr "Eliminada"
#: Merge.rc:935
-#: Merge.rc:1378
-#: Merge.rc:1584
+#: Merge.rc:1361
+#: Merge.rc:1567
+#: Merge.rc:1960
#, c-format
msgid "Text"
msgstr "Texto"
@@ -1572,21 +1574,22 @@
#: Merge.rc:986
#: Merge.rc:1065
#: Merge.rc:1094
-#: Merge.rc:1194
-#: Merge.rc:1424
+#: Merge.rc:1177
+#: Merge.rc:1407
+#: Merge.rc:1699
#, c-format
msgid "Defaults"
msgstr "Predeterminada"
#: Merge.rc:992
-#: Merge.rc:1366
-#: Merge.rc:1572
+#: Merge.rc:1349
+#: Merge.rc:1555
#, c-format
msgid "Dialog"
msgstr "Di\xE1logo"
#: Merge.rc:1002
-#: Merge.rc:1961
+#: Merge.rc:1962
#, c-format
msgid "System"
msgstr "Sistema"
@@ -1594,7 +1597,7 @@
#: Merge.rc:1005
#, c-format
msgid "&Send deleted files to Recycle Bin"
-msgstr "&Enviar archivos borrados a la Papelera de reciclaje."
+msgstr "&Enviar archivos eliminados a la Papelera de reciclaje."
#: Merge.rc:1007
#, c-format
@@ -1763,7 +1766,7 @@
msgstr " Progreso de comparaci\xF3n de carpetas"
#: Merge.rc:1128
-#: Merge.rc:1908
+#: Merge.rc:1909
#, c-format
msgid "Stop"
msgstr "Detener"
@@ -1819,7 +1822,7 @@
msgstr "Ir &a"
#: Merge.rc:1162
-#: Merge.rc:1956
+#: Merge.rc:1957
#, c-format
msgid "Compare"
msgstr "Comparar"
@@ -1834,245 +1837,234 @@
msgid "&Compare"
msgstr "&Comparar"
-#: Merge.rc:1168
+#: Merge.rc:1167
#, c-format
msgid "&Ignore change"
msgstr "&Ignorar cambios"
-#: Merge.rc:1170
+#: Merge.rc:1168
#, c-format
msgid "I&gnore all"
msgstr "I&gnorar todos"
-#: Merge.rc:1172
+#: Merge.rc:1169
#, c-format
msgid "Ignore blan&k lines"
msgstr "Ignorar diferencias de l\xEDneas &vac\xEDas"
-#: Merge.rc:1174
+#: Merge.rc:1170
#, c-format
msgid "Ignore &case"
msgstr "Ignorar MAY\xDASCULAS/min\xFAs&culas"
-#: Merge.rc:1176
+#: Merge.rc:1171
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
msgstr "Igno&rar saltos de l\xEDnea diferentes (Windows/Unix/Mac)"
-#: Merge.rc:1179
+#: Merge.rc:1173
#, c-format
msgid "E&nable moved block detection"
msgstr "Habilitar detecci\xF3&n de bloques movidos"
-#: Merge.rc:1181
+#: Merge.rc:1174
#, c-format
msgid "&Match similar lines"
msgstr "Co&mbinar con l\xEDneas similares"
-#: Merge.rc:1183
+#: Merge.rc:1176
#, c-format
-msgid "Ign&ore time differences less than 3 seconds"
-msgstr "Ign&orar diferencias de tiempo menores de 3 segundos."
-
-#: Merge.rc:1186
-#, c-format
-msgid "&File Compare method:"
-msgstr "Com¶r:"
-
-#: Merge.rc:1189
-#, c-format
-msgid "S&top after first difference"
-msgstr "&Parar despu\xE9s de la primera diferencia"
-
-#: Merge.rc:1192
-#, c-format
msgid "Filter Comments"
msgstr "Filtrar comentarios"
-#: Merge.rc:1199
-#: Merge.rc:1957
+#: Merge.rc:1182
+#: Merge.rc:1958
#, c-format
msgid "Editor"
msgstr "Editor"
-#: Merge.rc:1202
+#: Merge.rc:1185
#, c-format
msgid "&Highlight syntax"
-msgstr "Resaltar sinta&xis"
+msgstr "Seleccionar sinta&xis"
-#: Merge.rc:1204
+#: Merge.rc:1187
#, c-format
msgid "&Automatic rescan"
msgstr "&Actualizaci\xF3n autom\xE1tica"
-#: Merge.rc:1206
+#: Merge.rc:1189
#, c-format
msgid "&Preserve original EOL chars"
msgstr "&Preservar caracteres EOL originales"
-#: Merge.rc:1208
+#: Merge.rc:1191
#, c-format
msgid "Tabs"
msgstr "Tabulaciones"
-#: Merge.rc:1209
+#: Merge.rc:1192
#, c-format
msgid "&Tab size:"
msgstr "&Tama\xF1o de tab.:"
-#: Merge.rc:1212
+#: Merge.rc:1195
#, c-format
msgid "&Insert Tabs"
msgstr "&Insertar tabulaciones"
-#: Merge.rc:1214
+#: Merge.rc:1197
#, c-format
msgid "Insert &Spaces"
msgstr "Insertar e&spacios"
-#: Merge.rc:1216
+#: Merge.rc:1199
#, c-format
msgid "Line Difference Coloring"
msgstr "Coloraci\xF3n de las diferencias de l\xEDnea"
-#: Merge.rc:1218
+#: Merge.rc:1201
#, c-format
msgid "View line differences"
msgstr "Ver diferencias de l\xEDnea"
-#: Merge.rc:1220
+#: Merge.rc:1203
#, c-format
msgid "&Character level"
msgstr "A nivel de &caracter"
-#: Merge.rc:1222
+#: Merge.rc:1205
#, c-format
msgid "&Word-level:"
msgstr "A nivel de &palabra:"
-#: Merge.rc:1226
+#: Merge.rc:1209
#, c-format
msgid "W&ord break characters:"
msgstr ""
-#: Merge.rc:1239
+#: Merge.rc:1222
#, c-format
msgid "Filefilters"
msgstr "Filtros de archivo"
-#: Merge.rc:1245
+#: Merge.rc:1228
#, c-format
msgid "Test"
msgstr "Probar"
-#: Merge.rc:1246
+#: Merge.rc:1229
#, c-format
msgid "Install..."
msgstr "Instalar..."
-#: Merge.rc:1247
+#: Merge.rc:1230
#, c-format
msgid "New..."
msgstr "Nuevo..."
-#: Merge.rc:1248
+#: Merge.rc:1231
#, c-format
msgid "Edit..."
msgstr "Editar..."
-#: Merge.rc:1249
+#: Merge.rc:1232
#, c-format
msgid "Delete..."
msgstr "Eliminar..."
-#: Merge.rc:1255
+#: Merge.rc:1238
#, c-format
msgid "Save modified files?"
msgstr "\xBFGuardar archivos modificados?"
-#: Merge.rc:1258
+#: Merge.rc:1241
#, c-format
msgid "Left side file"
msgstr "Archivo en lado Izquierdo"
-#: Merge.rc:1261
+#: Merge.rc:1244
#, c-format
msgid "&Save changes"
msgstr "&Guardar cambios"
-#: Merge.rc:1263
+#: Merge.rc:1246
#, c-format
msgid "&Discard changes"
msgstr "&Descartar cambios"
-#: Merge.rc:1265
+#: Merge.rc:1248
#, c-format
msgid "Right side file"
msgstr "Archivo en lado Derecho"
-#: Merge.rc:1268
+#: Merge.rc:1251
#, c-format
msgid "S&ave changes"
msgstr "Gu&ardar cambios"
-#: Merge.rc:1270
+#: Merge.rc:1253
#, c-format
msgid "Dis&card changes"
msgstr "Des&cartar cambios"
-#: Merge.rc:1272
+#: Merge.rc:1255
#, c-format
msgid "Disca&rd All"
msgstr ""
-#: Merge.rc:1279
-#: Merge.rc:1527
-#: Merge.rc:1963
+#: Merge.rc:1262
+#: Merge.rc:1510
+#: Merge.rc:1964
#, c-format
msgid "Codepage"
msgstr "P\xE1gina de c\xF3digos"
-#: Merge.rc:1282
+#: Merge.rc:1265
#, c-format
msgid "Default Codepage"
msgstr "P\xE1gina de c\xF3digo predeterminada"
-#: Merge.rc:1283
+#: Merge.rc:1266
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr "Seleccione la p\xE1gina de c\xF3digos predeterminada a utilizar cuando se carguen archivos no Unicode:"
-#: Merge.rc:1285
+#: Merge.rc:1268
#, c-format
-msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session"
+msgid ""
+"Detect codepage info for these files: .html, .rc, .xml \n"
+"need to restart session"
msgstr ""
+"Detectar p\xE1gina de c\xF3digos para \xE9stos archivos : .html, .rc, .xml \n"
+"se necesita reiniciar"
-#: Merge.rc:1288
+#: Merge.rc:1271
#, c-format
msgid "System codepage"
msgstr "P\xE1gina de c\xF3digos del sistema"
-#: Merge.rc:1290
+#: Merge.rc:1273
#, c-format
msgid "According to WinMerge User Interface"
msgstr "La misma que la interfaz de usuario de WinMerge"
-#: Merge.rc:1292
+#: Merge.rc:1275
#, c-format
msgid "Custom codepage:"
-msgstr ""
+msgstr "P\xE1gina de c\xF3digos:"
-#: Merge.rc:1300
+#: Merge.rc:1283
#, c-format
msgid "WinMerge - Archive support disabled"
msgstr "WinMerge - Soporte de archivos deshabilitado"
-#: Merge.rc:1303
+#: Merge.rc:1286
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
msgstr "Imposible detectar la versi\xF3n de 7-Zip (\xBFno instalado?)"
-#: Merge.rc:1306
+#: Merge.rc:1289
#, c-format
msgid ""
"Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n"
@@ -2081,12 +2073,12 @@
"El soporte de archivos requiere 7-Zip o posterior instalado en su PC, o sus \n"
"componentes esenciales copiados en la carpeta del programa para operar en solitario."
-#: Merge.rc:1308
+#: Merge.rc:1291
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
msgstr "Adem\xE1s debe haber un plugin de interface apropiado (Merge7z*.dll) en la ruta."
-#: Merge.rc:1310
+#: Merge.rc:1293
#, c-format
msgid ""
"Please use the version of 7-Zip recommended below until interface plugins for later\n"
@@ -2095,12 +2087,12 @@
"Por favor, use la versi\xF3n de 7-Zip recomendada debajo hasta que haya disponible \n"
"una nueva versi\xF3n del plugin de interface."
-#: Merge.rc:1312
+#: Merge.rc:1295
#, c-format
msgid "Version"
msgstr "Versi\xF3n"
-#: Merge.rc:1314
+#: Merge.rc:1297
#, c-format
msgid ""
"Plugin required\n"
@@ -2109,587 +2101,623 @@
"Plugin requerido\n"
"(dllbuild %04u)"
-#: Merge.rc:1316
+#: Merge.rc:1299
#, c-format
msgid "Recommended version of 7-Zip:"
msgstr "Versi\xF3n recomendada de 7-Zip:"
-#: Merge.rc:1319
-#: Merge.rc:1322
+#: Merge.rc:1302
+#: Merge.rc:1305
#, c-format
msgid "present"
msgstr "presente"
-#: Merge.rc:1320
+#: Merge.rc:1303
#, c-format
msgid "Merge7z000U.dll"
msgstr "Merge7z000U.dll"
-#: Merge.rc:1323
+#: Merge.rc:1306
#, c-format
msgid "7-Zip software installed on your computer:"
msgstr "Software 7-Zip instalado en su computadora:"
-#: Merge.rc:1325
-#: Merge.rc:1330
+#: Merge.rc:1308
+#: Merge.rc:1313
#, c-format
msgid "none"
msgstr "ninguno"
-#: Merge.rc:1327
+#: Merge.rc:1310
#, c-format
msgid "missing"
msgstr "falta"
-#: Merge.rc:1328
+#: Merge.rc:1311
#, c-format
msgid "7-Zip components for standalone operation:"
msgstr "Componentes 7-Zip para op. en solitario:"
-#: Merge.rc:1332
+#: Merge.rc:1315
#, c-format
msgid "outdated"
msgstr "obsoleto"
-#: Merge.rc:1333
+#: Merge.rc:1316
#, c-format
msgid "Plugins on path:"
msgstr "Plugins en la ruta:"
-#: Merge.rc:1334
+#: Merge.rc:1317
#, c-format
-msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)"
-msgstr "No mostrar este &mensaje de nuevo.\n(Puede volver a mostrar \xE9ste mensaje desde el men\xFA Ayuda.)"
+msgid ""
+"Don't display this &message again.\n"
+"(You can always recall this message from the Help menu.)"
+msgstr ""
+"No mostrar este &mensaje de nuevo.\n"
+"(Puede volver a mostrar \xE9ste mensaje desde el men\xFA Ayuda.)"
-#: Merge.rc:1338
+#: Merge.rc:1321
#, c-format
msgid "Plugin Download"
msgstr "Descarga de plugin"
-#: Merge.rc:1347
+#: Merge.rc:1330
#, c-format
msgid "Options"
msgstr "Configuraci\xF3n"
-#: Merge.rc:1358
+#: Merge.rc:1341
#, c-format
msgid " Categories"
msgstr " Categor\xEDas"
-#: Merge.rc:1360
+#: Merge.rc:1343
#, c-format
msgid "Import..."
msgstr "Importar..."
-#: Merge.rc:1361
+#: Merge.rc:1344
#, c-format
msgid "Export..."
msgstr "Exportar..."
-#: Merge.rc:1369
+#: Merge.rc:1352
#, c-format
msgid "Keywords:"
msgstr "Palabras clave:"
-#: Merge.rc:1370
+#: Merge.rc:1353
#, c-format
msgid "Function names:"
msgstr "Nombres de funci\xF3n:"
-#: Merge.rc:1371
+#: Merge.rc:1354
#, c-format
msgid "Comments:"
msgstr "Comentarios:"
-#: Merge.rc:1372
+#: Merge.rc:1355
#, c-format
msgid "Numbers:"
msgstr "N\xFAmeros:"
-#: Merge.rc:1373
+#: Merge.rc:1356
#, c-format
msgid "Operators:"
msgstr "Operadores:"
-#: Merge.rc:1374
+#: Merge.rc:1357
#, c-format
msgid "Strings:"
msgstr "Cadenas:"
-#: Merge.rc:1375
+#: Merge.rc:1358
#, c-format
msgid "Preprocessor:"
msgstr "Preprocesar:"
-#: Merge.rc:1376
+#: Merge.rc:1359
#, c-format
msgid "User 1:"
msgstr "Usuario 1:"
-#: Merge.rc:1377
+#: Merge.rc:1360
#, c-format
msgid "User 2:"
msgstr "Usuario 2:"
-#: Merge.rc:1382
-#: Merge.rc:1387
-#: Merge.rc:1392
-#: Merge.rc:1397
-#: Merge.rc:1402
-#: Merge.rc:1407
-#: Merge.rc:1412
-#: Merge.rc:1417
-#: Merge.rc:1422
+#: Merge.rc:1365
+#: Merge.rc:1370
+#: Merge.rc:1375
+#: Merge.rc:1380
+#: Merge.rc:1385
+#: Merge.rc:1390
+#: Merge.rc:1395
+#: Merge.rc:1400
+#: Merge.rc:1405
#, c-format
msgid "Bold"
msgstr "Negrita"
-#: Merge.rc:1430
+#: Merge.rc:1413
#, c-format
msgid "Folder Compare Report"
msgstr "Informe de comparaci\xF3n de carpetas"
-#: Merge.rc:1433
+#: Merge.rc:1416
#, c-format
msgid "Report &File:"
msgstr "Archivo de In&forme:"
-#: Merge.rc:1436
-#: Merge.rc:1610
-#: Merge.rc:1614
-#: Merge.rc:1641
+#: Merge.rc:1419
+#: Merge.rc:1593
+#: Merge.rc:1597
+#: Merge.rc:1624
#, c-format
msgid "Browse..."
msgstr "Examinar..."
-#: Merge.rc:1437
+#: Merge.rc:1420
#, c-format
msgid "&Style:"
msgstr "E&stilo:"
-#: Merge.rc:1440
+#: Merge.rc:1423
#, c-format
msgid "&Copy to Clipboard"
msgstr "&Copiar al Portapapeles"
-#: Merge.rc:1448
+#: Merge.rc:1431
#, c-format
msgid "Shared or Private Filter"
msgstr "Filtro Compartido o Privado"
-#: Merge.rc:1451
+#: Merge.rc:1434
#, c-format
msgid "Which type of filter do you want to create?"
msgstr "\xBFQu\xE9 tipo de filtro quiere crear?"
-#: Merge.rc:1453
+#: Merge.rc:1436
#, c-format
msgid "Shared Filter (for all users on this machine)"
msgstr "Filtro compartido (para todos los usuarios de esta m\xE1quina)"
-#: Merge.rc:1455
+#: Merge.rc:1438
#, c-format
msgid "Private Filter (only for current user)"
msgstr "Filtro privado (solo para el usuario actual)"
-#: Merge.rc:1463
-#: Merge.rc:1964
+#: Merge.rc:1446
+#: Merge.rc:1965
#, c-format
msgid "Archive Support"
msgstr "Soporte de Archivos"
-#: Merge.rc:1466
+#: Merge.rc:1449
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
msgstr "El soporte de archivos requiere el plugin de 7-Zip instalado:"
-#: Merge.rc:1468
+#: Merge.rc:1451
#, c-format
msgid "Download 7-zip Plugin"
msgstr "Descargar plugin de 7-zip"
-#: Merge.rc:1469
+#: Merge.rc:1452
#, c-format
msgid "&Enable archive file support"
msgstr "Habilitar soport&e de archivos"
-#: Merge.rc:1471
+#: Merge.rc:1454
#, c-format
msgid "&Use stand-alone 7-Zip if available"
msgstr "&Utilizar 7-Zip en solitario si est\xE1 disponible"
-#: Merge.rc:1474
+#: Merge.rc:1457
#, c-format
msgid "U&se local 7-Zip from WinMerge folder"
msgstr "Utilizar 7-Zip &local de la carpeta de WinMerge"
-#: Merge.rc:1476
+#: Merge.rc:1459
#, c-format
msgid "&Detect archive type from file signature"
msgstr "&Detectar tipo de archivo por su firma"
-#: Merge.rc:1484
+#: Merge.rc:1467
#, c-format
msgid "Compare Statistics"
msgstr "Estad\xEDsticas de comparaci\xF3n"
-#: Merge.rc:1487
+#: Merge.rc:1470
#, c-format
msgid "Folders:"
msgstr "Carpetas:"
-#: Merge.rc:1488
+#: Merge.rc:1471
#, c-format
msgid "Files:"
msgstr "Archivos:"
-#: Merge.rc:1489
-#: Merge.rc:2355
+#: Merge.rc:1472
+#: Merge.rc:2359
#, c-format
msgid "Different"
msgstr "Diferentes"
-#: Merge.rc:1490
+#: Merge.rc:1473
#, c-format
msgid "Text:"
msgstr "Texto:"
-#: Merge.rc:1493
-#: Merge.rc:1512
+#: Merge.rc:1476
+#: Merge.rc:1495
#, c-format
msgid "Binary:"
msgstr "Binario:"
-#: Merge.rc:1496
+#: Merge.rc:1479
#, c-format
msgid "Unique"
msgstr "\xDAnicos"
-#: Merge.rc:1497
+#: Merge.rc:1480
#, c-format
msgid "Left:"
msgstr "Izquierda:"
-#: Merge.rc:1502
+#: Merge.rc:1485
#, c-format
msgid "Right:"
msgstr "Derecha:"
-#: Merge.rc:1507
-#: Merge.rc:2349
+#: Merge.rc:1490
+#: Merge.rc:2353
#, c-format
msgid "Identical"
msgstr "Iguales"
-#: Merge.rc:1516
+#: Merge.rc:1499
#, c-format
msgid "Total:"
msgstr "Total:"
-#: Merge.rc:1521
+#: Merge.rc:1504
#, c-format
msgid "Close"
msgstr "Cerrar"
-#: Merge.rc:1530
+#: Merge.rc:1513
#, c-format
msgid "Affects"
-msgstr "Afecta"
+msgstr "Afectar"
-#: Merge.rc:1533
-#: Merge.rc:1536
+#: Merge.rc:1516
+#: Merge.rc:1519
#, c-format
msgid "(Affects)"
-msgstr "(Afecta)"
+msgstr "(Afectar)"
-#: Merge.rc:1537
+#: Merge.rc:1520
#, c-format
msgid "Select Codepage for"
msgstr "Seleccione p\xE1gina de c\xF3digos para"
-#: Merge.rc:1538
+#: Merge.rc:1521
#, c-format
msgid "&File Loading:"
msgstr "&Carga de archivos:"
-#: Merge.rc:1540
-#: Merge.rc:1543
+#: Merge.rc:1523
+#: Merge.rc:1526
#, c-format
msgid "..."
msgstr "..."
-#: Merge.rc:1541
+#: Merge.rc:1524
#, c-format
msgid "File &Saving:"
msgstr "Guardado de archivo&s:"
-#: Merge.rc:1544
+#: Merge.rc:1527
#, c-format
msgid "&Use same codepage for both"
msgstr "&Usar la misma p\xE1gina de c\xF3digos para ambos"
-#: Merge.rc:1547
+#: Merge.rc:1530
#, c-format
msgid "&Apply"
msgstr "&Aplicar"
-#: Merge.rc:1548
-#: Merge.rc:1930
+#: Merge.rc:1531
+#: Merge.rc:1931
#, c-format
msgid "&Cancel"
msgstr "&Cancelar"
-#: Merge.rc:1553
+#: Merge.rc:1536
#, c-format
msgid "Test Filter"
msgstr "Prueba de filtro"
-#: Merge.rc:1556
+#: Merge.rc:1539
#, c-format
msgid "Testing filter ..."
msgstr "Probando filtro ..."
-#: Merge.rc:1558
+#: Merge.rc:1541
#, c-format
msgid "&Enter text to test:"
msgstr "&Texto a probar:"
-#: Merge.rc:1560
+#: Merge.rc:1543
#, c-format
msgid "&Folder Name"
msgstr "&Nombre de carpeta"
-#: Merge.rc:1562
+#: Merge.rc:1545
#, c-format
msgid "Result:"
msgstr "Resultado:"
-#: Merge.rc:1566
+#: Merge.rc:1549
#, c-format
msgid "&Test"
msgstr "&Probar"
-#: Merge.rc:1567
+#: Merge.rc:1550
#, c-format
msgid "&Close"
msgstr "&Cerrar"
-#: Merge.rc:1575
+#: Merge.rc:1558
#, c-format
msgid "&Use customized text colors"
msgstr "&Usar colores personalizados para el texto"
-#: Merge.rc:1578
+#: Merge.rc:1561
#, c-format
msgid "Custom text colors"
msgstr "Colores elegidos para texto normal"
-#: Merge.rc:1580
+#: Merge.rc:1563
#, c-format
msgid "Whitespace:"
msgstr "Espacio:"
-#: Merge.rc:1581
+#: Merge.rc:1564
#, c-format
msgid "Regular text:"
msgstr "Texto normal:"
-#: Merge.rc:1582
+#: Merge.rc:1565
#, c-format
msgid "Selection:"
msgstr "Selecci\xF3n:"
-#: Merge.rc:1605
+#: Merge.rc:1588
#, c-format
msgid "Paths"
msgstr "Rutas"
-#: Merge.rc:1611
+#: Merge.rc:1594
#, c-format
msgid "R&ead-only"
msgstr "S\xF3l&o lectura"
-#: Merge.rc:1615
+#: Merge.rc:1598
#, c-format
msgid "Re&ad-only"
msgstr "S\xF3&lo lectura"
-#: Merge.rc:1621
+#: Merge.rc:1604
#, c-format
msgid "Open..."
msgstr "Abrir..."
-#: Merge.rc:1622
+#: Merge.rc:1605
#, c-format
msgid "Save..."
msgstr "Guardar..."
-#: Merge.rc:1627
-#: Merge.rc:1965
+#: Merge.rc:1610
+#: Merge.rc:1966
#, c-format
msgid "Backup Files"
msgstr "Archivos de seguridad"
-#: Merge.rc:1630
+#: Merge.rc:1613
#, c-format
msgid "Create backup files in:"
msgstr "Crear archivos de seguridad en:"
-#: Merge.rc:1635
+#: Merge.rc:1618
#, c-format
msgid "Create backup files into:"
msgstr "Crear archivos de seguridad en:"
-#: Merge.rc:1636
+#: Merge.rc:1619
#, c-format
msgid "&Original file's folder"
msgstr "Carpeta del archivo &original"
-#: Merge.rc:1638
+#: Merge.rc:1621
#, c-format
msgid "&Global backup folder:"
msgstr "Carpeta de copia de se&guridad:"
-#: Merge.rc:1642
+#: Merge.rc:1625
#, c-format
msgid "Backup filename:"
msgstr "Nombre de archivo:"
-#: Merge.rc:1643
+#: Merge.rc:1626
#, c-format
msgid "&Append .bak -extension"
-msgstr "&A\xF1adir extensi\xF3n .bak"
+msgstr "&Agregar extensi\xF3n .bak"
-#: Merge.rc:1645
+#: Merge.rc:1628
#, c-format
msgid "A&ppend timestamp"
-msgstr "A\xF1adir &fecha"
+msgstr "Agregar &fecha"
-#: Merge.rc:1652
-#: Merge.rc:2257
+#: Merge.rc:1635
+#: Merge.rc:2261
#, c-format
msgid "Confirm Copy"
msgstr "Confirmar copia"
-#: Merge.rc:1656
+#: Merge.rc:1639
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr "\xBFEst\xE1 seguro que quiere copiar XXX elementos?"
-#: Merge.rc:1658
+#: Merge.rc:1641
#, c-format
msgid "From left"
msgstr "De la Izquierda"
-#: Merge.rc:1661
+#: Merge.rc:1644
#, c-format
msgid "To right"
msgstr "A la Derecha"
-#: Merge.rc:1664
+#: Merge.rc:1647
#, c-format
msgid "Yes"
msgstr "S\xED"
-#: Merge.rc:1665
+#: Merge.rc:1648
#, c-format
msgid "No"
msgstr "No"
-#: Merge.rc:1671
+#: Merge.rc:1654
#, c-format
msgid "Plugins"
-msgstr ""
+msgstr "Plugins"
-#: Merge.rc:1674
+#: Merge.rc:1657
#, c-format
msgid "&Enable plugins"
-msgstr ""
+msgstr "&Habilitar plugins"
-#: Merge.rc:1685
-#: Merge.rc:1966
+#: Merge.rc:1668
+#: Merge.rc:1967
#, c-format
msgid "Shell Integration"
-msgstr ""
+msgstr "Integraci\xF3n"
-#: Merge.rc:1688
+#: Merge.rc:1671
#, c-format
msgid "Explorer"
-msgstr ""
+msgstr "Explorador"
-#: Merge.rc:1689
+#: Merge.rc:1672
#, c-format
msgid "E&nable advanced menu"
msgstr "Habilitar men\xFA ava&nzado"
-#: Merge.rc:1691
+#: Merge.rc:1674
#, c-format
msgid "In&clude subfolders by default"
msgstr "In&cluir subcarpetas por defecto"
-#: Merge.rc:1693
+#: Merge.rc:1676
#, c-format
msgid "&Add to context menu"
+msgstr "&Agregar al men\xFA contextual"
+
+#: Merge.rc:1678
+#, c-format
+msgid "Folder compare"
+msgstr "Comparaci\xF3n de carpeta"
+
+#: Merge.rc:1679
+#, c-format
+msgid "Add &Shell menu to context menu"
+msgstr "&Agregar al men\xFA contextual del explorador."
+
+#: Merge.rc:1686
+#: Merge.rc:1970
+#: Merge.rc:2307
+#, c-format
+msgid "Folder"
+msgstr "Carpeta"
+
+#: Merge.rc:1689
+#, c-format
+msgid "&Compare method:"
msgstr ""
+#: Merge.rc:1691
+#, c-format
+msgid "S&top after first difference"
+msgstr "De&tener despu\xE9s de la primer diferencia"
+
+#: Merge.rc:1693
+#, c-format
+msgid "Ign&ore time differences less than 3 seconds"
+msgstr "Ign&orar diferencias de tiempo menores de 3 segundos."
+
#: Merge.rc:1695
#, c-format
-msgid "Folder compare"
+msgid "&Include unique subfolders contents"
msgstr ""
-#: Merge.rc:1696
+#: Merge.rc:1697
#, c-format
-msgid "Add &Shell menu to context menu"
+msgid "&Quick compare limit (MB):"
msgstr ""
#. StringFileInfo.Block
-#: Merge.rc:1722
+#: Merge.rc:1723
#, c-format
msgid "040904e4"
msgstr "0c0a04e4"
#. VarFileInfo.Translation
-#: Merge.rc:1738
+#: Merge.rc:1739
#, c-format
msgid "0x409, 1252"
msgstr "0xc0a, 1252"
-#: Merge.rc:1753
+#: Merge.rc:1754
#, c-format
msgid "Ready"
msgstr "Listo"
-#: Merge.rc:1759
+#: Merge.rc:1760
#, c-format
msgid "EXT"
msgstr "EXT"
-#: Merge.rc:1760
+#: Merge.rc:1761
#, c-format
msgid "CAP"
msgstr "MAY"
-#: Merge.rc:1761
+#: Merge.rc:1762
#, c-format
msgid "NUM"
msgstr "NUM"
-#: Merge.rc:1762
+#: Merge.rc:1763
#, c-format
msgid "SCRL"
msgstr "SCRL"
-#: Merge.rc:1763
+#: Merge.rc:1764
#, c-format
msgid "OVR"
msgstr "OVR"
-#: Merge.rc:1764
+#: Merge.rc:1765
#, c-format
msgid "REC"
msgstr "REC"
-#: Merge.rc:1770
+#: Merge.rc:1771
#, c-format
msgid ""
"Create empty documents\n"
@@ -2698,7 +2726,7 @@
"Crear documentos vac\xEDos\n"
"Nuevo Documento (Ctrl+N)"
-#: Merge.rc:1771
+#: Merge.rc:1772
#, c-format
msgid ""
"Open an existing document\n"
@@ -2707,7 +2735,7 @@
"Comparar archivos o carpetas\n"
"Comparar"
-#: Merge.rc:1772
+#: Merge.rc:1773
#, c-format
msgid ""
"Close the active document\n"
@@ -2716,7 +2744,7 @@
"Cerrar ventana\n"
"Cerrar"
-#: Merge.rc:1773
+#: Merge.rc:1774
#, c-format
msgid ""
"Save the active document\n"
@@ -2725,7 +2753,7 @@
"Guardar los documentos abiertos\n"
"Guardar"
-#: Merge.rc:1774
+#: Merge.rc:1775
#, c-format
msgid ""
"Save the active document with a new name\n"
@@ -2734,7 +2762,7 @@
"Guardar el documento activo con otro nombre\n"
"Guardar como"
-#: Merge.rc:1775
+#: Merge.rc:1776
#, c-format
msgid ""
"Change the printing options\n"
@@ -2743,7 +2771,7 @@
"Cambiar las opciones de impresi\xF3n\n"
"Configurar p\xE1gina"
-#: Merge.rc:1776
+#: Merge.rc:1777
#, c-format
msgid ""
"Change the printer and printing options\n"
@@ -2752,7 +2780,7 @@
"Cambiar la impresora y las opciones de impresi\xF3n\n"
"Configurar impresora"
-#: Merge.rc:1777
+#: Merge.rc:1778
#, c-format
msgid ""
"Print the active document\n"
@@ -2761,7 +2789,7 @@
"Imprimir el documento activo\n"
"Imprimir"
-#: Merge.rc:1778
+#: Merge.rc:1779
#, c-format
msgid ""
"Display full pages\n"
@@ -2770,27 +2798,27 @@
"Mostrar vista preliminar\n"
"Vista preliminar"
-#: Merge.rc:1783
+#: Merge.rc:1784
#, c-format
msgid "Make all hidden items visible again"
msgstr "Mostrar todos los elementos ocultos"
-#: Merge.rc:1784
+#: Merge.rc:1785
#, c-format
msgid "Toggle tree mode"
-msgstr ""
+msgstr "Cambiar a modo \xE1rbol"
-#: Merge.rc:1785
+#: Merge.rc:1786
#, c-format
msgid "Expand all subfolders"
-msgstr ""
+msgstr "Expandir todas las Subcarpetas"
-#: Merge.rc:1786
+#: Merge.rc:1787
#, c-format
msgid "Collapse all subfolders"
-msgstr ""
+msgstr "Contraer todas las carpetas"
-#: Merge.rc:1792
+#: Merge.rc:1793
#, c-format
msgid ""
"Open project file\n"
@@ -2799,32 +2827,32 @@
"Abrir archivos del proyecto\n"
"Proyecto (Ctrl+J)"
-#: Merge.rc:1793
+#: Merge.rc:1794
#, c-format
msgid "Unknown error attempting to open project file"
msgstr "Error desconocido al intentar abrir el proyecto"
-#: Merge.rc:1794
+#: Merge.rc:1795
#, c-format
msgid "Unknown error attempting to save project file"
msgstr "Error desconocido al intentar guardar el proyecto"
-#: Merge.rc:1795
+#: Merge.rc:1796
#, c-format
msgid "Project File"
msgstr "Archivo de Proyecto"
-#: Merge.rc:1796
+#: Merge.rc:1797
#, c-format
msgid "Project file successfully loaded."
msgstr "Archivo de proyecto cargado con \xE9xito."
-#: Merge.rc:1797
+#: Merge.rc:1798
#, c-format
msgid "Project file successfully saved."
msgstr "Archivo de proyecto guardado con \xE9xito."
-#: Merge.rc:1798
+#: Merge.rc:1799
#, c-format
msgid ""
"Save current paths and options to project file\n"
@@ -2833,7 +2861,7 @@
"Guardar las rutas y configuraciones actuales al archivo de proyecto\n"
"Guardar Archivo de Proyecto"
-#: Merge.rc:1803
+#: Merge.rc:1804
#, c-format
msgid ""
"Display program information, version number and copyright\n"
@@ -2842,7 +2870,7 @@
"Muestra informac\xEDon de la aplicaci\xF3n, versi\xF3n, y copyright\n"
"Acerca de WinMerge"
-#: Merge.rc:1804
+#: Merge.rc:1805
#, c-format
msgid ""
"Quit the application; prompts to save documents\n"
@@ -2851,7 +2879,6 @@
"Cerrar la aplicaci\xF3n\n"
"Salir"
-#: Merge.rc:1810
#: Merge.rc:1811
#: Merge.rc:1812
#: Merge.rc:1813
@@ -2867,11 +2894,12 @@
#: Merge.rc:1823
#: Merge.rc:1824
#: Merge.rc:1825
+#: Merge.rc:1826
#, c-format
msgid "Open this document"
msgstr "Abrir \xE9ste documento"
-#: Merge.rc:1830
+#: Merge.rc:1831
#, c-format
msgid ""
"Switch to the next window pane\n"
@@ -2880,7 +2908,7 @@
"Cambiar al panel siguiente\n"
"Panel Siguiente "
-#: Merge.rc:1831
+#: Merge.rc:1832
#, c-format
msgid ""
"Switch back to the previous window pane\n"
@@ -2889,7 +2917,7 @@
"Cambiar al panel anterior\n"
"Panel Anterior"
-#: Merge.rc:1837
+#: Merge.rc:1838
#, c-format
msgid ""
"Arrange windows so they overlap\n"
@@ -2898,7 +2926,7 @@
"Organizar ventanas en cascada (superpuestas)\n"
"Superponer"
-#: Merge.rc:1838
+#: Merge.rc:1839
#, c-format
msgid ""
"Arrange windows as non-overlapping tiles horizontally\n"
@@ -2907,7 +2935,7 @@
"Ordenar las ventanas horizontalmente\n"
"Ordenar"
-#: Merge.rc:1839
+#: Merge.rc:1840
#, c-format
msgid ""
"Arrange windows as non-overlapping tiles vertically\n"
@@ -2916,7 +2944,7 @@
"Ordenar las ventanas verticalmente\n"
"Ordenar"
-#: Merge.rc:1845
+#: Merge.rc:1846
#, c-format
msgid ""
"Copy the selection and put it on the Clipboard\n"
@@ -2925,7 +2953,7 @@
"Copiar la secci\xF3n al portapapeles\n"
"Copiar"
-#: Merge.rc:1846
+#: Merge.rc:1847
#, c-format
msgid ""
"Cut the selection and put it on the Clipboard\n"
@@ -2934,7 +2962,7 @@
"Cortar la selecci\xF3n en el portapapeles\n"
"Cortar"
-#: Merge.rc:1847
+#: Merge.rc:1848
#, c-format
msgid ""
"Find the specified text\n"
@@ -2943,7 +2971,7 @@
"Buscar el texto especificado\n"
"Buscar"
-#: Merge.rc:1848
+#: Merge.rc:1849
#, c-format
msgid ""
"Insert Clipboard contents\n"
@@ -2952,7 +2980,7 @@
"Insertar contenido del portapapeles\n"
"Pegar"
-#: Merge.rc:1849
+#: Merge.rc:1850
#, c-format
msgid ""
"Repeat the last action\n"
@@ -2961,7 +2989,7 @@
"Repetir la \xFAltima acci\xF3n\n"
"Repetir"
-#: Merge.rc:1850
+#: Merge.rc:1851
#, c-format
msgid ""
"Replace specific text with different text\n"
@@ -2970,7 +2998,7 @@
"Reemplazar un texto especificado con otro\n"
"Reemplazar"
-#: Merge.rc:1851
+#: Merge.rc:1852
#, c-format
msgid ""
"Select the entire document\n"
@@ -2979,7 +3007,7 @@
"Seleccionar el documento completo\n"
"Seleccionar todo"
-#: Merge.rc:1852
+#: Merge.rc:1853
#, c-format
msgid ""
"Undo the last action\n"
@@ -2988,7 +3016,7 @@
"Deshacer el \xFAltimo cambio\n"
"Deshacer"
-#: Merge.rc:1853
+#: Merge.rc:1854
#, c-format
msgid ""
"Redo the previously undone action\n"
@@ -2997,16 +3025,16 @@
"Rehacer\n"
"Rehacer"
-#: Merge.rc:1859
+#: Merge.rc:1860
#, c-format
msgid ""
"Show or hide the toolbar\n"
"Toggle ToolBar"
msgstr ""
-"Muestra la barra de herramientas\n"
+"Muestra la Barra de Herramientas\n"
"Barra de Herramientas"
-#: Merge.rc:1860
+#: Merge.rc:1861
#, c-format
msgid ""
"Show or hide the status bar\n"
@@ -3015,7 +3043,7 @@
"Muestra la Barra de Estado\n"
"Barra de Estado"
-#: Merge.rc:1861
+#: Merge.rc:1862
#, c-format
msgid ""
"Show or hide the tab bar\n"
@@ -3024,7 +3052,7 @@
"Muestra las pesta\xF1as\n"
"Mostrar las pesta\xF1as"
-#: Merge.rc:1862
+#: Merge.rc:1863
#, c-format
msgid ""
"Automatically resize panes\n"
@@ -3033,57 +3061,57 @@
"Cambia el tama\xF1o del panel autom\xE1ticamente\n"
"Bloquear Paneles"
-#: Merge.rc:1868
+#: Merge.rc:1869
#, c-format
msgid "Change the window size"
msgstr "Cambia el tama\xF1o de la ventana"
-#: Merge.rc:1869
+#: Merge.rc:1870
#, c-format
msgid "Change the window position"
msgstr "Cambia la posici\xF3n de la ventana"
-#: Merge.rc:1870
+#: Merge.rc:1871
#, c-format
msgid "Reduce the window to an icon"
msgstr "Reduce la ventana a un icono"
-#: Merge.rc:1871
+#: Merge.rc:1872
#, c-format
msgid "Enlarge the window to full size"
msgstr "Maximiza la venta\xF1a a tama\xF1o completo"
-#: Merge.rc:1872
+#: Merge.rc:1873
#, c-format
msgid "Switch to the next document window"
msgstr "Cambia a la ventana del documento siguiente"
-#: Merge.rc:1873
+#: Merge.rc:1874
#, c-format
msgid "Switch to the previous document window"
msgstr "Cambia a la ventana del documento anterior"
-#: Merge.rc:1874
+#: Merge.rc:1875
#, c-format
msgid "Close the active window and prompts to save the documents"
msgstr "Cierra la ventana activa y pregunta al usuario si desea guardar los cambios"
-#: Merge.rc:1879
+#: Merge.rc:1880
#, c-format
msgid "Restore the window to normal size"
msgstr "Devuelve la venta\xF1a a su tama\xF1o normal"
-#: Merge.rc:1880
+#: Merge.rc:1881
#, c-format
msgid "Activate Task List"
msgstr "Activa el Administrador de Tareas"
-#: Merge.rc:1881
+#: Merge.rc:1882
#, c-format
msgid "Activate this window"
msgstr "Activa \xE9sta ventana"
-#: Merge.rc:1887
+#: Merge.rc:1888
#, c-format
msgid ""
"Close print preview mode\n"
@@ -3092,188 +3120,221 @@
"Cierra la previsualizaci\xF3n\n"
"Cancelar previsualizaci\xF3n"
-#: Merge.rc:1894
+#: Merge.rc:1895
#, c-format
-msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare"
+msgid ""
+"\n"
+"FileCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FileCompare\n"
+"WinMerge File Compare"
msgstr ""
+"\n"
+"CompararArchivo\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.CompararArchivo\n"
+"WinMerge CompararArchivo"
-#: Merge.rc:1895
+#: Merge.rc:1896
#, c-format
-msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
-msgstr "\nCompararCarpeta\n\n\n\nWinMerge.CompararCarpeta\nComparar Carpeta de WinMerge"
+msgid ""
+"\n"
+"FolderCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FolderCompare\n"
+"WinMerge Folder Compare"
+msgstr ""
+"\n"
+"CompararCarpeta\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.CompararCarpeta\n"
+"Comparar Carpeta de WinMerge"
-#: Merge.rc:1902
+#: Merge.rc:1903
#, c-format
msgid "Preserve original EOL chars"
msgstr "Preservar caracteres originales EOL"
-#: Merge.rc:1909
+#: Merge.rc:1910
#, c-format
msgid "Press any key"
msgstr "Pulse una tecla"
-#: Merge.rc:1915
#: Merge.rc:1916
+#: Merge.rc:1917
#, c-format
msgid "Right click on the path to copy"
-msgstr "Haga click derecho en la ruta para copiar"
+msgstr "Haga clic derecho en la ruta para copiar"
-#: Merge.rc:1922
+#: Merge.rc:1923
#, c-format
-msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
-msgstr "Desarrolladores:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
+msgid ""
+"Developers:\n"
+"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
+msgstr ""
+"Desarrolladores:\n"
+"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
-#: Merge.rc:1923
+#: Merge.rc:1924
#, c-format
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."
msgstr "Winmerge no concede ABSOLUTAMENTE NINGUNA GARANT\xCDA. Es software libre, y puede ser redistribuido bajo ciertas reglas. Vea la Licencia P\xFAblica GNU en el men\xFA Ayuda para m\xE1s detalles."
-#: Merge.rc:1929
+#: Merge.rc:1930
#, c-format
msgid "&Ok"
msgstr "&Aceptar"
-#: Merge.rc:1931
+#: Merge.rc:1932
#, c-format
msgid "&Abort"
msgstr "&Cancelar"
-#: Merge.rc:1932
+#: Merge.rc:1933
#, c-format
msgid "&Retry"
msgstr "&Reintentar"
-#: Merge.rc:1933
+#: Merge.rc:1934
#, c-format
msgid "&Ignore"
msgstr "&Ignorar"
-#: Merge.rc:1934
+#: Merge.rc:1935
#, c-format
msgid "Ignore &all"
msgstr "Ignor&ar todos"
-#: Merge.rc:1935
+#: Merge.rc:1936
#, c-format
msgid "&Yes"
msgstr "&S\xED"
-#: Merge.rc:1941
+#: Merge.rc:1942
#, c-format
msgid "Yes to &all"
msgstr "S\xED a to&do"
-#: Merge.rc:1942
+#: Merge.rc:1943
#, c-format
msgid "&No"
msgstr "&No"
-#: Merge.rc:1943
+#: Merge.rc:1944
#, c-format
msgid "No to a&ll"
msgstr "No a &todo"
-#: Merge.rc:1944
+#: Merge.rc:1945
#, c-format
msgid "&Continue"
msgstr "&Continuar"
-#: Merge.rc:1945
+#: Merge.rc:1946
#, c-format
msgid "&Skip"
msgstr "&Omitir"
-#: Merge.rc:1946
+#: Merge.rc:1947
#, c-format
msgid "Skip &all"
msgstr "O&mitir todos"
-#: Merge.rc:1948
+#: Merge.rc:1949
#, c-format
msgid "Don't display this &message again."
msgstr "No mostrar este &mensaje de nuevo."
-#: Merge.rc:1949
+#: Merge.rc:1950
#, c-format
msgid "Don't ask this &question again."
msgstr "No &preguntar de nuevo."
-#: Merge.rc:1959
+#: Merge.rc:1961
#, c-format
-msgid "Syntax colors"
-msgstr "Colores por Sintaxis"
+msgid "Syntax"
+msgstr ""
-#: Merge.rc:1960
+#: Merge.rc:1963
#, c-format
-msgid "Text Colors"
-msgstr "Colores de Texto"
-
-#: Merge.rc:1962
-#, c-format
msgid "Version Control"
msgstr "Control de Versiones"
-#: Merge.rc:1973
+#: Merge.rc:1968
+#: Merge.rc:2339
#, c-format
+msgid "Differences"
+msgstr "Diferencias"
+
+#: Merge.rc:1977
+#, c-format
msgid "To:"
msgstr "A:"
-#: Merge.rc:1974
+#: Merge.rc:1978
#, c-format
msgid "From left:"
msgstr "De la izquierda:"
-#: Merge.rc:1975
+#: Merge.rc:1979
#, c-format
msgid "To left:"
msgstr "A la izquierda:"
-#: Merge.rc:1976
+#: Merge.rc:1980
#, c-format
msgid "From right:"
msgstr "De la derecha:"
-#: Merge.rc:1977
+#: Merge.rc:1981
#, c-format
msgid "To right:"
msgstr "A la derecha:"
-#: Merge.rc:1983
+#: Merge.rc:1987
#, c-format
msgid "Version %1"
msgstr "Versi\xF3n %1 - Espa\xF1ol"
-#: Merge.rc:1984
+#: Merge.rc:1988
#, c-format
msgid "Unicode"
msgstr "Unicode"
-#: Merge.rc:1985
+#: Merge.rc:1989
#, c-format
msgid "X64"
-msgstr ""
+msgstr "X64"
-#: Merge.rc:1991
+#: Merge.rc:1995
#, c-format
msgid "Options (%1)"
msgstr "Configuraci\xF3n (%1)"
-#: Merge.rc:1992
+#: Merge.rc:1996
#, c-format
msgid "All message boxes are now displayed again."
msgstr "Todas las cajas de mensaje se mostrar\xE1n de nuevo."
-#: Merge.rc:1993
+#: Merge.rc:1997
#, c-format
msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted."
msgstr "Se han realizado modificaciones en los archivos de la sesion de comparaci\xF3n actual. Algunas configuraciones pueden no surtir efecto hasta que la comparaci\xF3n de archivos se ejecute de nuevo."
-#: Merge.rc:1994
+#: Merge.rc:1998
#, c-format
msgid "The selected font change will not be applied to any currently visible difference windows."
msgstr "La fuente seleccionada no se aplicar\xE1 a ninguna de las ventanas de diferencias abiertas actualmente."
-#: Merge.rc:1996
+#: Merge.rc:2000
#, c-format
msgid ""
"Value in Tab size -field is not in range WinMerge accepts.\n"
@@ -3284,7 +3345,7 @@
"\n"
"Por favor, utilice valores 1 - %1."
-#: Merge.rc:1998
+#: Merge.rc:2002
#, c-format
msgid ""
"Are you sure you want to reset all WinMerge options to default values?\n"
@@ -3295,129 +3356,129 @@
"\n"
"Por favor reinicie WinMerge despu\xE9s de restablecer."
-#: Merge.rc:2004
+#: Merge.rc:2008
#, c-format
msgid "Open"
msgstr "Abrir"
-#: Merge.rc:2005
+#: Merge.rc:2009
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "Programas|*.exe;*.bat;*.cmd|Todos los archivos (*.*)|*.*||"
-#: Merge.rc:2006
+#: Merge.rc:2010
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr "Todos los archivos (*.*)|*.*||"
-#: Merge.rc:2007
+#: Merge.rc:2011
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "Archivos de Proyecto de WinMerge (*.WinMerge)|*.WinMerge||"
-#: Merge.rc:2009
+#: Merge.rc:2013
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "Archivos de opciones (*.ini)|*.ini|Todos los archivos (*.*)|*.*||"
-#: Merge.rc:2015
+#: Merge.rc:2019
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr "Archivos de texto (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Todos los archivos (*.*)|*.*||"
-#: Merge.rc:2016
+#: Merge.rc:2020
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "Archivos HTML (*.htm,*.html)|*.htm;*.html|Todos los archivos (*.*)|*.*||"
-#: Merge.rc:2017
+#: Merge.rc:2021
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "Archivos XML (*.xml)|*.xml|Todos los archivos (*.*)|*.*||"
-#: Merge.rc:2023
+#: Merge.rc:2027
#, c-format
msgid "UTF-8"
msgstr "UTF-8"
-#: Merge.rc:2024
+#: Merge.rc:2028
#, c-format
msgid "UTF-8 (B)"
msgstr "UTF-8 (B)"
-#: Merge.rc:2025
+#: Merge.rc:2029
#, c-format
msgid "UCS-2 LE"
msgstr "UCS-2 LE"
-#: Merge.rc:2026
+#: Merge.rc:2030
#, c-format
msgid "UCS-2 BE"
msgstr "UCS-2 BE"
-#: Merge.rc:2032
+#: Merge.rc:2036
#, c-format
msgid "Full Contents"
msgstr "Todo el contenido"
-#: Merge.rc:2033
+#: Merge.rc:2037
#, c-format
msgid "Quick Contents"
msgstr "Contenido r\xE1pido"
-#: Merge.rc:2034
+#: Merge.rc:2038
#, c-format
msgid "Modified Date"
msgstr "Fecha de modificaci\xF3n"
-#: Merge.rc:2035
+#: Merge.rc:2039
#, c-format
msgid "Modified Date and Size"
msgstr "Fecha de modificaci\xF3n y Tama\xF1o"
-#: Merge.rc:2036
+#: Merge.rc:2040
#, c-format
msgid "Size"
msgstr "Tama\xF1o"
-#: Merge.rc:2042
-#: Merge.rc:2667
+#: Merge.rc:2046
+#: Merge.rc:2572
#, c-format
msgid "Name"
msgstr "Nombre"
-#: Merge.rc:2043
+#: Merge.rc:2047
#, c-format
msgid "Location"
msgstr "Ubicaci\xF3n"
-#: Merge.rc:2044
+#: Merge.rc:2048
#, c-format
msgid "Filters"
msgstr "Filtos"
-#: Merge.rc:2045
+#: Merge.rc:2049
#, c-format
msgid "[F] "
msgstr "[F] "
-#: Merge.rc:2046
-#: Merge.rc:2669
+#: Merge.rc:2050
+#: Merge.rc:2574
#, c-format
msgid "Description"
msgstr "Descripci\xF3n"
-#: Merge.rc:2047
+#: Merge.rc:2051
#, c-format
msgid "Select filename for new filter"
msgstr "Seleccione nombre de archivo para el nuevo filtro"
-#: Merge.rc:2048
+#: Merge.rc:2052
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "Archivo de filtros (*.flt)|*.flt|Todos los archivos(*.*)|*.*||"
-#: Merge.rc:2050
+#: Merge.rc:2054
#, c-format
msgid ""
"Cannot find file filter template file!\n"
@@ -3430,7 +3491,7 @@
"Por favor copie el archivo %1 a la carpeta WinMerge/Filters:\n"
"%2."
-#: Merge.rc:2052
+#: Merge.rc:2056
#, c-format
msgid ""
"Cannot copy filter template file to filter folder:\n"
@@ -3443,7 +3504,7 @@
"\n"
"Por favor, compruebe que la carpeta existe y que tiene permisos de escritura en ella."
-#: Merge.rc:2054
+#: Merge.rc:2058
#, c-format
msgid ""
"User's filter file folder is not defined!\n"
@@ -3454,7 +3515,7 @@
"\n"
"Por favor, seleccione la carpeta de filtros en Configuraci\xF3n/Sistema."
-#: Merge.rc:2056
+#: Merge.rc:2060
#, c-format
msgid ""
"Failed to delete the filter file:\n"
@@ -3462,17 +3523,17 @@
"\n"
"Maybe the file is read-only?"
msgstr ""
-"Error al borrar el archivo de filtros:\n"
+"Error al eliminar el archivo de filtros:\n"
"%1\n"
"\n"
"\xBFQuiza el archivo es de solo lectura?"
-#: Merge.rc:2057
+#: Merge.rc:2061
#, c-format
msgid "Locate filter file to install"
msgstr "Seleccione el archivo de filtros a instalar."
-#: Merge.rc:2059
+#: Merge.rc:2063
#, c-format
msgid ""
"Installing filter file failed.\n"
@@ -3483,218 +3544,224 @@
"\n"
"No se pudo copiar el archivo de filtros a la carpeta de filtros."
-#: Merge.rc:2061
+#: Merge.rc:2065
#, c-format
msgid "Filter file already exists. Overwrite existing filter?"
msgstr "El archivo de filtros ya existe. \xBFDesea sobreescribirlo?"
-#: Merge.rc:2067
+#: Merge.rc:2071
#, c-format
msgid "Regular expression"
msgstr "Expresi\xF3n regular"
-#: Merge.rc:2073
+#: Merge.rc:2077
#, c-format
-msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
+msgid ""
+"Filters were updated. Do you want to refresh all open folder compares?\n"
+"\n"
+"If you do not want to refresh all compares now you can select No and refresh compares later."
msgstr ""
+"Los Filtros fueron actualizados. \xBFQuiere actualizar todas comparaciones de carpetas abiertas?\n"
+"\n"
+"Si no quiere actualizar todas las comparaciones puede elegir No y actualizar las comparaciones despu\xE9s."
-#: Merge.rc:2080
+#: Merge.rc:2084
#, c-format
msgid "&Path to SS.EXE:"
-msgstr ""
+msgstr "R&uta a SS.EXE:"
-#: Merge.rc:2086
+#: Merge.rc:2090
#, c-format
msgid "Folder Comparison Results"
msgstr "Resultado de la comparaci\xF3n de carpetas"
-#: Merge.rc:2087
+#: Merge.rc:2091
#, c-format
msgid "File Comparison"
msgstr "Comparaci\xF3n de archivos"
-#: Merge.rc:2088
+#: Merge.rc:2092
#, c-format
msgid "Untitled left"
msgstr "Sin t\xEDtulo izquierda"
-#: Merge.rc:2089
+#: Merge.rc:2093
#, c-format
msgid "Untitled right"
msgstr "Sin t\xEDtulo derecha"
-#: Merge.rc:2090
+#: Merge.rc:2094
#, c-format
msgid "Theirs File"
msgstr "Archivo externo"
-#: Merge.rc:2091
+#: Merge.rc:2095
#, c-format
msgid "Mine File"
msgstr "Archivo interno"
-#: Merge.rc:2097
+#: Merge.rc:2101
#, c-format
msgid "Scanning files..."
msgstr "Escaneando archivos..."
-#: Merge.rc:2098
+#: Merge.rc:2102
#, c-format
msgid "Opening selection"
msgstr "Abriendo la selecci\xF3n"
-#: Merge.rc:2099
+#: Merge.rc:2103
#, c-format
msgid "Copying Left to Right"
msgstr "Copiando lado Izquierdo a lado Derecho"
-#: Merge.rc:2100
+#: Merge.rc:2104
#, c-format
msgid "Copying Right to Left"
msgstr "Copiando lado Derecho a lado Izquierdo"
-#: Merge.rc:2101
+#: Merge.rc:2105
#, c-format
msgid "Copying All to Left"
msgstr "Copiando todo al lado Izquierdo"
-#: Merge.rc:2102
+#: Merge.rc:2106
#, c-format
msgid "Copying All to Right"
msgstr "Copiando todo al lado Derecho"
-#: Merge.rc:2103
+#: Merge.rc:2107
#, c-format
msgid "Copying files..."
msgstr "Copiando archivos..."
-#: Merge.rc:2104
+#: Merge.rc:2108
#, c-format
msgid "Deleting files..."
msgstr "Eliminando archivos..."
-#: Merge.rc:2105
+#: Merge.rc:2109
#, c-format
msgid "Moving files..."
msgstr "Moviendo archivos..."
-#: Merge.rc:2106
+#: Merge.rc:2110
#, c-format
msgid "Creating the report..."
msgstr "Creando el informe..."
-#: Merge.rc:2107
+#: Merge.rc:2111
#, c-format
msgid "Undoing the last operation..."
-msgstr ""
+msgstr "Deshaciendo la \xFAltima operaci\xF3n..."
-#: Merge.rc:2108
+#: Merge.rc:2112
#, c-format
msgid "Redoing the previous operation..."
-msgstr ""
+msgstr "Rehaciendo la operaci\xF3n anterior..."
-#: Merge.rc:2114
+#: Merge.rc:2118
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
-#: Merge.rc:2115
+#: Merge.rc:2119
#, c-format
msgid "Line: %s"
msgstr "L\xEDnea: %s"
-#: Merge.rc:2116
+#: Merge.rc:2120
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr "Ln: %s Col: %d/%d Ch: %d/%d"
-#: Merge.rc:2117
+#: Merge.rc:2121
#, c-format
msgid "Merge"
msgstr "Combinar"
-#: Merge.rc:2118
+#: Merge.rc:2122
#, c-format
msgid "Difference %1 of %2"
msgstr "Diferencia %1 de %2"
-#: Merge.rc:2119
+#: Merge.rc:2123
#, c-format
msgid "%1 Differences Found"
msgstr "%1 Diferencias encontradas"
-#: Merge.rc:2120
+#: Merge.rc:2124
#, c-format
msgid "1 Difference Found"
msgstr "1 Diferencia encontrada"
#. Abbreviation from "Read Only"
-#: Merge.rc:2121
+#: Merge.rc:2125
#, c-format
msgid "RO"
msgstr "SL"
-#: Merge.rc:2127
+#: Merge.rc:2131
#, c-format
msgid "Item %1 of %2"
msgstr "Archivo %1 de %2"
-#: Merge.rc:2128
+#: Merge.rc:2132
#, c-format
msgid "Items: %1"
msgstr "Elementos: %1"
-#: Merge.rc:2134
+#: Merge.rc:2138
#, c-format
msgid "Select two existing folders or files to compare"
msgstr "Seleccione dos carpetas o archivos existentes a comparar"
-#: Merge.rc:2135
+#: Merge.rc:2139
#, c-format
msgid "Folder Selection"
msgstr "Selecci\xF3n de carpeta"
-#: Merge.rc:2136
+#: Merge.rc:2140
#, c-format
msgid "Select two folders or two files to compare."
msgstr "Seleccione dos carpetas o archivos a comparar."
-#: Merge.rc:2137
+#: Merge.rc:2141
#, c-format
msgid "Left path is invalid!"
msgstr "\xA1La ruta del lado Izquierdo no es v\xE1lida!"
-#: Merge.rc:2138
+#: Merge.rc:2142
#, c-format
msgid "Right path is invalid!"
msgstr "\xA1La ruta del lado Derecho no es v\xE1lida!"
-#: Merge.rc:2139
+#: Merge.rc:2143
#, c-format
msgid "Both paths are invalid!"
msgstr "\xA1Ninguna ruta es v\xE1lida!"
-#: Merge.rc:2140
+#: Merge.rc:2144
#, c-format
msgid "Choose two files to enable unpacker selection."
msgstr "Elija dos archivos para habilitar selecci\xF3n de desempaquetador."
-#: Merge.rc:2141
+#: Merge.rc:2145
#, c-format
msgid "Cannot compare file and folder!"
msgstr "\xA1Imposible comparar un archivo y una carpeta!"
-#: Merge.rc:2147
+#: Merge.rc:2151
#, c-format
msgid "File not found: %1"
msgstr "Archivo no encontrado: %1"
-#: Merge.rc:2148
+#: Merge.rc:2152
#, c-format
msgid "File not unpacked: %1"
msgstr "Archivo no desempaquetado: %1"
-#: Merge.rc:2149
+#: Merge.rc:2153
#, c-format
msgid ""
"Cannot open file\n"
@@ -3707,42 +3774,48 @@
"\n"
"%2"
-#: Merge.rc:2150
+#: Merge.rc:2154
#, c-format
msgid "Failed to parse conflict file."
msgstr "Fall\xF3 al corregir archivo conflictivo."
-#: Merge.rc:2151
+#: Merge.rc:2155
#, c-format
-msgid "The file\n%1\nis not a conflict file."
-msgstr "El archivo\n%1\nno es conflictivo."
+msgid ""
+"The file\n"
+"%1\n"
+"is not a conflict file."
+msgstr ""
+"El archivo\n"
+"%1\n"
+"no es conflictivo."
-#: Merge.rc:2157
+#: Merge.rc:2161
#, c-format
msgid "Save As"
msgstr "Guardar Como"
-#: Merge.rc:2158
+#: Merge.rc:2162
#, c-format
msgid "Save changes to %1?"
msgstr "\xBFGuardar los cambios a %1?"
-#: Merge.rc:2159
+#: Merge.rc:2163
#, c-format
msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
msgstr "%1 es de s\xF3lo lectura. Desea sobreescribirlo de modos modos ? (No salvarlo con un nuevo nombre.)"
-#: Merge.rc:2160
+#: Merge.rc:2164
#, c-format
msgid "Error checking destination writeability"
msgstr "Error comprobando la posibilidad de escritura en destino"
-#: Merge.rc:2161
+#: Merge.rc:2165
#, c-format
msgid "Error backing up file"
msgstr "Error haciendo copia de seguridad del archivo"
-#: Merge.rc:2163
+#: Merge.rc:2167
#, c-format
msgid ""
"Unable to backup original file:\n"
@@ -3755,7 +3828,7 @@
"\n"
"\xBFContinuar de todas formas?"
-#: Merge.rc:2164
+#: Merge.rc:2168
#, c-format
msgid ""
"Saving file failed.\n"
@@ -3772,7 +3845,7 @@
"\t-usar un nombre diferente (Aceptar)\n"
"\t-cancelar la operaci\xF3n (Cancelar)"
-#: Merge.rc:2165
+#: Merge.rc:2169
#, c-format
msgid ""
"Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -3787,7 +3860,7 @@
"\n"
"\xBFDesea guardar la versi\xF3n sin empaquetar en otro archivo?"
-#: Merge.rc:2166
+#: Merge.rc:2170
#, c-format
msgid ""
"Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -3802,7 +3875,7 @@
"\n"
"\xBFDesea guardar la versi\xF3n sin empaquetar en otro archivo?"
-#: Merge.rc:2167
+#: Merge.rc:2171
#, c-format
msgid ""
"Another application has updated file\n"
@@ -3817,7 +3890,7 @@
"\n"
"\xBFDesea sobreescribir el archivo cambiado?"
-#: Merge.rc:2168
+#: Merge.rc:2172
#, c-format
msgid ""
"%1\n"
@@ -3826,27 +3899,43 @@
"%1\n"
"es de s\xF3lo lectura. \xBFDesea sobreescribirlo de todos modos?"
-#: Merge.rc:2169
+#: Merge.rc:2173
#, c-format
-msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
+msgid ""
+"Another application has updated file\n"
+"%1\n"
+"since WinMerge scanned it last time.\n"
+"\n"
+"Do you want to reload the file?"
msgstr ""
+"Otra aplicaci\xF3n ha actualizado el archivo\n"
+"%1\n"
+"desde que WinMerge lo escane\xF3 por \xFAltima vez.\n"
+"\n"
+"\xBFDesea recargar el archivo?"
-#: Merge.rc:2170
+#: Merge.rc:2174
#, c-format
msgid "Save Left File As"
msgstr "Guardar lado izquierdo como"
-#: Merge.rc:2171
+#: Merge.rc:2175
#, c-format
msgid "Save Right File As"
msgstr "Guardar lado derecho como"
-#: Merge.rc:2172
+#: Merge.rc:2176
#, c-format
-msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
+msgid ""
+"The file\n"
+"%1\n"
+"has disappeared. Please save a copy of the file to continue."
msgstr ""
+"El archivo\n"
+"%1\n"
+"ha desaparecido. Por favor, guarde una copia del archivo para continuar."
-#: Merge.rc:2178
+#: Merge.rc:2182
#, c-format
msgid ""
"Cannot merge differences when documents are not in synch.\n"
@@ -3857,42 +3946,42 @@
"\n"
"Actualize los documentos antes de continuar."
-#: Merge.rc:2184
+#: Merge.rc:2188
#, c-format
msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)"
msgstr "Debe especificar la ruta del proyecto de SourceSafe para continuar (ej. $/MiProyecto)"
-#: Merge.rc:2185
+#: Merge.rc:2189
#, c-format
msgid "Checkout files from VSS..."
msgstr "Desproteger archivos de VSS..."
-#: Merge.rc:2186
+#: Merge.rc:2190
#, c-format
msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..."
msgstr "El sistema de versionado devolv\xEDo un error mientras trataba de desproteger el archivo. Imposible continuar..."
-#: Merge.rc:2187
+#: Merge.rc:2191
#, c-format
msgid "Error executing versioning system command."
msgstr "Error ejecutando el comando del sistema de versionado."
-#: Merge.rc:2188
+#: Merge.rc:2192
#, c-format
msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
msgstr "La carpeta de trabajo de VSS y la ubicaci\xF3n del archivo actual no coinciden. \xBFContinuar?"
-#: Merge.rc:2189
+#: Merge.rc:2193
#, c-format
msgid "No VSS database(s) found!"
msgstr "\xA1No se encontraron base(s) de datos de VSS!"
-#: Merge.rc:2190
+#: Merge.rc:2194
#, c-format
msgid "Error from VSS:"
msgstr "Error de VSS:"
-#: Merge.rc:2191
+#: Merge.rc:2195
#, c-format
msgid ""
"Versioning System returned an error while attempting to check in the file.\n"
@@ -3903,7 +3992,7 @@
" Por favor, compruebe la configuraci\xF3n de la vista utilizada.\n"
" \xBFDesea deshacer la desprotecci\xF3n?"
-#: Merge.rc:2192
+#: Merge.rc:2196
#, c-format
msgid ""
"Versioning System returned an error while attempting to undo checkout the file.\n"
@@ -3912,169 +4001,169 @@
"El sistema de versionado devolvi\xF3 un error cuando se intentaba deshacer la desprotecci\xF3n del archivo.\n"
" Por favor, compruebe la configuraci\xF3n de la vista utilizada. "
-#: Merge.rc:2198
-#: Merge.rc:2651
+#: Merge.rc:2202
+#: Merge.rc:2556
#, c-format
msgid "None"
msgstr "Ninguno"
-#: Merge.rc:2199
+#: Merge.rc:2203
#, c-format
msgid "Visual SourceSafe (less than 5.0)"
msgstr "Visual SourceSafe (menor que 5.0)"
-#: Merge.rc:2200
+#: Merge.rc:2204
#, c-format
msgid "Visual SourceSafe (5.0 and above)"
msgstr "Visual SourceSafe (5.0 y superior)"
-#: Merge.rc:2202
+#: Merge.rc:2206
#, c-format
msgid "Break at whitespace"
-msgstr "Parar en espacio en blanco"
+msgstr "Detener en espacio en blanco"
-#: Merge.rc:2203
+#: Merge.rc:2207
#, c-format
msgid "Break at whitespace or punctuation"
-msgstr "Parar en espacio en blanco o puntuaci\xF3n"
+msgstr "Detener en espacio en blanco o puntuaci\xF3n"
-#: Merge.rc:2209
-#: Merge.rc:2211
+#: Merge.rc:2213
+#: Merge.rc:2215
#, c-format
msgid "Copy selected item to named directory"
msgstr "Copiar elemento seleccionado a la carpeta"
-#: Merge.rc:2210
-#: Merge.rc:2212
+#: Merge.rc:2214
+#: Merge.rc:2216
#, c-format
m...
[truncated message content] |
|
From: <ki...@us...> - 2010-01-12 22:07:36
|
Revision: 7097
http://winmerge.svn.sourceforge.net/winmerge/?rev=7097&view=rev
Author: kimmov
Date: 2010-01-12 22:07:30 +0000 (Tue, 12 Jan 2010)
Log Message:
-----------
BuildScript: Update ShellExtension build folders.
Modified Paths:
--------------
trunk/Tools/Scripts/create_release.py
Modified: trunk/Tools/Scripts/create_release.py
===================================================================
--- trunk/Tools/Scripts/create_release.py 2010-01-12 21:52:21 UTC (rev 7096)
+++ trunk/Tools/Scripts/create_release.py 2010-01-12 22:07:30 UTC (rev 7097)
@@ -1,6 +1,6 @@
#
# The MIT License
-# Copyright (c) 2007-2009 Kimmo Varis
+# Copyright (c) 2007-2010 Kimmo Varis
# Copyright (c) 2008 Matthias Mayer
#
# Permission is hereby granted, free of charge, to any person obtaining
@@ -112,19 +112,19 @@
print 'Remove ANSI files'
if os.path.exists('build/mergerelease/WinMerge.exe'):
os.remove('build/mergerelease/WinMerge.exe')
- if os.path.exists('build/mergerelease/ShellExtension.dll'):
- os.remove('build/mergerelease/ShellExtension.dll')
if os.path.exists('build/mergerelease/MergeLang.dll'):
os.remove('build/mergerelease/MergeLang.dll')
print 'Remove Unicode files'
if os.path.exists('build/mergeunicoderelease/WinMergeU.exe'):
os.remove('build/mergeunicoderelease/WinMergeU.exe')
- if os.path.exists('build/mergeunicoderelease/ShellExtensionU.dll'):
- os.remove('build/mergeunicoderelease/ShellExtensionU.dll')
if os.path.exists('build/mergeunicoderelease/MergeLang.dll'):
os.remove('build/mergeunicoderelease/MergeLang.dll')
+ print 'Remove ShellExtension files'
+ if os.path.exists('build/ShellExtension'):
+ shutil.rmtree('build/ShellExtension', True)
+
print 'Remove expat files'
if os.path.exists('build/expat'):
shutil.rmtree('build/expat', True)
@@ -248,8 +248,8 @@
#print solution_path
call([vs_cmd, solution_path, '/rebuild', 'Release'], shell=True)
- print 'Build scew library...'
- solution_path = os.path.join(cur_path, 'Externals/scew/win32/scew.vcproj')
+ print 'Build SCEW library...'
+ solution_path = os.path.join(cur_path, 'Externals/scew/win32/scew.sln')
#print solution_path
call([vs_cmd, solution_path, '/rebuild', 'Release'], shell=True)
@@ -368,11 +368,11 @@
print 'Copying files to binary distribution folder...'
shutil.copy('build/mergerelease/WinMerge.exe', bin_folder)
shutil.copy('build/mergeunicoderelease/WinMergeU.exe', bin_folder)
+ shutil.copy('build/mergeunicoderelease/MergeLang.dll', bin_folder)
- shutil.copy('build/mergerelease/ShellExtension.dll', bin_folder)
- shutil.copy('build/mergeunicoderelease/ShellExtensionU.dll', bin_folder)
- shutil.copy('build/mergeunicoderelease/MergeLang.dll', bin_folder)
- shutil.copy('build/shellextensionx64/ShellExtensionX64.dll', bin_folder)
+ shutil.copy('build/ShellExtension/release mindependency/ShellExtension.dll', bin_folder)
+ shutil.copy('build/ShellExtension/unicode release mindependency/ShellExtensionU.dll', bin_folder)
+ shutil.copy('build/ShellExtension/x64 release/ShellExtensionX64.dll', bin_folder)
shutil.copy('ShellExtension/Register.bat', bin_folder)
shutil.copy('ShellExtension/UnRegister.bat', bin_folder)
@@ -471,7 +471,7 @@
environment tweaks, so it won't work (currently) from this script. And the
ShellExtension must be compiled separately.
"""
- if not os.path.exists('build/shellextensionx64/ShellExtensionX64.dll'):
+ if not os.path.exists('build/shellextension/x64 release/ShellExtensionX64.dll'):
print 'ERROR: cannot create a release:'
print 'You must compile 64-bit ShellExtension (ShellExtensionX64.dll)'
print 'before running this script!'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-01-12 21:52:27
|
Revision: 7096
http://winmerge.svn.sourceforge.net/winmerge/?rev=7096&view=rev
Author: kimmov
Date: 2010-01-12 21:52:21 +0000 (Tue, 12 Jan 2010)
Log Message:
-----------
Update ShellExtension build folders to WiX installer.
Modified Paths:
--------------
trunk/Installer/WiX/Config.wxi
trunk/Installer/WiX/Fragments/Core.wxs
Modified: trunk/Installer/WiX/Config.wxi
===================================================================
--- trunk/Installer/WiX/Config.wxi 2010-01-12 21:45:51 UTC (rev 7095)
+++ trunk/Installer/WiX/Config.wxi 2010-01-12 21:52:21 UTC (rev 7096)
@@ -22,6 +22,7 @@
<?define MergeBuildDir = "..\..\Build\x64\MergeRelease" ?>
<?define ExpatBuildDir = "..\..\Build\expat\lib\x64\Release" ?>
<?define PcreBuildDir = "..\..\Build\pcre\lib\x64\Release" ?>
+ <?define ShellExtBuildDir = "..\..\Build\ShellExtension\x64 release" ?>
<?define StartMenuShortcutsGuid = "CDC49AA0-DC37-439d-8358-68E2EA9EF909" ?>
<?define DesktopShortcutGuid = "CFF6BDA0-483F-496e-819F-0FC8874C2B9C" ?>
@@ -37,6 +38,7 @@
<?define MergeBuildDir = "..\..\Build\MergeUnicodeRelease" ?>
<?define ExpatBuildDir = "..\..\Build\expat" ?>
<?define PcreBuildDir = "..\..\Build\pcre" ?>
+ <?define ShellExtBuildDir = "..\..\Build\ShellExtension\unicode release mindependency" ?>
<?define StartMenuShortcutsGuid = "12413436-9929-453c-870B-03146CE11960" ?>
<?define DesktopShortcutGuid = "36035411-C6BE-43e8-B569-B1EC325D180C" ?>
Modified: trunk/Installer/WiX/Fragments/Core.wxs
===================================================================
--- trunk/Installer/WiX/Fragments/Core.wxs 2010-01-12 21:45:51 UTC (rev 7095)
+++ trunk/Installer/WiX/Fragments/Core.wxs 2010-01-12 21:52:21 UTC (rev 7096)
@@ -53,13 +53,13 @@
<File Id="ShellExtensionX64DLL"
Name="ShellExtensionX64.dll"
SelfRegCost="1"
- Source="..\..\Build\ShellExtensionX64\ShellExtensionX64.dll"
+ Source="$(var.ShellExtBuildDir)\ShellExtensionX64.dll"
Vital="yes" />
<?else ?>
<File Id="ShellExtensionUDLL"
Name="ShellExtensionU.dll"
SelfRegCost="1"
- Source="$(var.MergeBuildDir)\ShellExtensionU.dll"
+ Source="$(var.ShellExtBuildDir)\ShellExtensionU.dll"
Vital="yes" />
<?endif ?>
</Component>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-01-12 21:45:59
|
Revision: 7095
http://winmerge.svn.sourceforge.net/winmerge/?rev=7095&view=rev
Author: kimmov
Date: 2010-01-12 21:45:51 +0000 (Tue, 12 Jan 2010)
Log Message:
-----------
Update new ShellExtension build folders to InnoSetup installer.
Modified Paths:
--------------
trunk/Installer/InnoSetup/WinMerge.iss
Modified: trunk/Installer/InnoSetup/WinMerge.iss
===================================================================
--- trunk/Installer/InnoSetup/WinMerge.iss 2010-01-12 20:39:43 UTC (rev 7094)
+++ trunk/Installer/InnoSetup/WinMerge.iss 2010-01-12 21:45:51 UTC (rev 7095)
@@ -375,10 +375,10 @@
Source: {#Runtime_MFC_Manifest}; DestDir: {sys}; Flags: restartreplace uninsneveruninstall sharedfile; Components: Core
; Shell extension
-Source: ..\..\Build\MergeRelease\ShellExtension.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder; MinVersion: 4, 0; Check: not IsWin64
-Source: ..\..\Build\MergeUnicodeRelease\ShellExtensionU.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder; MinVersion: 0, 4; Check: not IsWin64
+Source: ..\..\Build\ShellExtension\release mindependency\ShellExtension.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder; MinVersion: 4, 0; Check: not IsWin64
+Source: ..\..\Build\ShellExtension\unicode release mindependency\ShellExtensionU.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder; MinVersion: 0, 4; Check: not IsWin64
; 64-bit version of ShellExtension
-Source: ..\..\Build\ShellExtensionX64\ShellExtensionX64.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder 64bit; MinVersion: 0,5.01.2600; Check: IsWin64
+Source: ..\..\Build\ShellExtension\x64 release\ShellExtensionX64.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder 64bit; MinVersion: 0,5.01.2600; Check: IsWin64
; Expat dll
Source: ..\..\Build\expat\libexpat.dll; DestDir: {app}; Flags: promptifolder; Components: Core
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2010-01-12 20:39:52
|
Revision: 7094
http://winmerge.svn.sourceforge.net/winmerge/?rev=7094&view=rev
Author: kimmov
Date: 2010-01-12 20:39:43 +0000 (Tue, 12 Jan 2010)
Log Message:
-----------
Continue fixing ShellExtension build folders.
Modified Paths:
--------------
trunk/ShellExtension/ShellExtension.vcproj
Modified: trunk/ShellExtension/ShellExtension.vcproj
===================================================================
--- trunk/ShellExtension/ShellExtension.vcproj 2010-01-11 21:17:08 UTC (rev 7093)
+++ trunk/ShellExtension/ShellExtension.vcproj 2010-01-12 20:39:43 UTC (rev 7094)
@@ -19,8 +19,8 @@
<Configurations>
<Configuration
Name="Unicode Debug|Win32"
- OutputDirectory=".\..\BuildTmp\ShellExtension__UnicodeDebug"
- IntermediateDirectory=".\..\BuildTmp\ShellExtension__UnicodeDebug"
+ OutputDirectory="..\Build\ShellExtension\$(ConfigurationName)"
+ IntermediateDirectory="..\BuildTmp\ShellExtension\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -44,7 +44,7 @@
/>
<Tool
Name="VCMIDLTool"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtension.tlb"
+ TypeLibraryName="$(IntDir)\ShellExtension.tlb"
HeaderFileName=""
/>
<Tool
@@ -55,10 +55,10 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtension.pch"
- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeDebug/"
- ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/"
- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeDebug/"
+ PrecompiledHeaderFile="$(IntDir)\ShellExtension.pch"
+ AssemblerListingLocation="$(IntDir)\"
+ ObjectFile="$(IntDir)\"
+ ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="4"
@@ -77,14 +77,14 @@
/>
<Tool
Name="VCLinkerTool"
- OutputFile="..\Build\MergeUnicodeDebug\ShellExtensionU.dll"
+ OutputFile="$(OutDir)\ShellExtensionU.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
ModuleDefinitionFile=".\ShellExtensionU.def"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtensionU.pdb"
SubSystem="2"
- ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeDebug/ShellExtensionU.lib"
+ ImportLibrary="$(OutDir)\ShellExtensionU.lib"
TargetMachine="1"
/>
<Tool
@@ -210,8 +210,8 @@
</Configuration>
<Configuration
Name="Unicode Release MinSize|Win32"
- OutputDirectory=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize"
- IntermediateDirectory=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize"
+ OutputDirectory="..\Build\ShellExtension\$(ConfigurationName)"
+ IntermediateDirectory="..\BuildTmp\ShellExtension\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -233,7 +233,7 @@
/>
<Tool
Name="VCMIDLTool"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtension.tlb"
+ TypeLibraryName="$(IntDir)\ShellExtension.tlb"
HeaderFileName=""
/>
<Tool
@@ -246,10 +246,10 @@
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtension.pch"
- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/"
- ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/"
- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/"
+ PrecompiledHeaderFile="$(IntDir)\ShellExtension.pch"
+ AssemblerListingLocation="$(IntDir)\"
+ ObjectFile="$(IntDir)\"
+ ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
SuppressStartupBanner="true"
CompileAs="0"
@@ -267,13 +267,13 @@
/>
<Tool
Name="VCLinkerTool"
- OutputFile="..\Build\MergeUnicodeRelease\ShellExtensionU.dll"
+ OutputFile="$(OutDir)\ShellExtensionU.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
ModuleDefinitionFile=".\ShellExtensionU.def"
- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtensionU.pdb"
+ ProgramDatabaseFile="$(IntDir)\ShellExtensionU.pdb"
SubSystem="2"
- ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinsize/ShellExtensionU.lib"
+ ImportLibrary="$(OutDir)\ShellExtensionU.lib"
TargetMachine="1"
/>
<Tool
@@ -397,8 +397,8 @@
</Configuration>
<Configuration
Name="Unicode Release MinDependency|Win32"
- OutputDirectory=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency"
- IntermediateDirectory=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency"
+ OutputDirectory="..\Build\ShellExtension\$(ConfigurationName)"
+ IntermediateDirectory="..\BuildTmp\ShellExtension\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -420,7 +420,7 @@
/>
<Tool
Name="VCMIDLTool"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.tlb"
+ TypeLibraryName="$(IntDir)\ShellExtension.tlb"
HeaderFileName=""
/>
<Tool
@@ -433,10 +433,10 @@
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtension.pch"
- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"
- ObjectFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"
- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/"
+ PrecompiledHeaderFile="$(IntDir)\ShellExtension.pch"
+ AssemblerListingLocation="$(IntDir)\"
+ ObjectFile="$(IntDir)\"
+ ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
SuppressStartupBanner="true"
CompileAs="0"
@@ -454,13 +454,13 @@
/>
<Tool
Name="VCLinkerTool"
- OutputFile="..\Build\MergeUnicodeRelease\ShellExtensionU.dll"
+ OutputFile="$(OutDir)\ShellExtensionU.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
ModuleDefinitionFile=".\ShellExtensionU.def"
- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtensionU.pdb"
+ ProgramDatabaseFile="$(IntDir)\ShellExtensionU.pdb"
SubSystem="2"
- ImportLibrary=".\..\BuildTmp\ShellExtension__UnicodeReleaseMinDependency/ShellExtensionU.lib"
+ ImportLibrary="$(OutDir)\ShellExtensionU.lib"
TargetMachine="1"
/>
<Tool
@@ -584,8 +584,8 @@
</Configuration>
<Configuration
Name="Release MinDependency|Win32"
- OutputDirectory=".\..\BuildTmp\ShellExtension__ReleaseMinDependency"
- IntermediateDirectory=".\..\BuildTmp\ShellExtension__ReleaseMinDependency"
+ OutputDirectory="..\Build\ShellExtension\$(ConfigurationName)"
+ IntermediateDirectory="..\BuildTmp\ShellExtension\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -607,7 +607,7 @@
/>
<Tool
Name="VCMIDLTool"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.tlb"
+ TypeLibraryName="$(IntDir)\ShellExtension.tlb"
HeaderFileName=""
/>
<Tool
@@ -621,10 +621,10 @@
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.pch"
- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"
- ObjectFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"
- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/"
+ PrecompiledHeaderFile="$(IntDir)\ShellExtension.pch"
+ AssemblerListingLocation="$(IntDir)\"
+ ObjectFile="$(IntDir)\"
+ ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
SuppressStartupBanner="true"
CompileAs="0"
@@ -642,13 +642,13 @@
/>
<Tool
Name="VCLinkerTool"
- OutputFile="..\Build\MergeRelease\ShellExtension.dll"
+ OutputFile="$(OutDir)\ShellExtension.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
ModuleDefinitionFile=".\ShellExtension.def"
- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.pdb"
+ ProgramDatabaseFile="$(IntDir)\ShellExtension.pdb"
SubSystem="2"
- ImportLibrary=".\..\BuildTmp\ShellExtension__ReleaseMinDependency/ShellExtension.lib"
+ ImportLibrary="$(OutDir)\/ShellExtension.lib"
TargetMachine="1"
/>
<Tool
@@ -773,8 +773,8 @@
</Configuration>
<Configuration
Name="Release MinSize|Win32"
- OutputDirectory=".\..\BuildTmp\ShellExtension__ReleaseMinSize"
- IntermediateDirectory=".\..\BuildTmp\ShellExtension__ReleaseMinSize"
+ OutputDirectory="..\Build\ShellExtension\$(ConfigurationName)"
+ IntermediateDirectory="..\BuildTmp\ShellExtension\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -796,7 +796,7 @@
/>
<Tool
Name="VCMIDLTool"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.tlb"
+ TypeLibraryName="$(IntDir)\ShellExtension.tlb"
HeaderFileName=""
/>
<Tool
@@ -810,10 +810,10 @@
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.pch"
- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"
- ObjectFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"
- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__ReleaseMinSize/"
+ PrecompiledHeaderFile="$(IntDir)\ShellExtension.pch"
+ AssemblerListingLocation="$(IntDir)\"
+ ObjectFile="$(IntDir)\"
+ ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
SuppressStartupBanner="true"
CompileAs="0"
@@ -831,13 +831,13 @@
/>
<Tool
Name="VCLinkerTool"
- OutputFile="..\Build\MergeRelease\ShellExtension.dll"
+ OutputFile="$(OutDir)\ShellExtension.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
ModuleDefinitionFile=".\ShellExtension.def"
- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.pdb"
+ ProgramDatabaseFile="$(IntDir)\ShellExtension.pdb"
SubSystem="2"
- ImportLibrary=".\..\BuildTmp\ShellExtension__ReleaseMinSize/ShellExtension.lib"
+ ImportLibrary="$(OutDir)\ShellExtension.lib"
TargetMachine="1"
/>
<Tool
@@ -962,8 +962,8 @@
</Configuration>
<Configuration
Name="Debug|Win32"
- OutputDirectory=".\..\BuildTmp\ShellExtension__Debug"
- IntermediateDirectory=".\..\BuildTmp\ShellExtension__Debug"
+ OutputDirectory="..\Build\ShellExtension\$(ConfigurationName)"
+ IntermediateDirectory="..\BuildTmp\ShellExtension\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -987,7 +987,7 @@
/>
<Tool
Name="VCMIDLTool"
- TypeLibraryName=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.tlb"
+ TypeLibraryName="$(IntDir)\ShellExtension.tlb"
HeaderFileName=""
/>
<Tool
@@ -998,10 +998,10 @@
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.pch"
- AssemblerListingLocation=".\..\BuildTmp\ShellExtension__Debug/"
- ObjectFile=".\..\BuildTmp\ShellExtension__Debug/"
- ProgramDataBaseFileName=".\..\BuildTmp\ShellExtension__Debug/"
+ PrecompiledHeaderFile="$(IntDir)\ShellExtension.pch"
+ AssemblerListingLocation="$(IntDir)\"
+ ObjectFile="$(IntDir)\"
+ ProgramDataBaseFileName="$(IntDir)\"
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="4"
@@ -1020,14 +1020,14 @@
/>
<Tool
Name="VCLinkerTool"
- OutputFile="..\Build\MergeDebug\ShellExtension.dll"
+ OutputFile="$(OutDir)\ShellExtension.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
ModuleDefinitionFile=".\ShellExtension.def"
GenerateDebugInformation="true"
- ProgramDatabaseFile=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.pdb"
+ ProgramDatabaseFile="$(IntDir)\ShellExtension.pdb"
SubSystem="2"
- ImportLibrary=".\..\BuildTmp\ShellExtension__Debug/ShellExtension.lib"
+ ImportLibrary="$(IntDir)\ShellExtension.lib"
TargetMachine="1"
/>
<Tool
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
