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...> - 2009-09-21 07:43:26
|
Revision: 6992
http://winmerge.svn.sourceforge.net/winmerge/?rev=6992&view=rev
Author: gerundt
Date: 2009-09-21 07:43:18 +0000 (Mon, 21 Sep 2009)
Log Message:
-----------
Fix Content-Type charset in Slovenian PO file
Modified Paths:
--------------
trunk/Translations/WinMerge/Slovenian.po
Modified: trunk/Translations/WinMerge/Slovenian.po
===================================================================
--- trunk/Translations/WinMerge/Slovenian.po 2009-09-17 05:57:02 UTC (rev 6991)
+++ trunk/Translations/WinMerge/Slovenian.po 2009-09-21 07:43:18 UTC (rev 6992)
@@ -18,7 +18,7 @@
"Last-Translator: Iztok Osredkar <izt...@in...>\n"
"Language-Team: Slovenian <win...@li...>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-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: <ge...@us...> - 2009-09-17 05:57:12
|
Revision: 6991
http://winmerge.svn.sourceforge.net/winmerge/?rev=6991&view=rev
Author: gerundt
Date: 2009-09-17 05:57:02 +0000 (Thu, 17 Sep 2009)
Log Message:
-----------
PATCH: [ 2858673 ] Polish udpate (trunk)
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Translations/WinMerge/Polish.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2009-09-16 18:08:46 UTC (rev 6990)
+++ trunk/Docs/Users/ChangeLog.txt 2009-09-17 05:57:02 UTC (rev 6991)
@@ -23,6 +23,7 @@
- Dutch (#2801690, #2804979, #2828310)
- French (#2850842)
- German (r6942)
+ - Polish (#2858673)
- Swedish (#2805726, #2845755)
- Turkish (#2825130, #2825132, #2827820)
- Ukrainian (#2817835)
Modified: trunk/Translations/WinMerge/Polish.po
===================================================================
--- trunk/Translations/WinMerge/Polish.po 2009-09-16 18:08:46 UTC (rev 6990)
+++ trunk/Translations/WinMerge/Polish.po 2009-09-17 05:57:02 UTC (rev 6991)
@@ -13,8 +13,8 @@
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: 2009-03-27 17:37+0100\n"
+"POT-Creation-Date: 2009-07-23 18:36+0000\n"
+"PO-Revision-Date: 2009-09-11 17:14+0100\n"
"Last-Translator: Micha\xB3 Trzebiatowski <hip...@ho...>\n"
"Language-Team: Polish <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -400,7 +400,7 @@
#: Merge.rc:178
#: Merge.rc:299
#: Merge.rc:487
-#: Merge.rc:1947
+#: Merge.rc:1948
#, c-format
msgid "&Help"
msgstr "&Pomoc"
@@ -731,7 +731,7 @@
msgstr "&Skrypty"
#: Merge.rc:373
-#: Merge.rc:2803
+#: Merge.rc:2807
#, c-format
msgid "< Empty >"
msgstr "< pusty >"
@@ -934,14 +934,14 @@
#: Merge.rc:526
#: Merge.rc:1147
-#: Merge.rc:1531
+#: Merge.rc:1514
#, c-format
msgid "&Left"
msgstr "&Lewa"
#: Merge.rc:527
#: Merge.rc:1149
-#: Merge.rc:1534
+#: Merge.rc:1517
#, c-format
msgid "&Right"
msgstr "&Prawa"
@@ -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 "OK"
@@ -1119,7 +1119,7 @@
msgstr "Wybierz pliki lub katalogi..."
#: Merge.rc:690
-#: Merge.rc:1608
+#: Merge.rc:1591
#, c-format
msgid "&Left:"
msgstr "&Lewa:"
@@ -1133,7 +1133,7 @@
msgstr "&Szukaj..."
#: Merge.rc:695
-#: Merge.rc:1612
+#: Merge.rc:1595
#, c-format
msgid "&Right:"
msgstr "&Prawa:"
@@ -1145,13 +1145,13 @@
msgstr "&Przegl\xB9daj..."
#: Merge.rc:700
-#: Merge.rc:1616
+#: Merge.rc:1599
#, c-format
msgid "&Filter:"
msgstr "&Filtr:"
#: Merge.rc:703
-#: Merge.rc:1618
+#: Merge.rc:1601
#, c-format
msgid "Select..."
msgstr "Wybierz..."
@@ -1167,7 +1167,7 @@
msgstr "&Wybierz..."
#: Merge.rc:708
-#: Merge.rc:1619
+#: Merge.rc:1602
#, c-format
msgid "&Include Subfolders"
msgstr "&Uwzgl\xEAdnij podfoldery"
@@ -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 "Anuluj"
#: Merge.rc:713
-#: Merge.rc:1352
+#: Merge.rc:1335
#, c-format
msgid "Help"
msgstr "Pomoc"
@@ -1265,13 +1265,14 @@
msgstr "\x8Cledzenie &wersji:"
#: Merge.rc:753
-#: Merge.rc:2079
+#: Merge.rc:2083
#, c-format
msgid "&Path to cleartool.exe:"
msgstr "S&cie\xBFka cleartool.exe:"
#: Merge.rc:760
-#: Merge.rc:1955
+#: Merge.rc:1956
+#: Merge.rc:1969
#, c-format
msgid "General"
msgstr "Og\xF3lne"
@@ -1327,13 +1328,13 @@
msgstr "W\xB3\xB9cz wiele okien por\xF3wnania dla"
#: Merge.rc:787
-#: Merge.rc:1631
+#: Merge.rc:1614
#, c-format
msgid "&Folder compare"
msgstr "Por\xF3wnania &folder\xF3w"
#: Merge.rc:789
-#: Merge.rc:1633
+#: Merge.rc:1616
#, c-format
msgid "Fil&e compare"
msgstr "Por\xF3wnania &plik\xF3w"
@@ -1454,7 +1455,7 @@
msgstr "&Wszystkie"
#: Merge.rc:872
-#: Merge.rc:2201
+#: Merge.rc:2205
#, c-format
msgid "Rational ClearCase"
msgstr "Racjonalne dopasowanie wielko\x9Cci"
@@ -1465,7 +1466,7 @@
msgstr "Sprawd\x9F"
#: Merge.rc:880
-#: Merge.rc:1191
+#: Merge.rc:1175
#, c-format
msgid "Comments"
msgstr "Komentarze"
@@ -1511,7 +1512,7 @@
msgstr "Usu\xF1"
#: Merge.rc:910
-#: Merge.rc:1958
+#: Merge.rc:1959
#, c-format
msgid "Colors"
msgstr "Kolory"
@@ -1527,7 +1528,7 @@
msgstr "Wybrana r\xF3\xBFnica:"
#: Merge.rc:921
-#: Merge.rc:1583
+#: Merge.rc:1566
#, c-format
msgid "Background"
msgstr "T\xB3o"
@@ -1538,8 +1539,9 @@
msgstr "Usuni\xEAte"
#: Merge.rc:935
-#: Merge.rc:1378
-#: Merge.rc:1584
+#: Merge.rc:1361
+#: Merge.rc:1567
+#: Merge.rc:1960
#, c-format
msgid "Text"
msgstr "Tekst"
@@ -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 "Domy\x9Clne"
#: Merge.rc:992
-#: Merge.rc:1366
-#: Merge.rc:1572
+#: Merge.rc:1349
+#: Merge.rc:1555
#, c-format
msgid "Dialog"
msgstr "Okno dialogowe"
#: Merge.rc:1002
-#: Merge.rc:1961
+#: Merge.rc:1962
#, c-format
msgid "System"
msgstr "System"
@@ -1763,7 +1766,7 @@
msgstr "Post\xEAp por\xF3wnania folder\xF3w"
#: Merge.rc:1128
-#: Merge.rc:1908
+#: Merge.rc:1909
#, c-format
msgid "Stop"
msgstr "Zatrzymaj"
@@ -1819,7 +1822,7 @@
msgstr "&Id\x9F do"
#: Merge.rc:1162
-#: Merge.rc:1956
+#: Merge.rc:1957
#, c-format
msgid "Compare"
msgstr "Por\xF3wnaj"
@@ -1834,215 +1837,200 @@
msgid "&Compare"
msgstr "&Por\xF3wnaj"
-#: Merge.rc:1168
+#: Merge.rc:1167
#, c-format
msgid "&Ignore change"
msgstr "Ignoruj &zmiany"
-#: Merge.rc:1170
+#: Merge.rc:1168
#, c-format
msgid "I&gnore all"
msgstr "Ignoruj &wszystkie"
-#: Merge.rc:1172
+#: Merge.rc:1169
#, c-format
msgid "Ignore blan&k lines"
msgstr "Ignoruj r\xF3\xBFnice pustych linii"
-#: Merge.rc:1174
+#: Merge.rc:1170
#, c-format
msgid "Ignore &case"
msgstr "Ignoruj r\xF3\xBFnice wielko\x9Cci liter"
-#: Merge.rc:1176
+#: Merge.rc:1171
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
msgstr "Ignoruj r\xF3\xBFnice ko\xF1ca wiersza (Windows/Unix/Mac)"
-#: Merge.rc:1179
+#: Merge.rc:1173
#, c-format
msgid "E&nable moved block detection"
msgstr "W\xB3\xB9cz &wykrywanie przeniesionych blok\xF3w"
-#: Merge.rc:1181
+#: Merge.rc:1174
#, c-format
msgid "&Match similar lines"
msgstr "Dopasuj takie same linie"
-#: Merge.rc:1183
+#: Merge.rc:1176
#, c-format
-msgid "Ign&ore time differences less than 3 seconds"
-msgstr "Ignoruj r\xF3\xBFnice czasu mniejsze ni\xBF 3 sekundy"
-
-#: Merge.rc:1186
-#, c-format
-msgid "&File Compare method:"
-msgstr "&Metoda por\xF3wnania plik\xF3w:"
-
-#: Merge.rc:1189
-#, c-format
-msgid "S&top after first difference"
-msgstr "&Zatrzymaj po pierwszej r\xF3\xBFnicy"
-
-#: Merge.rc:1192
-#, c-format
msgid "Filter Comments"
msgstr "Komentarze filtra"
-#: Merge.rc:1199
-#: Merge.rc:1957
+#: Merge.rc:1182
+#: Merge.rc:1958
#, c-format
msgid "Editor"
msgstr "Edytor"
-#: Merge.rc:1202
+#: Merge.rc:1185
#, c-format
msgid "&Highlight syntax"
msgstr "Pod\x9Cwietlaj sk\xB3adni\xEA"
-#: Merge.rc:1204
+#: Merge.rc:1187
#, c-format
msgid "&Automatic rescan"
msgstr "Automatyczne &skanowanie"
-#: Merge.rc:1206
+#: Merge.rc:1189
#, c-format
msgid "&Preserve original EOL chars"
msgstr "Zapisz &oryginalne znaki ko\xF1ca linii"
-#: Merge.rc:1208
+#: Merge.rc:1191
#, c-format
msgid "Tabs"
msgstr "Tabulatory"
-#: Merge.rc:1209
+#: Merge.rc:1192
#, c-format
msgid "&Tab size:"
msgstr "&Rozmiar tabulatora:"
-#: Merge.rc:1212
+#: Merge.rc:1195
#, c-format
msgid "&Insert Tabs"
msgstr "Wstawiaj tabulatory"
-#: Merge.rc:1214
+#: Merge.rc:1197
#, c-format
msgid "Insert &Spaces"
msgstr "Wstawiaj spacje"
-#: Merge.rc:1216
+#: Merge.rc:1199
#, c-format
msgid "Line Difference Coloring"
msgstr "Kolorowanie r\xF3\xBFnic linii"
-#: Merge.rc:1218
+#: Merge.rc:1201
#, c-format
msgid "View line differences"
msgstr "Poka\xBF r\xF3\xBFnice linii"
-#: Merge.rc:1220
+#: Merge.rc:1203
#, c-format
msgid "&Character level"
msgstr "Poziom &znak\xF3w"
-#: Merge.rc:1222
+#: Merge.rc:1205
#, c-format
msgid "&Word-level:"
msgstr "Poziom &s\xB3\xF3w:"
-#: Merge.rc:1226
+#: Merge.rc:1209
#, c-format
msgid "W&ord break characters:"
msgstr "S\xB3&owo \xB3amie znaki:"
-#: Merge.rc:1239
+#: Merge.rc:1222
#, c-format
msgid "Filefilters"
msgstr "Filtry plik\xF3w"
-#: Merge.rc:1245
+#: Merge.rc:1228
#, c-format
msgid "Test"
msgstr "Testuj"
-#: Merge.rc:1246
+#: Merge.rc:1229
#, c-format
msgid "Install..."
msgstr "Instaluj..."
-#: Merge.rc:1247
+#: Merge.rc:1230
#, c-format
msgid "New..."
msgstr "Nowy..."
-#: Merge.rc:1248
+#: Merge.rc:1231
#, c-format
msgid "Edit..."
msgstr "Edycja..."
-#: Merge.rc:1249
+#: Merge.rc:1232
#, c-format
msgid "Delete..."
msgstr "Usu\xF1..."
-#: Merge.rc:1255
+#: Merge.rc:1238
#, c-format
msgid "Save modified files?"
msgstr "Zapisz zmodyfikowane pliki?"
-#: Merge.rc:1258
+#: Merge.rc:1241
#, c-format
msgid "Left side file"
msgstr "Plik z lewej"
-#: Merge.rc:1261
+#: Merge.rc:1244
#, c-format
msgid "&Save changes"
msgstr "&Zapisz zmiany"
-#: Merge.rc:1263
+#: Merge.rc:1246
#, c-format
msgid "&Discard changes"
msgstr "&Odrzu\xE6 zmiany"
-#: Merge.rc:1265
+#: Merge.rc:1248
#, c-format
msgid "Right side file"
msgstr "Plik z prawej"
-#: Merge.rc:1268
+#: Merge.rc:1251
#, c-format
msgid "S&ave changes"
msgstr "Zachowa&j zmiany"
-#: Merge.rc:1270
+#: Merge.rc:1253
#, c-format
msgid "Dis&card changes"
msgstr "Odr&zu\xE6 zmiany"
-#: Merge.rc:1272
+#: Merge.rc:1255
#, c-format
msgid "Disca&rd All"
msgstr "Odrzu\xE6 &wszystkie"
-#: Merge.rc:1279
-#: Merge.rc:1527
-#: Merge.rc:1963
+#: Merge.rc:1262
+#: Merge.rc:1510
+#: Merge.rc:1964
#, c-format
msgid "Codepage"
msgstr "Strona kodowa"
-#: Merge.rc:1282
+#: Merge.rc:1265
#, c-format
msgid "Default Codepage"
msgstr "Domy\x9Clna strona kodowa"
-#: Merge.rc:1283
+#: Merge.rc:1266
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr "Wybierz domy\x9Clne kodowanie dla otwieranych plik\xF3w nie b\xEAd\xB9cych plikami Unicode:"
-#: Merge.rc:1285
+#: Merge.rc:1268
#, c-format
msgid ""
"Detect codepage info for these files: .html, .rc, .xml \n"
@@ -2051,32 +2039,32 @@
"Wykrywaj ston\xEA kodow\xB9 dla plik\xF3w: .html, .rc, .xml \n"
"konieczny restart sesji"
-#: Merge.rc:1288
+#: Merge.rc:1271
#, c-format
msgid "System codepage"
msgstr "Strona kodowa systemu"
-#: Merge.rc:1290
+#: Merge.rc:1273
#, c-format
msgid "According to WinMerge User Interface"
msgstr "Wed\xB3ug interfejsu WinMerge"
-#: Merge.rc:1292
+#: Merge.rc:1275
#, c-format
msgid "Custom codepage:"
msgstr "Inna strona kodowa:"
-#: Merge.rc:1300
+#: Merge.rc:1283
#, c-format
msgid "WinMerge - Archive support disabled"
msgstr "WinMerge \x96 obs\xB3uga archiw\xF3w wy\xB3\xB9czona"
-#: Merge.rc:1303
+#: Merge.rc:1286
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
msgstr "Nie mo\xBFna wykry\xE6 wersji 7-Zip (nie jest zainstalowany?)"
-#: 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"
@@ -2085,12 +2073,12 @@
"Obs\xB3uga archiw\xF3w wymaga programu 7-Zip w wersji 3.11 lub p\xF3\x9Fniejszej lub skopiowania\n"
"zasadniczych jego komponent\xF3w do katalogu programu."
-#: Merge.rc:1308
+#: Merge.rc:1291
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
msgstr "W tym katalogu musi si\xEA znajdowa\xE6 tak\xBFe odpowiednia wtyczka interfejsu (Merge7z*.dll)."
-#: Merge.rc:1310
+#: Merge.rc:1293
#, c-format
msgid ""
"Please use the version of 7-Zip recommended below until interface plugins for later\n"
@@ -2099,12 +2087,12 @@
"Skorzystaj z zalecanej poni\xBFej wersji 7-Zip, p\xF3ki nie b\xEAd\xB9 dost\xEApne wtyczki dla\n"
"p\xF3\x9Fniejszych wersji."
-#: Merge.rc:1312
+#: Merge.rc:1295
#, c-format
msgid "Version"
msgstr "Wersja"
-#: Merge.rc:1314
+#: Merge.rc:1297
#, c-format
msgid ""
"Plugin required\n"
@@ -2113,54 +2101,54 @@
"Wymagana wtyczka\n"
"(dllbuild %04u)"
-#: Merge.rc:1316
+#: Merge.rc:1299
#, c-format
msgid "Recommended version of 7-Zip:"
msgstr "Zalecana wersja 7-Zip:"
-#: Merge.rc:1319
-#: Merge.rc:1322
+#: Merge.rc:1302
+#: Merge.rc:1305
#, c-format
msgid "present"
msgstr "obecna"
-#: 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 "Program 7-Zip zainstalowany w systemie:"
-#: Merge.rc:1325
-#: Merge.rc:1330
+#: Merge.rc:1308
+#: Merge.rc:1313
#, c-format
msgid "none"
msgstr "brak"
-#: Merge.rc:1327
+#: Merge.rc:1310
#, c-format
msgid "missing"
msgstr "brak"
-#: Merge.rc:1328
+#: Merge.rc:1311
#, c-format
msgid "7-Zip components for standalone operation:"
msgstr "Komponenty 7-Zip dla wersji autonomicznej:"
-#: Merge.rc:1332
+#: Merge.rc:1315
#, c-format
msgid "outdated"
msgstr "przestarza\xB3a"
-#: Merge.rc:1333
+#: Merge.rc:1316
#, c-format
msgid "Plugins on path:"
msgstr "Wtyczki na \x9Ccie\xBFce:"
-#: Merge.rc:1334
+#: Merge.rc:1317
#, c-format
msgid ""
"Don't display this &message again.\n"
@@ -2169,535 +2157,567 @@
"Nie wy\x9Cwietlaj tej wiadomo\x9Cci ponownie.\n"
"(Mo\xBFna przywr\xF3ci\xE6 wy\x9Cwietlanie tych opcji z menu Pomoc.)"
-#: Merge.rc:1338
+#: Merge.rc:1321
#, c-format
msgid "Plugin Download"
msgstr "Pobieranie wtyczek"
-#: Merge.rc:1347
+#: Merge.rc:1330
#, c-format
msgid "Options"
msgstr "Opcje"
-#: Merge.rc:1358
+#: Merge.rc:1341
#, c-format
msgid " Categories"
msgstr " Kategorie"
-#: Merge.rc:1360
+#: Merge.rc:1343
#, c-format
msgid "Import..."
msgstr "Importuj"
-#: Merge.rc:1361
+#: Merge.rc:1344
#, c-format
msgid "Export..."
msgstr "Eksportuj"
-#: Merge.rc:1369
+#: Merge.rc:1352
#, c-format
msgid "Keywords:"
msgstr "S\xB3owa kluczowe:"
-#: Merge.rc:1370
+#: Merge.rc:1353
#, c-format
msgid "Function names:"
msgstr "Nazwy funkcji:"
-#: Merge.rc:1371
+#: Merge.rc:1354
#, c-format
msgid "Comments:"
msgstr "Komentarze:"
-#: Merge.rc:1372
+#: Merge.rc:1355
#, c-format
msgid "Numbers:"
msgstr "Liczby:"
-#: Merge.rc:1373
+#: Merge.rc:1356
#, c-format
msgid "Operators:"
msgstr "Operatory:"
-#: Merge.rc:1374
+#: Merge.rc:1357
#, c-format
msgid "Strings:"
msgstr "S\xB3owa:"
-#: Merge.rc:1375
+#: Merge.rc:1358
#, c-format
msgid "Preprocessor:"
msgstr "Preprocesor:"
-#: Merge.rc:1376
+#: Merge.rc:1359
#, c-format
msgid "User 1:"
msgstr "U\xBFytkownika 1:"
-#: Merge.rc:1377
+#: Merge.rc:1360
#, c-format
msgid "User 2:"
msgstr "U\xBFytkownika 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 "Pogrubienie"
-#: Merge.rc:1430
+#: Merge.rc:1413
#, c-format
msgid "Folder Compare Report"
msgstr "Raport por\xF3wnania folder\xF3w"
-#: Merge.rc:1433
+#: Merge.rc:1416
#, c-format
msgid "Report &File:"
msgstr "&Plik raportu:"
-#: 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 "Przegl\xB9daj..."
-#: Merge.rc:1437
+#: Merge.rc:1420
#, c-format
msgid "&Style:"
msgstr "&Styl:"
-#: Merge.rc:1440
+#: Merge.rc:1423
#, c-format
msgid "&Copy to Clipboard"
msgstr "&Kopiuj do schowka"
-#: Merge.rc:1448
+#: Merge.rc:1431
#, c-format
msgid "Shared or Private Filter"
msgstr "Folder wsp\xF3\xB3dzielony lub prywatny"
-#: Merge.rc:1451
+#: Merge.rc:1434
#, c-format
msgid "Which type of filter do you want to create?"
msgstr "Jaki rodzaj filtra chcesz utworzy\xE6?"
-#: Merge.rc:1453
+#: Merge.rc:1436
#, c-format
msgid "Shared Filter (for all users on this machine)"
msgstr "Filtr wsp\xF3\xB3dzielony (dla wszystkich u\xBFytkownik\xF3w)"
-#: Merge.rc:1455
+#: Merge.rc:1438
#, c-format
msgid "Private Filter (only for current user)"
msgstr "Filtr prywatny (tylko dla bie\xBF\xB9cego u\xBFytkownika)"
-#: Merge.rc:1463
-#: Merge.rc:1964
+#: Merge.rc:1446
+#: Merge.rc:1965
#, c-format
msgid "Archive Support"
msgstr "Wsparcie dla archiw\xF3w"
-#: Merge.rc:1466
+#: Merge.rc:1449
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
msgstr "Wsparcie archiw\xF3w wymaga zainstalowanej wtyczki 7-Zip:"
-#: Merge.rc:1468
+#: Merge.rc:1451
#, c-format
msgid "Download 7-zip Plugin"
msgstr "Pobierz wtyczk\xEA 7-zip"
-#: Merge.rc:1469
+#: Merge.rc:1452
#, c-format
msgid "&Enable archive file support"
msgstr "&W\xB3\xB9cz wsparcie dla archiw\xF3w"
-#: Merge.rc:1471
+#: Merge.rc:1454
#, c-format
msgid "&Use stand-alone 7-Zip if available"
msgstr "&U\xBFyj stacjonarnego 7-Zip, je\x9Cli dost\xEApny"
-#: Merge.rc:1474
+#: Merge.rc:1457
#, c-format
msgid "U&se local 7-Zip from WinMerge folder"
msgstr "U\xBFy&j lokalnego 7-Zip z folderu WinMerge"
-#: Merge.rc:1476
+#: Merge.rc:1459
#, c-format
msgid "&Detect archive type from file signature"
msgstr "Wy&krywaj typ archiwum z sygnatury pliku"
-#: Merge.rc:1484
+#: Merge.rc:1467
#, c-format
msgid "Compare Statistics"
msgstr "Statystyki por\xF3wnania"
-#: Merge.rc:1487
+#: Merge.rc:1470
#, c-format
msgid "Folders:"
msgstr "Foldery:"
-#: Merge.rc:1488
+#: Merge.rc:1471
#, c-format
msgid "Files:"
msgstr "Pliki:"
-#: Merge.rc:1489
-#: Merge.rc:2355
+#: Merge.rc:1472
+#: Merge.rc:2359
#, c-format
msgid "Different"
msgstr "r\xF3\xBFnych"
-#: Merge.rc:1490
+#: Merge.rc:1473
#, c-format
msgid "Text:"
msgstr "Tekst:"
-#: Merge.rc:1493
-#: Merge.rc:1512
+#: Merge.rc:1476
+#: Merge.rc:1495
#, c-format
msgid "Binary:"
msgstr "Binarne:"
-#: Merge.rc:1496
+#: Merge.rc:1479
#, c-format
msgid "Unique"
msgstr "Unikalne"
-#: Merge.rc:1497
+#: Merge.rc:1480
#, c-format
msgid "Left:"
msgstr "Lewa:"
-#: Merge.rc:1502
+#: Merge.rc:1485
#, c-format
msgid "Right:"
msgstr "Prawa:"
-#: Merge.rc:1507
-#: Merge.rc:2349
+#: Merge.rc:1490
+#: Merge.rc:2353
#, c-format
msgid "Identical"
msgstr "Identyczne"
-#: Merge.rc:1516
+#: Merge.rc:1499
#, c-format
msgid "Total:"
msgstr "Wszystkich:"
-#: Merge.rc:1521
+#: Merge.rc:1504
#, c-format
msgid "Close"
msgstr "Zamknij"
-#: Merge.rc:1530
+#: Merge.rc:1513
#, c-format
msgid "Affects"
msgstr "Dzia\xB3anie"
-#: Merge.rc:1533
-#: Merge.rc:1536
+#: Merge.rc:1516
+#: Merge.rc:1519
#, c-format
msgid "(Affects)"
msgstr "(dzia\xB3anie)"
-#: Merge.rc:1537
+#: Merge.rc:1520
#, c-format
msgid "Select Codepage for"
msgstr "Wybierz stron\xEA kodow\xB9 dla"
-#: Merge.rc:1538
+#: Merge.rc:1521
#, c-format
msgid "&File Loading:"
msgstr "&\xA3adowanie pliku:"
-#: 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 "&Zapisywanie pliku:"
-#: Merge.rc:1544
+#: Merge.rc:1527
#, c-format
msgid "&Use same codepage for both"
msgstr "&U\xBFyj tej samej strony kodowej dla obu"
-#: Merge.rc:1547
+#: Merge.rc:1530
#, c-format
msgid "&Apply"
msgstr "Z&astosuj"
-#: Merge.rc:1548
-#: Merge.rc:1930
+#: Merge.rc:1531
+#: Merge.rc:1931
#, c-format
msgid "&Cancel"
msgstr "A&nuluj"
-#: Merge.rc:1553
+#: Merge.rc:1536
#, c-format
msgid "Test Filter"
msgstr "Testuj filtr"
-#: Merge.rc:1556
+#: Merge.rc:1539
#, c-format
msgid "Testing filter ..."
msgstr "Testowanie filtra ..."
-#: Merge.rc:1558
+#: Merge.rc:1541
#, c-format
msgid "&Enter text to test:"
msgstr "&Podaj tekst do sprawdzenia:"
-#: Merge.rc:1560
+#: Merge.rc:1543
#, c-format
msgid "&Folder Name"
msgstr "Nazwa &folderu"
-#: Merge.rc:1562
+#: Merge.rc:1545
#, c-format
msgid "Result:"
msgstr "Wynik:"
-#: Merge.rc:1566
+#: Merge.rc:1549
#, c-format
msgid "&Test"
msgstr "&Testuj"
-#: Merge.rc:1567
+#: Merge.rc:1550
#, c-format
msgid "&Close"
msgstr "&Zamknij"
-#: Merge.rc:1575
+#: Merge.rc:1558
#, c-format
msgid "&Use customized text colors"
msgstr "&U\xBFyj w\xB3asnych kolor\xF3w tekstu"
-#: Merge.rc:1578
+#: Merge.rc:1561
#, c-format
msgid "Custom text colors"
msgstr "Kolory tekstu u\xBFytkownika"
-#: Merge.rc:1580
+#: Merge.rc:1563
#, c-format
msgid "Whitespace:"
msgstr "Odst\xEAp:"
-#: Merge.rc:1581
+#: Merge.rc:1564
#, c-format
msgid "Regular text:"
msgstr "Czcionka regularna:"
-#: Merge.rc:1582
+#: Merge.rc:1565
#, c-format
msgid "Selection:"
msgstr "Zaznaczenie:"
-#: Merge.rc:1605
+#: Merge.rc:1588
#, c-format
msgid "Paths"
msgstr "\x8Ccie\xBFki"
-#: Merge.rc:1611
+#: Merge.rc:1594
#, c-format
msgid "R&ead-only"
msgstr "Ty&lko do odczytu"
-#: Merge.rc:1615
+#: Merge.rc:1598
#, c-format
msgid "Re&ad-only"
msgstr "Ty&lko do odczytu"
-#: Merge.rc:1621
+#: Merge.rc:1604
#, c-format
msgid "Open..."
msgstr "Otw\xF3rz..."
-#: Merge.rc:1622
+#: Merge.rc:1605
#, c-format
msgid "Save..."
msgstr "Zapisz..."
-#: Merge.rc:1627
-#: Merge.rc:1965
+#: Merge.rc:1610
+#: Merge.rc:1966
#, c-format
msgid "Backup Files"
msgstr "Pliki kopii"
-#: Merge.rc:1630
+#: Merge.rc:1613
#, c-format
msgid "Create backup files in:"
msgstr "Tw\xF3rz kopie plik\xF3w dla:"
-#: Merge.rc:1635
+#: Merge.rc:1618
#, c-format
msgid "Create backup files into:"
msgstr "Pliki kopii zapasowych tw\xF3rz w:"
-#: Merge.rc:1636
+#: Merge.rc:1619
#, c-format
msgid "&Original file's folder"
msgstr "Folder oryginalnego pliku"
-#: Merge.rc:1638
+#: Merge.rc:1621
#, c-format
msgid "&Global backup folder:"
msgstr "&Globalny folder dla kopii:"
-#: Merge.rc:1642
+#: Merge.rc:1625
#, c-format
msgid "Backup filename:"
msgstr "Nazwa pliku kopii:"
-#: Merge.rc:1643
+#: Merge.rc:1626
#, c-format
msgid "&Append .bak -extension"
msgstr "Dod&aj rozszerzenie .bak"
-#: Merge.rc:1645
+#: Merge.rc:1628
#, c-format
msgid "A&ppend timestamp"
msgstr "Dodaj czas utworzenia kopii"
-#: Merge.rc:1652
-#: Merge.rc:2257
+#: Merge.rc:1635
+#: Merge.rc:2261
#, c-format
msgid "Confirm Copy"
msgstr "Potwierd\x9F kopiowanie"
-#: Merge.rc:1656
+#: Merge.rc:1639
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr "Czy na pewno skopiowa\xE6 XXX element\xF3w?"
-#: Merge.rc:1658
+#: Merge.rc:1641
#, c-format
msgid "From left"
msgstr "Z lewej"
-#: Merge.rc:1661
+#: Merge.rc:1644
#, c-format
msgid "To right"
msgstr "na praw\xB9"
-#: Merge.rc:1664
+#: Merge.rc:1647
#, c-format
msgid "Yes"
msgstr "Tak"
-#: Merge.rc:1665
+#: Merge.rc:1648
#, c-format
msgid "No"
msgstr "Nie"
-#: Merge.rc:1671
+#: Merge.rc:1654
#, c-format
msgid "Plugins"
msgstr "Wtyczki"
-#: Merge.rc:1674
+#: Merge.rc:1657
#, c-format
msgid "&Enable plugins"
msgstr "W\xB3\xB9cz wtyczki"
-#: Merge.rc:1685
-#: Merge.rc:1966
+#: Merge.rc:1668
+#: Merge.rc:1967
#, c-format
msgid "Shell Integration"
msgstr "Integracja z systemem"
-#: Merge.rc:1688
+#: Merge.rc:1671
#, c-format
msgid "Explorer"
msgstr "Eksplorator"
-#: Merge.rc:1689
+#: Merge.rc:1672
#, c-format
msgid "E&nable advanced menu"
msgstr "W\xB3\xB9cz menu &zaawansowane"
-#: Merge.rc:1691
+#: Merge.rc:1674
#, c-format
msgid "In&clude subfolders by default"
msgstr "Domy\x9C&lnie uwzgl\xEAdnij podfoldery"
-#: Merge.rc:1693
+#: Merge.rc:1676
#, c-format
msgid "&Add to context menu"
msgstr "Dodaj do menu kontekstowego"
-#: Merge.rc:1695
+#: Merge.rc:1678
#, c-format
msgid "Folder compare"
msgstr "Por\xF3wnywanie folder\xF3w"
-#: Merge.rc:1696
+#: Merge.rc:1679
#, c-format
msgid "Add &Shell menu to context menu"
msgstr "Dodaj menu &pow\xB3oki plik\xF3w do menu kontekstowego"
+#: Merge.rc:1686
+#: Merge.rc:1970
+#: Merge.rc:2307
+#, c-format
+msgid "Folder"
+msgstr "Folder"
+
+#: Merge.rc:1689
+#, c-format
+msgid "&Compare method:"
+msgstr "Metoda &por\xF3wnania:"
+
+#: Merge.rc:1691
+#, c-format
+msgid "S&top after first difference"
+msgstr "&Zatrzymaj po pierwszej r\xF3\xBFnicy"
+
+#: Merge.rc:1693
+#, c-format
+msgid "Ign&ore time differences less than 3 seconds"
+msgstr "Ignoruj r\xF3\xBFnice czasu mniejsze ni\xBF 3 sekundy"
+
+#: Merge.rc:1695
+#, c-format
+msgid "&Include unique subfolders contents"
+msgstr "&Uwzgl\xEAdnij unikaln\xB9 zawarto\x9C\xE6 podfolder\xF3w"
+
+#: Merge.rc:1697
+#, c-format
+msgid "&Quick compare limit (MB):"
+msgstr "Limit sz&ybkiego por\xF3wnania (MB):"
+
#. StringFileInfo.Block
-#: Merge.rc:1722
+#: Merge.rc:1723
#, c-format
msgid "040904e4"
msgstr "041504e2"
#. VarFileInfo.Translation
-#: Merge.rc:1738
+#: Merge.rc:1739
#, c-format
msgid "0x409, 1252"
msgstr "0x415, 1250"
-#: Merge.rc:1753
+#: Merge.rc:1754
#, c-format
msgid "Ready"
msgstr "Gotowy"
-#: 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"
@@ -2706,7 +2726,7 @@
"Tworzy puste dokumenty\n"
"Nowe dokumenty (Ctrl+N)"
-#: Merge.rc:1771
+#: Merge.rc:1772
#, c-format
msgid ""
"Open an existing document\n"
@@ -2715,7 +2735,7 @@
"Otw\xF3rz istniej\xB9cy dokument\n"
"Otw\xF3rz (Ctrl+O)"
-#: Merge.rc:1772
+#: Merge.rc:1773
#, c-format
msgid ""
"Close the active document\n"
@@ -2724,7 +2744,7 @@
"Zamknij aktywny dokument\n"
"Zamknij"
-#: Merge.rc:1773
+#: Merge.rc:1774
#, c-format
msgid ""
"Save the active document\n"
@@ -2733,7 +2753,7 @@
"Zapisz aktywny dokument\n"
"Zapisz (Ctrl+S)"
-#: Merge.rc:1774
+#: Merge.rc:1775
#, c-format
msgid ""
"Save the active document with a new name\n"
@@ -2742,7 +2762,7 @@
"Zapisz aktywny dokument pod inn\xB9 nazw\xB9\n"
"Zapisz jako"
-#: Merge.rc:1775
+#: Merge.rc:1776
#, c-format
msgid ""
"Change the printing options\n"
@@ -2751,7 +2771,7 @@
"Zmie\xF1 opcje wydruku\n"
"Ustawienia strony"
-#: Merge.rc:1776
+#: Merge.rc:1777
#, c-format
msgid ""
"Change the printer and printing options\n"
@@ -2760,7 +2780,7 @@
"Zmie\xF1 opcje drukarki i wydruku\n"
"Ustawienia wydruku"
-#: Merge.rc:1777
+#: Merge.rc:1778
#, c-format
msgid ""
"Print the active document\n"
@@ -2769,7 +2789,7 @@
"Wydrukuj bie\xBF\xB9cy dokument\n"
"Drukuj"
-#: Merge.rc:1778
+#: Merge.rc:1779
#, c-format
msgid ""
"Display full pages\n"
@@ -2778,27 +2798,27 @@
"Wy\x9Cwietl cale strony\n"
"Podgl\xB9d wydruku"
-#: Merge.rc:1783
+#: Merge.rc:1784
#, c-format
msgid "Make all hidden items visible again"
msgstr "Poka\xBF wszystkie ukryte elementy"
-#: Merge.rc:1784
+#: Merge.rc:1785
#, c-format
msgid "Toggle tree mode"
msgstr "W\xB3\xB9cz tryb drzewa"
-#: Merge.rc:1785
+#: Merge.rc:1786
#, c-format
msgid "Expand all subfolders"
msgstr "Rozwi\xF1 wszystkie podfoldery"
-#: Merge.rc:1786
+#: Merge.rc:1787
#, c-format
msgid "Collapse all subfolders"
msgstr "Zwi\xF1 wszystkie podfoldery"
-#: Merge.rc:1792
+#: Merge.rc:1793
#, c-format
msgid ""
"Open project file\n"
@@ -2807,32 +2827,32 @@
"Otw\xF3rz plik projektu\n"
"Plik projektu (Ctrl+J)"
-#: Merge.rc:1793
+#: Merge.rc:1794
#, c-format
msgid "Unknown error attempting to open project file"
msgstr "Nieznany b\xB3\xB9d podczas otwierania projektu"
-#: Merge.rc:1794
+#: Merge.rc:1795
#, c-format
msgid "Unknown error attempting to save project file"
msgstr "Nieznany b\xB3\xB9d podczas zapisu projektu"
-#: Merge.rc:1795
+#: Merge.rc:1796
#, c-format
msgid "Project File"
msgstr "Plik projektu"
-#: Merge.rc:1796
+#: Merge.rc:1797
#, c-format
msgid "Project file successfully loaded."
msgstr "Plik projektu za\xB3adowano pomy\x9Clnie."
-#: Merge.rc:1797
+#: Merge.rc:1798
#, c-format
msgid "Project file successfully saved."
msgstr "Plik projektu zapisano pomy\x9Clnie."
-#: Merge.rc:1798
+#: Merge.rc:1799
#, c-format
msgid ""
"Save current paths and options to project file\n"
@@ -2841,7 +2861,7 @@
"Zapisz aktualne \x9Ccie\xBFki i opcje do pliku projektu\n"
"Zapisz plik projektu"
-#: Merge.rc:1803
+#: Merge.rc:1804
#, c-format
msgid ""
"Display program information, version number and copyright\n"
@@ -2850,7 +2870,7 @@
"Wy\x9Cwietl informacje o programie, numer wersji i info o prawach autorskich\n"
"O programie"
-#: Merge.rc:1804
+#: Merge.rc:1805
#, c-format
msgid ""
"Quit the application; prompts to save documents\n"
@@ -2859,7 +2879,6 @@
"Wyjd\x9F z programu; program pyta, czy zachowa\xE6 dokumenty\n"
"Wyjd\x9F"
-#: Merge.rc:1810
#: Merge.rc:1811
#: Merge.rc:1812
#: Merge.rc:1813
@@ -2875,11 +2894,12 @@
#: Merge.rc:1823
#: Merge.rc:1824
#: Merge.rc:1825
+#: Merge.rc:1826
#, c-format
msgid "Open this document"
msgstr "Otw\xF3rz ten dokument"
-#: Merge.rc:1830
+#: Merge.rc:1831
#, c-format
msgid ""
"Switch to the next window pane\n"
@@ -2888,7 +2908,7 @@
"Przejd\x9F do nast\xEApnego panelu\n"
"Nast\xEApny panel"
-#: Merge.rc:1831
+#: Merge.rc:1832
#, c-format
msgid ""
"Switch back to the previous window pane\n"
@@ -2897,7 +2917,7 @@
"Wr\xF3\xE6 do poprzedniego panelu\n"
"Poprzedni panel"
-#: Merge.rc:1837
+#: Merge.rc:1838
#, c-format
msgid ""
"Arrange windows so they overlap\n"
@@ -2906,7 +2926,7 @@
"Ustaw okna w nak\xB3adaj\xB9c\xB9 si\xEA kaskad\xEA\n"
"Kaskadowo"
-#: Merge.rc:1838
+#: Merge.rc:1839
#, c-format
msgid ""
"Arrange windows as non-overlapping tiles horizontally\n"
@@ -2915,7 +2935,7 @@
"Ustaw okna obok siebie poziomo\n"
"Okna poziomo"
-#: Merge.rc:1839
+#: Merge.rc:1840
#, c-format
msgid ""
"Arrange windows as non-overlapping tiles vertically\n"
@@ -2924,7 +2944,7 @@
"Ustaw okna obok siebie pionowo\n"
"Okna pionowo"
-#: Merge.rc:1845
+#: Merge.rc:1846
#, c-format
msgid ""
"Copy the selection and put it on the Clipboard\n"
@@ -2933,7 +2953,7 @@
"Kopiuj zaznaczenie i wstaw do schowka\n"
"Kopiuj"
-#: Merge.rc:1846
+#: Merge.rc:1847
#, c-format
msgid ""
"Cut the selection and put it on the Clipboard\n"
@@ -2942,7 +2962,7 @@
"Wytnij zaznaczenie i wstaw do schowka\n"
"Wytnij"
-#: Merge.rc:1847
+#: Merge.rc:1848
#, c-format
msgid ""
"Find the specified text\n"
@@ -2951,7 +2971,7 @@
"Znajd\x9F wskazany tekst\n"
"Wyszukaj"
-#: Merge.rc:1848
+#: Merge.rc:1849
#, c-format
msgid ""
"Insert Clipboard contents\n"
@@ -2960,7 +2980,7 @@
"Wstaw zawarto\x9C\xE6 schowka\n"
"Wklej"
-#: Merge.rc:1849
+#: Merge.rc:1850
#, c-format
msgid ""
"Repeat the last action\n"
@@ -2969,7 +2989,7 @@
"Powt\xF3rz ostatni\xB9 czynno\x9C\xE6\n"
"Powt\xF3rz"
-#: Merge.rc:1850
+#: Merge.rc:1851
#, c-format
msgid ""
"Replace specific text with different text\n"
@@ -2978,7 +2998,7 @@
"Zast\xB9p dany tekst innym\n"
"Zast\xB9p"
-#: Merge.rc:1851
+#: Merge.rc:1852
#, c-format
msgid ""
"Select the entire document\n"
@@ -2987,7 +3007,7 @@
"Zaznacz ca\xB3y dokument\n"
"Zaznacz wszystko"
-#: Merge.rc:1852
+#: Merge.rc:1853
#, c-format
msgid ""
"Undo the last action\n"
@@ -2996,7 +3016,7 @@
"Cofnij ostatni\xB9 czynno\x9C\xE6\n"
"Cofnij"
-#: Merge.rc:1853
+#: Merge.rc:1854
#, c-format
msgid ""
"Redo the previously undone action\n"
@@ -3005,7 +3025,7 @@
"Powt\xF3rz cofni\xEAt\xB9 czynno\x9C\xE6\n"
"Powt\xF3rz"
-#: Merge.rc:1859
+#: Merge.rc:1860
#, c-format
msgid ""
"Show or hide the toolbar\n"
@@ -3014,7 +3034,7 @@
"Poka\xBF lub ukryj pasek narz\xEAdzi\n"
"Prze\xB3\xB9cz pasek narz\xEAdzi"
-#: Merge.rc:1860
+#: Merge.rc:1861
#, c-format
msgid ""
"Show or hide the status bar\n"
@@ -3023,7 +3043,7 @@
"Poka\xBF lub ukryj pasek stanu\n"
"Prze\xB3\xB9cz pasek stanu"
-#: Merge.rc:1861
+#: Merge.rc:1862
#, c-format
msgid ""
"Show or hide the tab bar\n"
@@ -3032,7 +3052,7 @@
"Poka\xBF lub ukryj pasek kart\n"
"W\xB3\xB9cz pasek kart"
-#: Merge.rc:1862
+#: Merge.rc:1863
#, c-format
msgid ""
"Automatically resize panes\n"
@@ -3041,57 +3061,57 @@
"Zmieniaj rozmiar paneli automatycznie\n"
"Zablokuj panele"
-#: Merge.rc:1868
+#: Merge.rc:1869
#, c-format
msgid "Change the window size"
msgstr "Zmie\xF1 rozmiar okna"
-#: Merge.rc:1869
+#: Merge.rc:1870
#, c-format
msgid "Change the window position"
msgstr "Zmie\xF1 pozycj\xEA okna"
-#: Merge.rc:1870
+#: Merge.rc:1871
#, c-format
msgid "Reduce the window to an icon"
msgstr "Zredukuj okno do ikony"
-#: Merge.rc:1871
+#: Merge.rc:1872
#, c-format
msgid "Enlarge the window to full size"
msgstr "Maksymalnie powi\xEAksz okno"
-#: Merge.rc:1872
+#: Merge.rc:1873
#, c-format
msgid "Switch to the next document window"
msgstr "Prze\xB3\xB9cz na okno nast\xEApnego dokumentu"
-#: Merge.rc:1873
+#: Merge.rc:1874
#, c-format
msgid "Switch to the previous document window"
msgstr "Prze\xB3\xB9cz na okno poprzedniego dokumentu"
-#: Merge.rc:1874
+#: Merge.rc:1875
#, c-format
msgid "Close the active window and prompts to save the documents"
msgstr "Zamknij aktywne okno; program pyta, czy zachowa\xE6 dokumenty"
-#: Merge.rc:1879
+#: Merge.rc:1880
#, c-format
msgid "Restore the window to normal size"
msgstr "Przywr\xF3c normalny rozmiar okna"
-#: Merge.rc:1880
+#: Merge.rc:1881
#, c-format
msgid "Activate Task List"
msgstr "W\xB3\xB9cz list\xEA zada\xF1"
-#: Merge.rc:1881
+#: Merge.rc:1882
#, c-format
msgid "Activate this window"
msgstr "Aktywuj to okno"
-#: Merge.rc:1887
+#: Merge.rc:1888
#, c-format
msgid ""
"Close print preview mode\n"
@@ -3100,7 +3120,7 @@
"Zamknij podgl\xB9d wydruku\n"
"Anuluj podgl\xB9d"
-#: Merge.rc:1894
+#: Merge.rc:1895
#, c-format
msgid ""
"\n"
@@ -3119,7 +3139,7 @@
"WinMerge.FileCompare\n"
"Por\xF3wnanie plik\xF3w WinMerge "
-#: Merge.rc:1895
+#: Merge.rc:1896
#, c-format
msgid ""
"\n"
@@ -3138,23 +3158,23 @@
"WinMerge.FolderCompare\n"
"Por\xF3wnanie folder\xF3w WinMerge"
-#: Merge.rc:1902
+#: Merge.rc:1903
#, c-format
msgid "Preserve original EOL chars"
msgstr "Zapisz oryginalne znaki ko\xF1ca linii"
-#: Merge.rc:1909
+#: Merge.rc:1910
#, c-format
msgid "Press any key"
msgstr "Naci\x9Cnij dowolny klawisz"
-#: Merge.rc:1915
#: Merge.rc:1916
+#: Merge.rc:1917
#, c-format
msgid "Right click on the path to copy"
msgstr "Kliknij prawym klawiszem na \x9Ccie\xBFk\xEA do skopiowania"
-#: Merge.rc:1922
+#: Merge.rc:1923
#, c-format
msgid ""
"Developers:\n"
@@ -3163,157 +3183,158 @@
"Tw\xF3rcy:\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 jest rozprowadzany BEZ JAKIEJKOLWIEK GWARANCJI. To jest darmowe oprogramowanie i mo\xBFna je redystrybuowa\xE6 pod szczeg\xF3lnymi warunkami; w celu uzyskania szczeg\xF3\xB3owych informacji zobacz Licencj\xEA GNU General Public License w menu Pomoc."
-#: Merge.rc:1929
+#: Merge.rc:1930
#, c-format
msgid "&Ok"
msgstr "&Ok"
-#: Merge.rc:1931
+#: Merge.rc:1932
#, c-format
msgid "&Abort"
msgstr "&Przerwij"
-#: Merge.rc:1932
+#: Merge.rc:1933
#, c-format
msgid "&Retry"
msgstr "P&on\xF3w"
-#: Merge.rc:1933
+#: Merge.rc:1934
#, c-format
msgid "&Ignore"
msgstr "&Ignoruj"
-#: Merge.rc:1934
+#: Merge.rc:1935
#, c-format
msgid "Ignore &all"
msgstr "Ignoruj &wszystkie"
-#: Merge.rc:1935
+#: Merge.rc:1936
#, c-format
msgid "&Yes"
msgstr "&Tak"
-#: Merge.rc:1941
+#: Merge.rc:1942
#, c-format
msgid "Yes to &all"
msgstr "Tak na &wszystkie"
-#: Merge.rc:1942
+#: Merge.rc:1943
#, c-format
msgid "&No"
msgstr "&Nie"
-#: Merge.rc:1943
+#: Merge.rc:1944
#, c-format
msgid "No to a&ll"
msgstr "Nie na w&szystkie"
-#: Merge.rc:1944
+#: Merge.rc:1945
#, c-format
msgid "&Continue"
msgstr "&Kontynuuj"
-#: Merge.rc:1945
+#: Merge.rc:1946
#, c-format
msgid "&Skip"
msgstr "Pom&i\xF1"
-#: Merge.rc:1946
+#: Merge.rc:1947
#, c-format
msgid "Skip &all"
msgstr "Pomi\xF1 ws&zystkie"
-#: Merge.rc:1948
+#: Merge.rc:1949
#, c-format
msgid "Don't display this &message again."
msgstr "Nie wy\x9Cwietlaj ponownie tego komunikatu."
-#: Merge.rc:1949
+#: Merge.rc:1950
#, c-format
msgid "Don't ask this &question again."
msgstr "Nie &pytaj ponownie."
-#: Merge.rc:1959
+#: Merge.rc:1961
#, c-format
-msgid "Syntax colors"
-msgstr "Kolory sk\xB3adni"
+msgid "Syntax"
+msgstr "Sk\xB3adnia"
-#: Merge.rc:1960
+#: Merge.rc:1963
#, c-format
-msgid "Text Colors"
-msgstr "Kolory tekstu"
-
-#: Merge.rc:1962
-#, c-format
msgid "Version Control"
msgstr "Kontrola wersji"
-#: Merge.rc:1973
+#: Merge.rc:1968
+#: Merge.rc:2339
#, c-format
+msgid "Differences"
+msgstr "R\xF3\xBFnice"
+
+#: Merge.rc:1977
+#, c-format
msgid "To:"
msgstr "Do:"
-#: Merge.rc:1974
+#: Merge.rc:1978
#, c-format
msgid "From left:"
msgstr "Z lewej:"
-#: Merge.rc:1975
+#: Merge.rc:1979
#, c-format
msgid "To left:"
msgstr "na lew\xB9:"
-#: Merge.rc:1976
+#: Merge.rc:1980
#, c-format
msgid "From right:"
msgstr "Z prawej:"
-#: Merge.rc:1977
+#: Merge.rc:1981
#, c-format
msgid "To right:"
msgstr "Na praw\xB9"
-#: Merge.rc:1983
+#: Merge.rc:1987
#, c-format
msgid "Version %1"
msgstr "Wersja %1"
-#: Merge.rc:1984
+#: Merge.rc:1988
#, c-format
msgid "Unicode"
msgstr "Unicode"
-#: Merge.rc:1985
+#: Merge.rc:1989
#, c-format
msgid "X64"
msgstr "X64"
-#: Merge.rc:1991
+#: Merge.rc:1995
#, c-format
msgid "Options (%1)"
msgstr "Opcje (%1)"
-#: Merge.rc:1992
+#: Merge.rc:1996
#, c-format
msgid "All message boxes are now displayed again."
msgstr "Wszystkie komunikaty zostan\xB9 ponownie wy\x9Cwietlone."
-#: 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 "Dokonano modyfikacji w pliku bie\xBF\xB9cej sesji por\xF3wnywania. Niekt\xF3re ustawienia nie zostan\xB9 zastosowane przed ponownym uruchomieniem powr\xF3wnywania."
-#: Merge.rc:1994
+#: Merge.rc:1998
#, c-format
msgid "The selected font change will not be applied to any currently visible difference windows."
msgstr "Wybrana czcionka nie zostanie zastosowana do widocznych okien z r\xF3\xBFnicami."
-#: Merge.rc:1996
+#: Merge.rc:2000
#, c-format
msgid ""
"Value in Tab size -field is not in range WinMerge accepts.\n"
@@ -3324,7 +3345,7 @@
"\n"
"Prosz\xEA u\xBFy\xE6 warto\x9Cci 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"
@@ -3335,129 +3356,129 @@
"\n"
"Po przywr\xF3ceniu konieczne b\xEAdzie ponowne uruchomienie programu."
-#: Merge.rc:2004
+#: Merge.rc:2008
#, c-format
msgid "Open"
msgstr "Otw\xF3rz"
-#: Merge.rc:2005
+#: Merge.rc:2009
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "Programy|*.exe;*.bat;*.cmd|Wszystkie pliki (*.*)|*.*||"
-#: Merge.rc:2006
+#: Merge.rc:2010
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr "Wszystkie pliki (*.*)|*.*||"
-#: Merge.rc:2007
+#: Merge.rc:2011
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "Pliki projekt\xF3w WinMerge (*.WinMerge)|*.WinMerge||"
-#: Merge.rc:2009
+#: Merge.rc:2013
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "Pliki ustawie\xF1 (*.ini)|*.ini|Wszystkie pliki (*.*)|*.*||"
-#: Merge.rc:2015
+#: Merge.rc:2019
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr "Pliki Text (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Wszystkie pliki (*.*)|*.*||"
-#: Merge.rc:2016
+#: Merge.rc:2020
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "Pliki HTML (*.htm,*.html)|*.htm;*.html|Wszystkie pliki (*.*)|*.*||"
-#: Merge.rc:2017
+#: Merge.rc:2021
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "Pliki XML (*.xml)|*.xml|Wszystkie pliki (*.*)|*.*||"
-#: 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 "Pe\xB3na zawarto\x9C\xE6"
-#: Merge.rc:2033
+#: Merge.rc:2037
#, c-format
msgid "Quick Contents"
msgstr "Skr\xF3cona zawarto\x9C\xE6"
-#: Merge.rc:2034
+#: Merge.rc:2038
#, c-format
msgid "Modified Date"
msgstr "Data modyfikacji"
-#: Merge.rc:2035
+#: Merge.rc:2039
#, c-format
msgid "Modified Date and Size"
msgstr "Data modyfikacji i wielko\x9C\xE6"
-#: Merge.rc:2036
+#: Merge.rc:2040
#, c-format
msgid "Size"
msgstr "Wielko\x9C\xE6"
-#: Merge.rc:2042
-#: Merge.rc:2667
+#: Merge.rc:2046
+#: Merge.rc:2671
#, c-format
msgid "Name"
msgstr "Nazwa"
-#: Merge.rc:2043
+#: Merge.rc:2047
#, c-format
msgid "Location"
msgstr "lokalizacja"
-#: Merge.rc:2044
+#: Merge.rc:2048
#, c-format
msgid "Filters"
msgstr "Filtry"
-#: Merge.rc:2045
+#: Merge.rc:2049
#, c-format
msgid "[F] "
msgstr "[F] "
-#: Merge.rc:2046
-#: Merge.rc:2669
+#: Merge.rc:2050
+#: Merge.rc:2673
#, c-format
msgid "Description"
msgstr "Opis"
-#: Merge.rc:2047
+#: Merge.rc:2051
#, c-format
msgid "Select filename for new filter"
msgstr "Wybierz nazw\xEA dla nowego filtru"
-#: Merge.rc:2048
+#: Merge.rc:2052
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "Filtry plik\xF3w(*.flt)|*.flt|Wszystkie pliki (*.*)|*.*||"
-#: Merge.rc:2050
+#: Merge.rc:2054
#, c-format
msgid ""
"Cannot find file filter template file!\n"
@@ -3470,7 +3491,7 @@
"Prosz\xEA skopiowa\xE6 plik %1 do folderu WinMerge/Filters:\n"
"%2."
-#: Merge.rc:2052
+#: Merge.rc:2056
#, c-format
msgid ""
"Cannot copy filter template file to filter folder:\n"
@@ -3483,7 +3504,7 @@
"\n"
"Upewnij si\xEA, \xBFe folder taki istnieje i jest zapisywalny."
-#: Merge.rc:2054
+#: Merge.rc:2058
#, c-format
msgid ""
"User's filter file folder is not defined!\n"
@@ -3494,7 +3515,7 @@
"\n"
"Prosz\xEA wybra\xE6 folder filtr\xF3w w opcje/System."
-#: Merge.rc:2056
+#: Merge.rc:2060
#, c-format
msgid ""
"Failed to delete the filter file:\n"
@@ -3507,12 +3528,12 @@
"\n"
"By\xE6 mo\xBFe plik ten jest tylko do odczytu?"
-#: Merge.rc:2057
+#: Merge.rc:2061
#, c-format
msgid "Locate filter file to install"
msgstr "Lokalizuj plik fitra do instalacji"
-#: Merge.rc:2059
+#: Merge.rc:2063
#, c-format
msgid ""
"Installing filter file failed.\n"
@@ -3523,17 +3544,17 @@
"\n"
"Nie mo\xBFna skopiowa\xE6 pliku do foldera filtr\xF3w."
-#: Merge.rc:2061
+#: Merge.rc:2065
#, c-format
msgid "Filter file already exists. Overwrite existing filter?"
msgstr "Plik filtra ju\xBF istnieje. Czy nadpisa\xE6 istniej\xB9cy plik?"
-#: Merge.rc:2067
+#: Merge.rc:2071
#, c-format
msgid "Regular expression"
msgstr "Wyra\xBFenia regularne"
-#: Merge.rc:2073
+#: Merge.rc:2077
#, c-format
msgid ""
"Filters were updated. Do you want to refresh all open folder compares?\n"
@@ -3544,203 +3565,203 @@
"\n"
"Je\xBFeli nie chcesz od\x9Cwierza\xE6 okien por\xF3wna\xF1 teraz, wybierz Nie i od\x9Cwie\xBF okna p\xF3\x9Fniej."
-#: Merge.rc:2080
+#: Merge.rc:2084
#, c-format
msgid "&Path to SS.EXE:"
msgstr "\x8Ccie\xBFka do SS.EXE"
-#: Merge.rc:2086
+#: Merge.rc:2090
#, c-format
msgid "Folder Comparison Results"
msgstr "Wyniki por\xF3wnania folder\xF3w"
-#: Merge.rc:2087
+#: Merge.rc:2091
#, c-format
msgid "File Comparison"
msgstr "Por\xF3wnywanie plik\xF3w"
-#: Merge.rc:2088
+#: Merge.rc:2092
#, c-format
msgid "Untitled left"
msgstr "Lewy bez tytu\xB3u"
-#: Merge.rc:2089
+#: Merge.rc:2093
#, c-format
msgid "Untitled right"
msgstr "Prawy bez tytu\xB3u"
-#: Merge.rc:2090
+#: Merge.rc:2094
#, c-format
msgid "Theirs File"
msgstr "Ich plik"
-#: Merge.rc:2091
+#: Merge.rc:2095
#, c-format
msgid "Mine File"
msgstr "M\xF3j plik"
-#: Merge.rc:2097
+#: Merge.rc:2101
#, c-format
msgid "Scanning files..."
msgstr "Skanowanie plik\xF3w..."
-#: Merge.rc:2098
+#: Merge.rc:2102
#, c-format
msgid "Opening selection"
msgstr "Otwieranie wybranych"
-#: Merge.rc:2099
+#: Merge.rc:2103
#, c-format
msgid "Copying Left to Right"
msgstr "Kopiowanie lewej na praw\xB9"
-#: Merge.rc:2100
+#: Merge.rc:2104
#, c-format
msgid "Copying Right to Left"
msgstr "Kopiowanie prawej na lew\xB9"
-#: Merge.rc:2101
+#: Merge.rc:2105
#, c-format
msgid "Copying All to Left"
msgstr "Kopiowanie wszystkich na lew\xB9"
-#: Merge.rc:2102
+#: Merge.rc:2106
#, c-format
msgid "Copying All to Right"
msgstr "Kopiowanie wszystkich na praw\xB9"
-#: Merge.rc:2103
+#: Merge.rc:2107
#, c-format
msgid "Copying files..."
msgstr "Kopiowanie plik\xF3w..."
-#: Merge.rc:2104
+#: Merge.rc:2108
#, c-format
msgid "Deleting files..."
msgstr "Usuwanie plik\xF3w..."
-#: Merge.rc:2105
+#: Merge.rc:2109
#, c-format
msgid "Moving files..."
msgstr "Przenoszenie plik\xF3w..."
-#: Merge.rc:2106
+#: Merge.rc:2110
#, c-format
msgid "Creating the report..."
msgstr "Tworzenie raportu..."
-#: Merge.rc:2107
+#: Merge.rc:2111
#, c-format
msgid "Undoing the last operation..."
msgstr "Cofanie ostatniej operacji..."
-#: Merge.rc:2108
+#: Merge.rc:2112
#, c-format
msgid "Redoing the previous operation..."
msgstr "Przywracanie ostatniej operacji..."
-#: Merge.rc:2114
+#: Merge.rc:2118
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr "Lin: %s Kol: %d/%d Zn: %d/%d EOL: %s"
-#: Merge.rc:2115
+#: Merge.rc:2119
#, c-format
msgid "Line: %s"
msgstr "Linia: %s"
-#: Merge.rc:2116
+#: Merge.rc:2120
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr "Lin: %s Kol: %d/%d Zn: %d/%d"
-#: Merge.rc:2117
+#: Merge.rc:2121
#, c-format
msgid "Merge"
msgstr "Scal"
-#: Merge.rc:2118
+#: Merge.rc:2122
#, c-format
msgid "Difference %1 of %2"
msgstr "R\xF3\xBFnica %1 z %2"
-#: Merge.rc:2119
+#: Merge.rc:2123
#, c-format
msgid "%1 Differences Found"
msgstr "Znaleziono r\xF3\xBFnic: %1"
-#: Merge.rc:2120
+#: Merge.rc:2124
#, c-format
msgid "1 Difference Found"
msgstr "Znaleziono 1 r\xF3\xBFnic\xEA"
#. Abbreviation from "Read Only"
-#: Merge.rc:2121
+#: Merge.rc:2125
#, c-format
msgid "RO"
msgstr "Tylko odczyt"
-#: Merge.rc:2127
+#: Merge.rc:2131
#, c-format
msgid "Item %1 of %2"
msgstr "Element %1 z %2"
-#: Merge.rc:2128
+#: Merge.rc:2132
#, c-format
msgid "Items: %1"
msgstr "Elementy: %1"
-#: Merge.rc:2134
+#: Merge.rc:2138
#, c-format
msgid "Select two existing folders or files to compare"
msgstr "Wybierz dwa istniej\xB9ce foldery lub pliki do por\xF3wnania"
-#: Merge.rc:2135
+#: Merge.rc:2139
#, c-format
msgid "Folder Selection"
msgstr "Wyb\xF3r katalogu"
-#: Merge.rc:2136
+#: Merge.rc:2140
#, c-format
msgid "Select two folders or two files to compare."
msgstr "Wybierz dwa foldery lub pliki do por\xF3wnania."
-#: Merge.rc:2137
+#: Merge.rc:2141
#, c-format
msgid "Left path is invalid!"
msgstr "Lewa \x9Ccie\xBFka nieprawid\xB3owa!"
-#: Merge.rc:2138
+#: Merge.rc:2142
#, c-format
msgid "Right path is invalid!"
msgstr "Prawa \x9Ccie\xBFka nieprawid\xB3owa!"
-#: Merge.rc:2139
+#: Merge.rc:2143
#, c-format
msgid "Both paths are invalid!"
msgstr "Obie \x9Ccie\xBFki nieprawid\xB3owe!"
-#: Merge.rc:2140
+#: Merge.rc:2144
#, c-format
msgid "Choose two files to enable unpacker selection."
msgstr "Wybierz dwa pliki, aby umo\xBFliwi\xE6 wyb\xF3r programu rozpakowuj\xB9cego."
-#: Merge.rc:2141
+#: Merge.rc:2145
#, c-format
msgid "Cannot compare file and folder!"
msgstr "Nie mo\xBFna por\xF3wna\xE6 pliku i folderu!"
-#: Merge.rc:2147
+#: Merge.rc:2151
#, c-format
msgid "File not found: %1"
msgstr "Nie znaleziono pliku: %1"
-#: Merge.rc:2148
+#: Merge.rc:2152
#, c-format
msgid "File not unpacked: %1"
msgstr "Plik nie rozpakowany: %1"
-#: Merge.rc:2149
+#: Merge.rc:2153
#, c-format
msgid ""
"Cannot open file\n"
@@ -3753,12 +3774,12 @@
"\n"
"%2"
-#: Merge.rc:2150
+#: Merge.rc:2154
#, c-format
msgid "Failed to parse conflict file."
msgstr "B\xB3\xB9d parsowania pliku konflitku"
-#: Merge.rc:2151
+#: Merge.rc:2155
#, c-format
msgid ""
"The file\n"
@@ -3769,32 +3790,32 @@
"%1\n"
"nie jest plikiem konfliktu"
-#: Merge.rc:2157
+#: Merge.rc:2161
#, c-format
msgid "Save As"
msgstr "Zapisz jako"
-#: Merge.rc:2158
+#: Merge.rc:2162
#, c-format
msgid "Save changes to %1?"
msgstr "Zapisa\xE6 zmiany w %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 tylko do odczytu. Czy chcesz zachowa\xE6 plik pod inn\xB9 nazw\xB9?"
-#: Merge.rc:2160
+#: Merge.rc:2164
#, c-format
msgid "Error checking destination writeability"
msgstr "B\xB3\xB9d sprawdzania mo\xBFliwo\x9Cci zapisu w miejscu docelowym"
-#: Merge.rc:2161
+#: Merge.rc:2165
#, c-format
msgid "Error backing up file"
msgstr "B\xB3\xB9d przy tworzeniu kopii zapasowej pliku"
-#: Merge.rc:2163
+#: Merge.rc:2167
#, c-format
msgid ""
"Unable to backup original file:\n"
@@ -3807,7 +3828,7 @@
"\n"
"Kontynuowa\xE6 ?"
-#: Merge.rc:2164
+#: Merge.rc:2168
#, c-format
msgid ""
"Saving file failed.\n"
@@ -3824,7 +3845,7 @@
"\t-u\xBFy\xE6 innej nazwy pliku (wybierz Ok)\n"
"\t-anulowa\xE6 operacj\xEA (wybierz Anuluj)?"
-#: Merge.rc:2165
+#: Merge.rc:2169
#, c-format
msgid ""
"Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
@@ -3839,7 +3860,7 @@
"\n"
"Czy zachowa\xE6 rozpakowan\xB9 wersj\xEA w innym pliku?"
-#: Merge.rc:2166
+#: Merge.rc:2170
#, c-format
msgid ""
"Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
@@ -3854,7 +3875,7 @@
"\n"
"Czy zachowa\xE6 rozpakowan\xB9 wersj\xEA w innym pliku?"
-#: Merge.rc:2167
+#: Merge.rc:2171
#, c-format
msgid ""
"Another application has updated file\n"
@@ -3869,7 +3890,7 @@
"\n"
"Nadpisa\xE6 zmieniony plik?"
-#: Merge.rc:2168
+#: Merge.rc:2172
#, c-format
msgid ""
"%1\n"
@@ -3878,7 +3899,7 @@
"%1\n"
"jest oznaczony jako tylko do odczytu. Czy zignorowa\xE6 status tylko do odczytu?"
-#: Merge.rc:2169
+#: Merge.rc:2173
#, c-format
msgid ""
"Another application has updated file\n"
@@ -3893,17 +3914,17 @@
"\n"
"Czy prze\xB3adowa\xE6 plik?"
-#: Merge.rc:2170
+#: Merge.rc:2174
#, c-format
msgid "Save Left File As"
msgstr "Zapisz lewy plik jako"
-#: Merge.rc:2171
+#: Merge.rc:2175
#, c-format
msgid "Save Right File As"
msgstr "Zapisz prawy plik jako"
-#: Merge.rc:2172
+#: Merge.rc:2176
#, c-format
msgid ""
"The file\n"
@@ -3914,7 +3935,7 @@
"%1\n"
"zosta\xB3 usuni\xEAty. Aby kontynuowa\xE6 prosz\xEA zapisa\xE6 jego kopi\xEA"
-#: Merge.rc:2178
+#: Merge.rc:2182
#, c-format
msgid ""
"Cannot merge differences when documents are not in synch.\n"
@@ -3925,42 +3946,42 @@
"\n"
"Przed kontynuacj\xB9 od\x9Cwie\xBF dokumenty."
-#: Merge.rc:2184
+#: Merge.rc:2188
#, c-format
msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)"
msgstr "Musisz wskaza\xE6 scie\xBFk\xEA projektu SourceSafe aby kontynuowa\xE6 (tj.: $/MyProject)"
-#: Merge.rc:2185
+#: Merge.rc:2189
#, c-format
msgid "Checkout files from VSS..."
msgstr "Pobie\xBF pliki z 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 "System \x9Cledzenia wersji zwr\xF3ci\xB3 b\xB3\xB9d podczas pr\xF3by pobrania pliku. Nie mo\xBFna kontynuowa\xE6..."
-#: Merge.rc:2187
+#: Merge.rc:2191
#, c-format
msgid "Error executing versioning system command."
msgstr "B\xB3\xB9d wykonania polecenia systemu wersjonowania."
-#: 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 "Katalog roboczy VSS oraz lokalizacja bie\xBFacego pliku nie zgadzaj\xB9 si\xEA. Kontynuowa\xE6?"
-#: Merge.rc:2189
+#: Merge.rc:2193
#, c-format
msgid "No VSS database(s) found!"
msgstr "Nie znaleziono bazy VSS!"
-#: Merge.rc:2190
+#: Merge.rc:2194
#, c-format
msgid "Error from VSS:"
msgstr "B\xB3\xB9d VSS:"
-#: Merge.rc:2191
+#: Merge.rc:2195
#, c-format
msgid ""
"Versioning System returned an error while attempting to check in the file.\n"
@@ -3971,7 +3992,7 @@
" Prosz\xEA sprawdzi\xE6 config_spec u\xBFywanego widoku.\n"
" Cofn\xB9\xE6 operacj\xEA checkout?"
-#: Merge.rc:2192
+#: Merge.rc:2196
#, c-format
msgid ""
"Versioning System returned an error while attempting to undo checkout the file.\n"
@@ -3980,169 +4001,169 @@
"System \x9Cledzenia wersji zwr\xF3ci\xB3 b\xB3\xB9d podczas operacji uncheckout.\n"
" Prosz\xEA sprawdzi\xE6 config_spec u\xBFywanego widoku."
-#: Merge.rc:2198
-#: Merge.rc:2651
+#: Merge.rc:2202
+#: Merge.rc:2655
#, c-format
msgid "None"
msgstr "Brak"
-#: Merge.rc:2199
+#: Merge.rc:2203
#, c-format
msgid "Visual SourceSafe (less than 5.0)"
msgstr "(Visual SourceSafe (poni\xBFej 5.0)"
-#: Merge.rc:2200
+#: Merge.rc:2204
#, c-format
msgid "Visual SourceSafe (5.0 and above)"
msgstr "Visual SourceSafe (5.0 i wy\xBFej)"
-#: Merge.rc:2202
+#: Merge.rc:2206
#, c-format
msgid "Break at whitespace"
msgstr "Zatrzymaj na przerwie"
-#: Merge.rc:2203
+#: Merge.rc:2207
#, c-format
msgid "Break at whitespace or punctuation"
msgstr "Zatrzymaj na przerwie lub punktorze"
-#: Merge.rc:2209
-#: Merge.rc:2211
+#: Merge.rc:2213
+#: Merge.rc:2215
#, c-format
msgid "Copy selected item to named directory"
msgstr "Kopiuj wybrany plik do wskazanego katalogu"
-#: Merge.rc:2210
-#: Merge.rc:2212
+#: Merge.rc:2214
+#: Merge.rc:2216
#, c-format
msgid "Copy selected item to custom directory"
msgstr "Kopiuj wybrany plik do katalogu"
-#: Merge.rc:2213
+#: Merge.rc:2217
#, c-format
msgid "Delete selected item on left"
msgstr "Usu\xF1 wybran\xB9 pozycj\xEA z lewej"
-#: Merge.rc:2214
+#: Merge.rc:2218
#, c-format
msgid "Delete selected item on right"
msgstr "Usu\xF1 wybran\xB9 pozycj\xEA z prawej"
-#: Merge.rc:2215
+#: Merge.rc:2219
#, c-format
msgid "Delete selected item(s) on both sides"
msgstr "Usu\xF1 wybrane pozycje po obu stronach"
-#: Merge.rc:2216
+#: Merge.rc:2220
#, c-format
msgid "Hide selected item(s) (on the fly filter)"
msgstr "Ukryj wybrane elementy (filtr roboczy)"
-#: Merge.rc:2217
+#: Merge.rc:2221
#, c-format
msgid "Rename selected item on both sides"
msgstr "Zmie\xF1 nazw\xEA wybranej pozycji na obu stronach"
-#: Merge.rc:2218
+#: Merge.rc:2222
#, c-format
msgid "Right to Left (%1)"
msgstr "Prawa na lew\xB9 (%1)"
-#: Merge.rc:2219
+#: Merge.rc:2223
#, c-format
msgid "Left to Right (%1)"
msgstr "Lewa na praw\xB9 (%1)"
-#: Merge.rc:2220
+#: Merge.rc:2224
#, c-format
msgid "Right to Left (%1 of %2)"
msgstr "Prawa na lew\xB9 (%1 z %2)"
-#: Merge.rc:2221
+#: Merge.rc:2225
#, c-format
msgid "Left to Right (%1 of %2)"
msgstr "Lewa na praw\xB9 (%1 z %2)"
-#: Merge.rc:2222
-#: Merge.rc:2238
+#: Merge.rc:2226
+#: Merge.rc:2242
#, c-format
msgid "Left to... (%1)"
msgstr "Lewa na... (%1)"
-#: Merge.rc:2223
-#: Merge.rc:2239
+#: Merge.rc:2227
+#: Merge.rc:2243
#, c-format
msgid "Right to... (%1)"
msgstr "Prawa na... (%1)"
-#: Merge.rc:2224
-#: Merge.rc:2240
+#: Merge.rc:2228
+#: Merge.rc:2244
#, c-format
msgid "Left to... (%1 of %2)"
msgstr "Lewa na... (%1 z %2)"
-#: Merge.rc:2225
-#: Merge.rc:2241
+#: Merge.rc:2229
+#: Merge.rc:2245
#, c-format
msgid "Right to... (%1 of %2)"
msgstr "Prawa na... (%1 z %2)"
-#: Merge.rc:2231
+#: Merge.rc:2235
#, c-format
msgid "Left (%1)"
msgstr "Lewa (%1)"
-#: Merge.rc:2232
+#: Merge.rc:2236
#, c-format
msgid "Right (%1)"
msgstr "Prawa (%1)"
-#: Merge.rc:2233
+#: Merge.rc:2237
#, c-format
msgid "Both (%1)"
msgstr "Obie (%1)"
-#: Merge.rc:2234
+#: Merge.rc:2238
#, c-format
msgid "Left (%1 of %2)"
msgstr "Lewa (%1 z %2)"
-#: Merge.rc:2235
+#: Merge.rc:2239
#, c-format
msgid "Right (%1 of %2)"
msgstr "Prawa (%1 z %2)"
-#: Merge.rc:2236
+#: Merge.rc:2240
#, c-format
msgid "Both (%1 of %2)"
msgstr "Obie (%1 z %2)"
-#: Merge.rc:2237
+#: Merge.rc:2241
#, c-format
msgid "Select destination folder"
msgstr "Wybierz folder docelowy"
-#: Merge.rc:2242
+#: Merge.rc:2246
#, c-format
msgid "Left side - select destination folder:"
msgstr "Lewa strona - wybierz folder docelowy:"
-#: Merge.rc:2243
+#: Merge.rc:2247
#, c-format
msgid "Right side - select destination folder:"
msgstr "Prawa strona - wybierz folder docelowy:"
-#: Merge.rc:2244
+#: Merge.rc:2248
#, c-format
msgid "(%1 Files Affected)"
msgstr "(%1 obj\xEAtych plik\xF3w)"
-#: Merge.rc:2245
+#: Merge.rc:2249
#, c-format
msgid "(%1 of %2 Files Affected)"
msgstr "(%1 z %2 obj\xEAtych plik\xF3w)"
-#: Merge.rc:2251
+#: Merge.rc:2255
#, c-format
msgid ""
"Are you sure you want to delete\n"
@@ -4153,17 +4174,17 @@
"\n"
"%1 ?"
-#: Merge.rc:2252
+#: Merge.rc:2256
#, c-format
msgid "Are you sure you want to copy:"
msgstr "Czy na pewno skopiowa\xE6:"
-#: Merge.rc:2253
+#: Merge.rc:2257
#, c-format
msgid "Are you sure you want to copy %d items:"
msgstr "Czy na pewno skopiowa\xE6 %d element\xF3w:"
-#: Merge.rc:2254
+#: Merge.rc:2258
#, c-format
msgid ""
"Operation aborted!\n"
@@ -4182,498 +4203,488 @@
"\n"
"Prosz\xEA od\x9Cwie\xBFy\xE6 por\xF3wnanie."
-#: Merge.rc:2255
+#: Merge.rc:2259
#, c-format
msgid "Are you sure you want to move:"
msgstr "Czy na pewno przenie\x9C\xE6:"
-#: Merge.rc:2256
+#: Merge.rc:2260
#, c-format
msgid "Are you sure you want to move %d items:"
msgstr "Czy na pewno przenie\x9C\xE6 %d element\xF3w:"
-#: Merge.rc:2258
+#: Merge.rc:2262
#, c-format
msgid "Confirm Move"
msgstr "Potwierdzenie przenoszenia"
-#: Merge.rc:2264
+#: Merge.rc:2268
#, c-format
msgid "Open left file"
msgstr "Otw\xF3rz lewy plik"
-#: Merge.rc:2265
+#: Merge.rc:2269
#, c-format
msgid "Open the left file to external editor"
msgstr "Otw\xF3rz lewy plik w zewn\xEAtrznym edytorze"
-#: Merge.rc:2266
+#: Merge.rc:2270
#, c-format
msgid "Open left file with ..."
msgstr "Otw\xF3rz lewy plik w..."
-#: Merge.rc:2267
+#: Merge.rc:2271
#, c-format
msgid "Open right file"
msgstr "Otw\xF3rz prawy plik"
-#: Merge.rc:2268
+#: Merge.rc:2272
#, c-format
msgid "Open the right file to external editor"
msgstr "Otw\xF3rz prawy plik w zewn\xEAtrznym edytorze"
-#: Merge.rc:2269
+#: Merge.rc:2273
#, c-format
msgid "Open right file with..."
msgstr "Otw\xF3rz prawy plik w..."
-#: Merge.rc:2270
+#: Merge.rc:2274
#, c-format
msgid "Failed to execute external editor: %1"
msgstr "Nie mo\xBFna uruchomi\xE6 zewn\xEAtrznego edytora: %1"
-#: Merge.rc:2271
+#: Merge.rc:2275
#, c-format
msgid "Unknown extension on external editor: %1"
msgstr "Nieznane rozszerzenie dla zewn\xEAtrznego edytora: %1"
-#: Merge.rc:2272
+#: Merge.rc:2276
#, c-format
msgid "Copy filenames to clipboard"
msgstr "Kopiuj nazwy plik\xF3w do schowka"
-#: Merge.rc:2273
+#: Merge.rc:2277
#, c-format
msgid "Copy left side pathnames to clipboard"
msgstr "Kopiuj \x9Ccie\xBFki z lewej do schowka"
-#: Merge.rc:2274
+#: Merge.rc:2278
#, c-format
msgid "Copy right side pathnames to clipboard"
msgstr "...
[truncated message content] |
|
From: <ge...@us...> - 2009-09-16 18:09:01
|
Revision: 6990
http://winmerge.svn.sourceforge.net/winmerge/?rev=6990&view=rev
Author: gerundt
Date: 2009-09-16 18:08:46 +0000 (Wed, 16 Sep 2009)
Log Message:
-----------
Add Dutch website translation by Thomas De Rocker
Added Paths:
-----------
trunk/Translations/Web/nl.po
Added: trunk/Translations/Web/nl.po
===================================================================
--- trunk/Translations/Web/nl.po (rev 0)
+++ trunk/Translations/Web/nl.po 2009-09-16 18:08:46 UTC (rev 6990)
@@ -0,0 +1,1426 @@
+# This file is part from WinMerge <http://winmerge.org/>
+# Released under the "GNU General Public License"
+#
+# Maintainer:
+# * Thomas De Rocker <tho...@ya...
+#
+# ID line follows -- this is updated by SVN
+# $Id$
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: WinMerge site\n"
+"Report-Msgid-Bugs-To: http://bugs.winmerge.org\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2009-09-16 19:57+0100\n"
+"Last-Translator: Thomas De Rocker <tho...@ya...>\n"
+"Language-Team: Dutch\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Dutch\n"
+"X-Poedit-Country: BELGIUM\n"
+"X-Poedit-Basepath: ../../Web/\n"
+
+#: downloads\index.php:69
+msgid "(by PortableApps.com)"
+msgstr "(door PortableApps.com)"
+
+#: index.php:20
+msgid "<a href=\"%1$s\">Learn More</a> or <a href=\"%2$s\">Download Now!</a>"
+msgstr "<a·href=\"%1$s\">Meer informatie</a>·of·<a·href=\"%2$s\">nu downloaden!</a>"
+
+#: index.php:27
+msgid "<a href=\"%1$s\">WinMerge %2$s</a> is the latest stable version, and is recommended for most users."
+msgstr "<a·href=\"%1$s\">WinMerge·%2$s</a>·is·de laatste stabiele versie, en wordt aangeraden voor de meeste gebruikers."
+
+#: 404.php:23
+msgid "<a href=\"%s\">Change Log</a>?"
+msgstr "<a href=\"%s\">Lijst van aanpassingen</a>?"
+
+#: 404.php:19
+msgid "<a href=\"%s\">Documentation</a>?"
+msgstr "<a href=\"%s\">Documentatie</a>?"
+
+#: 404.php:26
+msgid "<a href=\"%s\">Downloads</a>?"
+msgstr "<a href=\"%s\">Downloads</a>?"
+
+#: 404.php:21
+msgid "<a href=\"%s\">Manual</a>?"
+msgstr "<a href=\"%s\">Handleiding</a>?"
+
+#: about\index.php:58
+msgid "<a href=\"%s\">Online manual</a> and installed HTML Help manual"
+msgstr "<a href=\"%s\">Online handleiding</a> en geïnstalleerde html-handleiding"
+
+#: 404.php:22
+msgid "<a href=\"%s\">Release Notes</a>?"
+msgstr "<a href=\"%s\">Vrijgave-opmerkingen</a>?"
+
+#: 404.php:18
+msgid "<a href=\"%s\">Screenshots</a>?"
+msgstr "<a href=\"%s\">Screenshots</a>?"
+
+#: 404.php:27
+msgid "<a href=\"%s\">Support</a>?"
+msgstr "<a href=\"%s\">Ondersteuning</a>?"
+
+#: 404.php:28
+msgid "<a href=\"%s\">Translations</a>?"
+msgstr "<a href=\"%s\">Vertalingen</a>?"
+
+#: support\tracker-shortcuts.php:10
+msgid "<em>Tracker Shortcuts</em> are shorter and nicer URLs to <a href=\"%1$s\">Tracker</a> items from our <a href=\"%2$s\">SF.net project page</a>."
+msgstr "<em>Tracker-koppelingen</em> zijn kortere en leukere URLs om items te <a href=\"%1$s\">tracken</a> van onze <a href=\"%2$s\">SF.net projectpagina</a>."
+
+#: downloads\index.php:28
+#: downloads\index.php:34
+#: downloads\plugins.php:22
+#: downloads\source-code.php:18
+msgid "7z-Format (%s MB)"
+msgstr "7z-formaat (%s MB)"
+
+#: downloads\plugins.php:10
+msgid "7-Zip Plugin"
+msgstr "7-Zip plugin"
+
+#: support\index.php:12
+msgid "A other way is a subscription to the <a href=\"%s\">support mailing list</a>."
+msgstr "Een andere manier is een abonnement op de <a href=\"%s\">ondersteuning-mailinglijst </a>."
+
+#: engine\page.inc:262
+msgid "About"
+msgstr "Over"
+
+#: about\index.php:7
+#: about\index.php:10
+#: engine\page.inc:262
+#: engine\page.inc:288
+msgid "About WinMerge"
+msgstr "Over WinMerge"
+
+#: downloads\index.php:60
+msgid "Admin rights for the installer"
+msgstr "Administratorrechten voor het installatiebestand"
+
+#: support\mailing-lists.php:12
+#: support\mailing-lists.php:20
+msgid "Announce List"
+msgstr "Aankondigingslijst"
+
+#: support\mailing-lists.php:25
+#: support\mailing-lists.php:35
+#: support\mailing-lists.php:45
+#: support\mailing-lists.php:55
+#: support\mailing-lists.php:65
+#: support\mailing-lists.php:75
+msgid "Archive"
+msgstr "Archief"
+
+#: about\index.php:55
+msgid "Archive file support using 7-Zip"
+msgstr "Archiefbestand-ondersteuning met behulp van 7-Zip"
+
+#: downloads\index.php:67
+msgid "Beta Versions"
+msgstr "Bèta-versies"
+
+#: downloads\index.php:25
+#: downloads\plugins.php:20
+msgid "Binaries"
+msgstr "Binaries"
+
+#: engine\page.inc:369
+msgid "Bookmark this on Delicious"
+msgstr "Bladwijzer aanmaken op Delicious"
+
+#: support\tracker-shortcuts.php:13
+msgid "Bug"
+msgstr "Bug"
+
+#: support\index.php:39
+msgid "But please consider making a <a href=\"%s\">donation</a> to support the continued development of WinMerge."
+msgstr "Gelieve te overwegen om een <a href=\"%s\">donatie</a> te maken om de voortgezette ontwikkeling van Winmerge te ondersteunen."
+
+#: about\index.php:42
+msgid "Can show folder compare results in a tree-style view"
+msgstr "Kan mapvergelijkingsresultaten weergeven in een boomweergave"
+
+#: about\history.php:20
+#: docs\changelog.php:7
+#: docs\changelog.php:8
+#: docs\index.php:14
+#: engine\page.inc:298
+msgid "Change Log"
+msgstr "Lijst met aanpassingen"
+
+#: downloads\pad-file.php:90
+msgid "Company"
+msgstr "Onderneming"
+
+#: about\index.php:41
+msgid "Compares one folder or includes all subfolders"
+msgstr "Vergelijkt een map of met eventueel alle submappen"
+
+#: downloads\pad-file.php:94
+msgid "Contact"
+msgstr "Contact"
+
+#: about\index.php:47
+msgid "Creates patch files (Normal-, Context- and Unified formats)"
+msgstr "Maakt patch-bestanden (Normal-, context- en Unified-formaten)"
+
+#: downloads\source-code.php:37
+msgid "Developer Version"
+msgstr "Ontwikkelingsversie"
+
+#: index.php:45
+msgid "Developers"
+msgstr "Ontwikkelaars"
+
+#: support\mailing-lists.php:16
+#: support\mailing-lists.php:60
+msgid "Development List"
+msgstr "Ontwikkelingslijst"
+
+#: docs\index.php:16
+#: engine\page.inc:299
+msgid "Development Wiki"
+msgstr "Ontwikkelingswiki"
+
+#: about\index.php:32
+msgid "Difference pane shows current difference in two vertical panes"
+msgstr "Verschilpaneel toont het huidige verschil in twee verticale panelen"
+
+#: engine\page.inc:309
+msgid "Discussion Forums"
+msgstr "Discussieforums"
+
+#: docs\index.php:7
+#: docs\index.php:9
+#: engine\page.inc:263
+msgid "Documentation"
+msgstr "Documentatie"
+
+#: docs\index.php:5
+msgid "Documentation from WinMerge like manual, release notes, change log and Development Wiki."
+msgstr "Documentatie van WinMerge zoals handleiding, vrijgave-opmerkingen, lijst van aanpassingen en ontwikkelingswiki."
+
+#: engine\page.inc:313
+#: support\index.php:37
+msgid "Donate"
+msgstr "Doneer"
+
+#: engine\page.inc:313
+msgid "Donate money to WinMerge"
+msgstr "Geld doneren aan WinMerge"
+
+#: downloads\pad-file.php:42
+msgid "Download"
+msgstr "Downloaden"
+
+#: downloads\plugins.php:5
+msgid "Download additional plugins for WinMerge, like the 7-Zip plugin or the xdocdiff Plugin."
+msgstr "Extra plugins voor WinMerge downloaden, zoals de 7-Zip plugin of de xdocdiff-plugin."
+
+#: engine\page.inc:230
+msgid "Download Now!"
+msgstr "Nu downloaden!"
+
+#: downloads\plugins.php:7
+#: downloads\plugins.php:9
+msgid "Download Plugins"
+msgstr "Plugins downloaden"
+
+#: downloads\source-code.php:7
+#: downloads\source-code.php:10
+msgid "Download Source Code"
+msgstr "Broncode downloaden"
+
+#: downloads\index.php:7
+msgid "Download the current WinMerge version %1$s, which was released at %2$s. For detailed info on what is new, read the change log and the release notes."
+msgstr "Download de huidige WinMerge-versie %1$s, die uitgebracht werd op %2$s. Voor gedetailleerde informatie over wat nieuw is, kan u de lijst van aanpassingen en vrijgave-opmerkingen lezen."
+
+#: downloads\source-code.php:5
+msgid "Download the source code of WinMerge, which is released under the GNU General Public License."
+msgstr "Download de broncode van WinMerge, die vrijgegeven is onder de GNU General Public License."
+
+#: downloads\index.php:10
+#: downloads\index.php:12
+#: engine\page.inc:302
+msgid "Download WinMerge"
+msgstr "WinMerge downloaden"
+
+#: engine\page.inc:303
+msgid "Download WinMerge Plugins"
+msgstr "WinMerge-plugins downloaden"
+
+#: engine\page.inc:304
+msgid "Download WinMerge Source Code"
+msgstr "Broncode van WinMerge downloaden"
+
+#: engine\page.inc:264
+msgid "Downloads"
+msgstr "Downloads"
+
+#: engine\engine.inc:22
+msgid "Dutch"
+msgstr "Nederlands"
+
+#: engine\engine.inc:19
+#: translations\index.php:24
+msgid "English"
+msgstr "Engels"
+
+#: translations\translations_branch.inc:104
+msgid "English (Template)"
+msgstr "Engels (Template)"
+
+#: downloads\pad-file.php:58
+#: downloads\pad-file.php:60
+#: downloads\pad-file.php:62
+msgid "English Description (%d chars)"
+msgstr "Engelse beschrijving (%d tekens)"
+
+#: downloads\pad-file.php:56
+msgid "English Descriptions"
+msgstr "Engels beschrijvingen"
+
+#: downloads\pad-file.php:64
+msgid "English Keywords"
+msgstr "Engelse trefwoorden"
+
+#: 404.php:9
+msgid "Error 404 (Page Not Found)"
+msgstr "Fout 404 (pagina niet gevonden)"
+
+#: downloads\index.php:22
+#: downloads\plugins.php:17
+msgid "Exe-Format (%s MB)"
+msgstr "Exe-formaat (%s MB)"
+
+#: downloads\index.php:68
+msgid "Experimental Builds"
+msgstr "Experimentele builds"
+
+#: about\index.php:40
+msgid "Fast compare using file sizes and dates"
+msgstr "Snel vergelijken door middel van bestandsgroottes en datums"
+
+#: support\tracker-shortcuts.php:16
+msgid "Feature Request"
+msgstr "Functie-aanvraag"
+
+#: about\index.php:15
+msgid "Features"
+msgstr "Functies"
+
+#: about\index.php:27
+msgid "File Compare"
+msgstr "Bestandsvergelijking"
+
+#: about\screenshots\index.php:14
+msgid "File compare window is basically two files opened to editor into two horizontal panes. Editing allows user to easily do small changes without need to open files to other editor or development environment."
+msgstr "Het bestandsvergelijkingsvenstervenster is in principe twee bestanden geopend in een editor in twee horizontale vensters. Het bewerken staat gebruikers toe om gemakkelijk kleine aanpassingen te doen zonder dat bestanden geopend moeten worden door een andere editor of ontwikkelomgeving."
+
+#: index.php:15
+#: about\index.php:66
+#: about\screenshots\index.php:12
+#: about\screenshots\index.php:13
+msgid "File Comparison"
+msgstr "Bestandsvergelijking"
+
+#: translations\translations.inc:41
+msgid "File not found."
+msgstr "Bestand niet gevonden."
+
+#: translations\translations.inc:38
+msgid "File not valid."
+msgstr "Bestand niet geldig."
+
+#: about\index.php:30
+msgid "Flexible editor with syntax highlighting, line numbers and word-wrap"
+msgstr "Flexibele editor met syntax highlighting, lijn-nummers en woord-wrap"
+
+#: about\index.php:37
+msgid "Folder Compare"
+msgstr "Mapvergelijking"
+
+#: about\screenshots\index.php:20
+msgid "Folder compare shows all files and subfolders found from compared folders as list. Folder compare allows synchronising folders by copying and deleting files and subfolders. Folder compare view can be versatile customised."
+msgstr "Mapvergelijking toont alle bestanden en submappen gevonden van vergeleken mappen als lijst. Mapvergelijken laat toe om mappen te synchroniseren door submappen en bestanden te kopiëren en verwijderen. De mapvergelijkingsweergave kan veelzijdig aangepast worden."
+
+#: about\screenshots\index.php:21
+#: about\screenshots\index.php:22
+msgid "Folder Compare Tree View"
+msgstr "Boomweergave mapvergelijking"
+
+#: about\index.php:67
+#: about\screenshots\index.php:18
+#: about\screenshots\index.php:19
+msgid "Folder Comparison Results"
+msgstr "Mapvergelijkingsresultaten"
+
+#: downloads\index.php:16
+msgid "For detailed info on what is new, read the <a href=\"%1$s\">change log</a> and the <a href=\"%2$s\">release notes</a>."
+msgstr "Voor gedetailleerde informatie over wat nieuw is, lees de <a href=\"%1$s\">lijst van aanpassingen</a> en de <a href=\"%2$s\">vrijgave-opmerkingen</a>."
+
+#: about\index.php:77
+msgid "For information on using WinMerge, see our <a href=\"%s\">online Manual</a>, or you can use the local help file (just press <code>F1</code> inside WinMerge) for offline use."
+msgstr "Voor informatie over het gebruik van WinMerge, zie onze <a href=\"%s\">online handleiding</a>, of u kan het lokale helpbestand gebruiken (druk op <code>F1</code> binnen Winmerge) voor offline gebruik."
+
+#: downloads\plugins.php:32
+msgid "For more details and the download go to the <a href=\"%s\">xdocdiff plugin homepage</a>."
+msgstr "Voor meer details en de download, ga naar de <a href=\"%s\">homepage van de xdocdiff-plugin</a>."
+
+#: about\index.php:74
+msgid "For more information, please see the <a href=\"%1$s\">Installation section</a> of the <a href=\"%2$s\">Manual</a>."
+msgstr "Voor meer informatie, gelieve de <a href=\"%1$s\">installatie-sectie</a> van de <a href=\"%2$s\">handleiding</a> te lezen."
+
+#: 404.php:12
+msgid "For some reason (mis-typed URL, faulty referral from another site, out-of-date search engine listing or we simply deleted a file) the page you were looking for could not be found."
+msgstr "Om een of andere reden (verkeerd getypte URL, foute referentie vanaf een andere site, verouderde zoekmachine-lijst of doordat we gewoon een bestand gewist hebben) kon de pagina waar u naar zocht niet gevonden worden."
+
+#: engine\engine.inc:21
+msgid "French"
+msgstr "Frans"
+
+#: translations\translations.inc:83
+#: translations\translations.inc:96
+#: translations\translations.inc:134
+#: translations\translations_branch.inc:51
+#: translations\translations_branch.inc:69
+#: translations\translations_branch.inc:119
+msgid "Fuzzy"
+msgstr "Fuzzy"
+
+#: translations\translations.inc:83
+#: translations\translations_branch.inc:51
+msgid "Fuzzy: %d%%"
+msgstr "Fuzzy: %d%%"
+
+#: about\index.php:19
+msgid "General"
+msgstr "Algemeen"
+
+#: support\tracker-shortcuts.php:37
+msgid "Generate"
+msgstr "Genereren"
+
+#: engine\engine.inc:20
+msgid "German"
+msgstr "Duits"
+
+#: about\license.php:14
+msgid "GNU General Public License"
+msgstr "GNU General Public License"
+
+#: about\license.php:34
+msgid "GNU General Public License v2.0"
+msgstr "GNU General Public License v2.0"
+
+#: support\index.php:15
+msgid "Good information in a bug report makes it more likely that your bug will be fixed quickly."
+msgstr "Goeie informatie in een bugrapport zorgt voor een snellere oplossing van uw bug."
+
+#: translations\translations.inc:132
+#: translations\translations_branch.inc:67
+msgid "Graph"
+msgstr "Grafiek"
+
+#: about\index.php:22
+msgid "Handles Windows, Unix and Mac text file formats"
+msgstr "Werkt met tekstformaten van Windows, Unix en Mac"
+
+#: about\index.php:78
+msgid "Here is the current <a href=\"%s\">change log</a>."
+msgstr "Hier is de huidige <a href=\"%s\">lijst met wijzigingen</a>."
+
+#: support\mailing-lists.php:72
+msgid "High Traffic"
+msgstr "Druk verkeer"
+
+#: about\screenshots\index.php:24
+#: about\screenshots\index.php:25
+msgid "Highlight Line Diff"
+msgstr "Regelverschil markeren"
+
+#: about\index.php:31
+msgid "Highlights differences inside lines"
+msgstr "Markeert verschillen binnen regels"
+
+#: about\history.php:7
+#: about\history.php:9
+#: engine\page.inc:290
+msgid "History"
+msgstr "Geschiedenis"
+
+#: about\history.php:5
+msgid "History of WinMerge releases with version numbers, release dates and manuals."
+msgstr "Geschiedenis van WinMerge releases met versienummers, vrijgavedatums en handleidingen."
+
+#: engine\page.inc:261
+msgid "Home"
+msgstr "Home"
+
+#: downloads\pad-file.php:78
+msgid "Icon"
+msgstr "Icoon"
+
+#: support\tracker-shortcuts.php:41
+msgid "ID:"
+msgstr "ID:"
+
+#: index.php:47
+msgid "If you are interested in contributing work to the project, see our <a href=\"%s\">developer page</a> for further information on how you may contribute."
+msgstr "Als u geïnteresseerd bent in het bijdragen van werk aan het project, zie onze <a href=\"%s\">pagina van ontwikkelaars</a> voor verdere informatie over hoe u kan bijdragen."
+
+#: downloads\pad-file.php:14
+msgid "If you can not work with the <a href=\"%s\">PAD file</a>, you can use the following informations:"
+msgstr "Als u niet kan werken met het <a href=\"%s\">PAD-bestand</a>, kan u de volgende toelichtingen gebruiken:"
+
+#: support\index.php:13
+msgid "If you find a bug, please submit it as a <a href=\"%s\">bug report</a>."
+msgstr "Als u een bug vindt, gelieve hem in te zenden als een <a href=\"%s\">bugrapport</a>."
+
+#: index.php:43
+msgid "If you need support, look at our <a href=\"%s\">support page</a> for more information how you can get it."
+msgstr ""
+
+#: translations\index.php:32
+msgid "If you would like to update any of these translations or add another translation, then please follow <a href=\"%s\">these instructions</a>."
+msgstr ""
+
+#: about\index.php:16
+msgid "In addition, WinMerge has many helpful supporting features that make comparing, synchronising, and merging as easy and useful as possible:"
+msgstr ""
+
+#: index.php:48
+msgid "In addition, WinMerge is translated into a number of different languages. See our <a href=\"%s\">information on translating WinMerge</a> into your own language."
+msgstr ""
+
+#: about\screenshots\index.php:23
+msgid "In the tree view, folders are expandable and collapsible, containing files and subfolders. This is useful for an easier navigation in deeply nested directory structures. <em>The tree view is available only in recursive compares."
+msgstr ""
+
+#: engine\page.inc:283
+#: engine\page.inc:288
+#: engine\page.inc:294
+#: engine\page.inc:308
+#: engine\page.inc:316
+msgid "Index"
+msgstr "Index"
+
+#: downloads\pad-file.php:74
+msgid "Information"
+msgstr "Informatie"
+
+#: about\index.php:71
+msgid "Installation"
+msgstr "Installatie"
+
+#: downloads\index.php:20
+#: downloads\plugins.php:15
+msgid "Installer"
+msgstr "Installatiebestand"
+
+#: engine\page.inc:317
+msgid "Instructions"
+msgstr "Instructies"
+
+#: downloads\index.php:70
+msgid "Japanese WinMerge Version"
+msgstr "Japanse WinMerge-versie"
+
+#: about\index.php:72
+msgid "Just download the <a href=\"%s\">installer</a> and double-click it."
+msgstr ""
+
+#: engine\page.inc:297
+msgid "Known Issues"
+msgstr "Gekende problemen"
+
+#: translations\translations.inc:131
+#: translations\translations.inc:288
+#: translations\translations_branch.inc:66
+#: translations\translations_branch.inc:182
+msgid "Language"
+msgstr "Taal"
+
+#: translations\translations.inc:136
+#: translations\translations_branch.inc:71
+msgid "Last Update"
+msgstr "Laatste update"
+
+#: about\license.php:7
+#: about\license.php:9
+#: engine\page.inc:291
+msgid "License"
+msgstr "Licentie"
+
+#: about\license.php:30
+#: engine\page.inc:284
+msgid "Links"
+msgstr "Links"
+
+#: about\index.php:57
+msgid "Localizable interface"
+msgstr "Interface met aanpasbare taal"
+
+#: about\screenshots\index.php:27
+#: about\screenshots\index.php:28
+msgid "Location Pane"
+msgstr "Locatievenster"
+
+#: about\screenshots\index.php:29
+msgid "Location pane is a handy side-pane showing a overall (difference) map of files compared."
+msgstr "Het locatievenster is een handig zij-venster dat de globale (verschil)-map weergeeft van de vergeleken bestanden."
+
+#: about\index.php:33
+msgid "Location pane shows map of files compared"
+msgstr ""
+
+#: support\mailing-lists.php:22
+#: support\mailing-lists.php:52
+msgid "Low Traffic"
+msgstr "Laag verkeer"
+
+#: engine\page.inc:310
+#: support\mailing-lists.php:7
+#: support\mailing-lists.php:9
+msgid "Mailing Lists"
+msgstr "Maillijsten"
+
+#: about\history.php:19
+#: docs\index.php:10
+#: engine\page.inc:295
+msgid "Manual"
+msgstr "Handleiding"
+
+#: about\screenshots\index.php:26
+msgid "Many times it is useful to see exact differences inside lines. WinMerge can highlight different areas between lines."
+msgstr ""
+
+#: downloads\index.php:59
+msgid "Microsoft Visual C++ 2003 Runtime Components (included in the installer)"
+msgstr ""
+
+#: downloads\index.php:58
+msgid "Microsoft Windows 98/ME/2000/XP/2003/Vista/2008"
+msgstr ""
+
+#: index.php:16
+msgid "More Screenshots…"
+msgstr ""
+
+#: about\index.php:34
+msgid "Moved lines detection"
+msgstr ""
+
+#: downloads\pad-file.php:92
+msgid "Name"
+msgstr "Naam"
+
+#: support\mailing-lists.php:32
+#: support\mailing-lists.php:42
+#: support\mailing-lists.php:62
+msgid "Normal Traffic"
+msgstr "Normaal verkeer"
+
+#: about\license.php:35
+msgid "Open Source Software"
+msgstr "Open source software"
+
+#: about\screenshots\index.php:15
+#: about\screenshots\index.php:16
+msgid "Open-dialog"
+msgstr "Open-dialoog"
+
+#: downloads\pad-file.php:44
+msgid "Operating Systems"
+msgstr "Besturingssystemen"
+
+#: about\index.php:73
+msgid "Or you may simply unzip the <a href=\"%s\">binary zip package</a> into the desired location, and run <code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>)."
+msgstr ""
+
+#: about\index.php:52
+msgid "Other"
+msgstr "Andere"
+
+#: downloads\index.php:63
+msgid "Other Versions"
+msgstr "Andere versies"
+
+#: downloads\pad-file.php:7
+#: downloads\pad-file.php:9
+#: downloads\pad-file.php:80
+#: engine\page.inc:305
+msgid "PAD File"
+msgstr "PAD-bestand"
+
+#: 404.php:11
+msgid "Page Not Found..."
+msgstr "Pagina niet gevonden..."
+
+#: support\tracker-shortcuts.php:14
+msgid "Patch"
+msgstr "Patch"
+
+#: support\index.php:14
+msgid "Please attach as much information as you can: at a minimum, the version number of WinMerge that you are using. If you can, also attach a configuration log which, you can display by clicking <span class=\"guimenu\">Help</span> → <span class=\"guimenuitem\">Configuration</span> in the WinMerge window."
+msgstr ""
+
+#: about\index.php:56
+msgid "Plugin support"
+msgstr "Plugin-ondersteuning"
+
+#: engine\page.inc:303
+msgid "Plugins"
+msgstr "Plugins"
+
+#: downloads\index.php:9
+#: downloads\index.php:73
+msgid "Project File Releases"
+msgstr "Projectbestand-releases"
+
+#: index.php:8
+#: index.php:30
+msgid "Project News"
+msgstr "Projectnieuws"
+
+#: engine\page.inc:285
+msgid "Project Page"
+msgstr "Projectpagina"
+
+#: about\index.php:39
+msgid "Regular Expression based file filters allow excluding and including items"
+msgstr ""
+
+#: downloads\pad-file.php:38
+msgid "Release Date"
+msgstr "Vrijgave-datum"
+
+#: docs\index.php:12
+#: docs\releasenotes.php:7
+#: docs\releasenotes.php:10
+#: engine\page.inc:296
+msgid "Release Notes"
+msgstr "Vrijgave-opmerkingen"
+
+#: downloads\pad-file.php:40
+msgid "Release Status"
+msgstr "Vrijgave-status"
+
+#: downloads\index.php:55
+msgid "Requirements"
+msgstr "Vereisten"
+
+#: about\index.php:48
+msgid "Resolve conflict files"
+msgstr "Conflictbestanden oplossen"
+
+#: about\index.php:49
+msgid "Rudimentary Visual SourceSafe and Rational ClearCase integration"
+msgstr ""
+
+#: downloads\index.php:31
+msgid "Runtimes"
+msgstr "Runtimes"
+
+#: downloads\pad-file.php:76
+msgid "Screenshot"
+msgstr "Screenshot"
+
+#: about\index.php:64
+#: about\screenshots\index.php:7
+#: about\screenshots\index.php:9
+#: engine\page.inc:289
+msgid "Screenshots"
+msgstr "Screenshots"
+
+#: about\screenshots\index.php:5
+msgid "Screenshots from WinMerge features like file comparison, folder comparison results and location pane."
+msgstr ""
+
+#: about\index.php:69
+msgid "See the <a href=\"%s\">screenshots page</a> for more screenshots."
+msgstr ""
+
+#: downloads\index.php:40
+#: downloads\source-code.php:24
+msgid "SHA-1 Checksums"
+msgstr ""
+
+#: about\index.php:54
+msgid "Shell Integration (supports 64-bit Windows versions)"
+msgstr ""
+
+#: support\index.php:38
+msgid "Since WinMerge is an <a href=\"%s\">Open Source</a> project, you may use it free of charge."
+msgstr ""
+
+#: engine\page.inc:304
+msgid "Source Code"
+msgstr "Broncode"
+
+#: translations\instructions.php:15
+msgid "Source: %s"
+msgstr "Bron: %s"
+
+#: about\screenshots\index.php:30
+#: about\screenshots\index.php:31
+msgid "Splash Screen"
+msgstr "Welkomstvenster"
+
+#: translations\index.php:39
+msgid "Stable Version (Branch)"
+msgstr "Stabiele versie (Branch)"
+
+#: downloads\index.php:66
+msgid "Stable Versions"
+msgstr "Stabiele versies"
+
+#: translations\index.php:36
+msgid "Status"
+msgstr "Status"
+
+#: engine\page.inc:318
+msgid "Status (Stable Branch)"
+msgstr "Status (stabiele branch)"
+
+#: engine\page.inc:319
+msgid "Status (Unstable Trunk)"
+msgstr "Status (onstabiele trunk)"
+
+#: support\tracker-shortcuts.php:55
+msgid "Subdomains"
+msgstr "Subdomeinen"
+
+#: support\mailing-lists.php:23
+#: support\mailing-lists.php:33
+#: support\mailing-lists.php:43
+#: support\mailing-lists.php:53
+#: support\mailing-lists.php:63
+#: support\mailing-lists.php:73
+msgid "Subscribe"
+msgstr "Inschrijven"
+
+#: support\mailing-lists.php:5
+msgid "Subscribe or unsubscribe to one of the following mailing lists: Announce, Support, User, Translate, Development and SVN"
+msgstr ""
+
+#: support\mailing-lists.php:77
+msgid "Subscribers to this list get notices of each and every code change commited to Subversion."
+msgstr ""
+
+#: index.php:42
+#: downloads\pad-file.php:96
+#: engine\page.inc:265
+#: support\index.php:8
+#: support\index.php:10
+msgid "Support"
+msgstr "Ondersteuning"
+
+#: support\mailing-lists.php:13
+#: support\mailing-lists.php:30
+msgid "Support List"
+msgstr "Ondersteuningslijst"
+
+#: support\tracker-shortcuts.php:15
+msgid "Support Request"
+msgstr "Ondersteuningsaanvraag"
+
+#: downloads\pad-file.php:46
+msgid "Supported Languages"
+msgstr "Ondersteunde talen"
+
+#: about\index.php:21
+msgid "Supports Microsoft Windows 98/ME/2000/XP/2003/Vista/2008"
+msgstr "Ondersteunt Microsoft Windows 98/ME/2000/XP/2003/Vista/2008"
+
+#: support\mailing-lists.php:17
+#: support\mailing-lists.php:70
+msgid "SVN List"
+msgstr "SVN-lijst"
+
+#: engine\engine.inc:23
+msgid "Swedish"
+msgstr "Zweeds"
+
+#: about\index.php:24
+msgid "Tabbed interface"
+msgstr "Interface met tabs"
+
+#: translations\translations.inc:177
+msgid "Template"
+msgstr "Sjabloon"
+
+#: docs\index.php:13
+msgid "The <a href=\"%1$s\">release notes</a> are a short summary of important changes, enhancements, bug fixes and <a href=\"%2$s\">known issues</a> in the current WinMerge release."
+msgstr ""
+
+#: docs\index.php:15
+msgid "The <a href=\"%s\">change log</a> is a more complete list of changes in the last WinMerge releases."
+msgstr ""
+
+#: docs\index.php:17
+msgid "The <a href=\"%s\">Development Wiki</a> contains much information about the WinMerge development."
+msgstr ""
+
+#: docs\index.php:11
+msgid "The <a href=\"%s\">manual</a> explains how to use WinMerge, and documents its capabilities and limitations."
+msgstr ""
+
+#: support\index.php:11
+msgid "The <a href=\"%s\">Open Discussion forum</a> is the fastest way to get help. Please be patient, it may take some time for somebody to answer."
+msgstr ""
+
+#: docs\changelog.php:5
+msgid "The change log is a more complete list of changes in the last WinMerge releases."
+msgstr ""
+
+#: docs\changelog.php:11
+msgid "The change log is currently not available..."
+msgstr ""
+
+#: downloads\index.php:15
+msgid "The current WinMerge version is <strong>%1$s</strong> and was released at <strong>%2$s</strong>."
+msgstr ""
+
+#: downloads\pad-file.php:10
+msgid "The easiest way to get informations about the latest stable version from WinMerge for your web site is the <a href=\"%s\">Portable Application Description</a> file, which you find here:"
+msgstr ""
+
+#: downloads\pad-file.php:5
+msgid "The easiest way to get informations about the latest stable version from WinMerge for your web site is the Portable Application Description file, which you find here."
+msgstr ""
+
+#: downloads\index.php:52
+msgid "The easiest way to install WinMerge is to download and run the Installer. Read the <a href=\"%s\">online manual</a> for help using it."
+msgstr ""
+
+#: translations\index.php:37
+msgid "The following two pages inform you about the translations status of the stable and developer version of WinMerge:"
+msgstr ""
+
+#: support\index.php:6
+msgid "The Open Discussion forum is the fastest way to get help. A other way is a subscription to the support mailing list."
+msgstr ""
+
+#: about\license.php:33
+msgid "The Open Source Definition"
+msgstr "De definitie van Open Source"
+
+#: docs\releasenotes.php:5
+msgid "The release notes are a short summary of important changes, enhancements, bug fixes and known issues in the current WinMerge release."
+msgstr ""
+
+#: docs\releasenotes.php:11
+msgid "The release notes are currently not available..."
+msgstr ""
+
+#: downloads\source-code.php:33
+msgid "The source code is hosted on <a href=\"%1$s\">SourceForge.net</a> in a <a href=\"%2$s\">Subversion</a> repository."
+msgstr ""
+
+#: translations\instructions.php:9
+msgid "The translations instructions are currently not available..."
+msgstr ""
+
+#: translations\status_branch.php:18
+#: translations\status_trunk.php:18
+msgid "The translations status is currently not available..."
+msgstr ""
+
+#: index.php:49
+msgid "The WinMerge Development Team"
+msgstr ""
+
+#: downloads\plugins.php:11
+msgid "This is the 7-Zip plugin for WinMerge and the current version <strong>%1$s</strong> was released at <strong>%2$s</strong>."
+msgstr ""
+
+#: support\mailing-lists.php:67
+msgid "This is the list where participating developers of the WinMerge meet and discuss issues, code changes/additions, etc."
+msgstr ""
+
+#: support\mailing-lists.php:47
+msgid "This list is for user related questions. Having questions posted to this list may allow others having the same problem to solve it on their own."
+msgstr ""
+
+#: support\mailing-lists.php:27
+msgid "This list is only for announcing new releases of WinMerge."
+msgstr ""
+
+#: support\mailing-lists.php:57
+msgid "This list is used for coordinating the translations."
+msgstr ""
+
+#: about\license.php:10
+msgid ""
+"This means everybody can download the <a href=\"%s\">source code</a> and improve and modify it.\n"
+"The only thing we ask is that people submit their improvements and modifications back to us so that all WinMerge users may benefit."
+msgstr ""
+
+#: 404.php:13
+msgid "This site has recently undergone a major re-working, so that might explain why you got this page instead."
+msgstr ""
+
+#: translations\index.php:29
+msgid "To change language, select the desired language from the <span class=\"guimenu\">View</span>→ <span class=\"guimenuitem\">Language</span> menu choice."
+msgstr ""
+
+#: support\tracker-shortcuts.php:17
+msgid "Todo Item"
+msgstr "Item te doen"
+
+#: translations\translations.inc:180
+#: translations\translations_branch.inc:106
+msgid "Total: %d"
+msgstr "Totaal: %d"
+
+#: translations\translations.inc:182
+msgid "Total: Unknown"
+msgstr "Totaal: onbekend"
+
+#: engine\page.inc:311
+msgid "Tracker"
+msgstr "Tracker"
+
+#: support\tracker-shortcuts.php:18
+msgid "Tracker Item"
+msgstr "Tracker-item"
+
+#: engine\page.inc:312
+#: support\tracker-shortcuts.php:7
+#: support\tracker-shortcuts.php:9
+msgid "Tracker Shortcuts"
+msgstr "Tracker-snelkoppelingen"
+
+#: support\tracker-shortcuts.php:5
+msgid "Tracker Shortcuts are shorter and nicer URLs to Tracker items from our SF.net project page. And you can use this page to create a shortcut."
+msgstr ""
+
+#: support\index.php:21
+msgid "Tracker Statistics"
+msgstr "Tracker-statistieken"
+
+#: support\mailing-lists.php:15
+#: support\mailing-lists.php:50
+msgid "Translate List"
+msgstr "Vertaallijst"
+
+#: translations\translations.inc:81
+#: translations\translations.inc:95
+#: translations\translations.inc:133
+#: translations\translations_branch.inc:49
+#: translations\translations_branch.inc:68
+#: translations\translations_branch.inc:118
+msgid "Translated"
+msgstr "Vertaald"
+
+#: translations\translations.inc:81
+#: translations\translations_branch.inc:49
+msgid "Translated: %d%%"
+msgstr "Vertaald: %d%%"
+
+#: translations\index.php:31
+msgid "Translating"
+msgstr "Vertalen"
+
+#: engine\page.inc:266
+#: translations\index.php:8
+#: translations\index.php:10
+msgid "Translations"
+msgstr "Vertalingen"
+
+#: translations\instructions.php:5
+#: translations\instructions.php:8
+msgid "Translations instructions"
+msgstr "Vertaalinstructies"
+
+#: translations\index.php:6
+#: translations\status_branch.php:7
+#: translations\status_branch.php:10
+msgid "Translations Status (Stable Branch)"
+msgstr "Vertaalinstructies (stabiele branch)"
+
+#: translations\index.php:7
+#: translations\status_trunk.php:7
+#: translations\status_trunk.php:9
+msgid "Translations Status (Unstable Trunk)"
+msgstr "Vertaalinstructies (instabiele trunk)"
+
+#: translations\translations_branch.inc:183
+msgid "Translator(s)"
+msgstr "Vertaler(s)"
+
+#: translations\status_branch.php:14
+#: translations\translations.inc:285
+msgid "Translators"
+msgstr "Vertalers"
+
+#: downloads\pad-file.php:48
+msgid "Type"
+msgstr "Type"
+
+#: support\tracker-shortcuts.php:23
+msgid "Type:"
+msgstr "Type:"
+
+#: about\index.php:23
+msgid "Unicode support"
+msgstr "Unicode-ondersteuning"
+
+#: translations\index.php:40
+msgid "Unstable Version (Trunk)"
+msgstr "Instabiele versie (Trunk)"
+
+#: support\mailing-lists.php:24
+#: support\mailing-lists.php:34
+#: support\mailing-lists.php:44
+#: support\mailing-lists.php:54
+#: support\mailing-lists.php:64
+#: support\mailing-lists.php:74
+msgid "Unsubscribe"
+msgstr "Uitschrijven"
+
+#: translations\translations.inc:85
+#: translations\translations.inc:97
+#: translations\translations.inc:135
+#: translations\translations_branch.inc:53
+#: translations\translations_branch.inc:70
+#: translations\translations_branch.inc:120
+msgid "Untranslated"
+msgstr "Onvertaald"
+
+#: translations\translations.inc:85
+#: translations\translations_branch.inc:53
+msgid "Untranslated: %d%%"
+msgstr "Onvertaald: %d%%"
+
+#: support\mailing-lists.php:14
+#: support\mailing-lists.php:40
+msgid "User List"
+msgstr "Lijst van gebruikers"
+
+#: about\index.php:76
+msgid "Using WinMerge"
+msgstr "WinMerge gebruiken"
+
+#: engine\page.inc:231
+msgid "Version %1$s; %2$s MB"
+msgstr "Versie %1$s; %2$s MB"
+
+#: about\index.php:45
+msgid "Version Control"
+msgstr "Versie-controle"
+
+#: downloads\index.php:90
+msgid "View all file releases…"
+msgstr "Bekijk alle bestanden releases…"
+
+#: index.php:39
+msgid "View all news…"
+msgstr "Bekijk alle news…"
+
+#: about\index.php:29
+msgid "Visual differencing and merging of text files"
+msgstr ""
+
+#: translations\index.php:11
+msgid "We currently have WinMerge translated into the languages listed below:"
+msgstr ""
+
+#: support\index.php:18
+msgid "We rarely sent direct emails but you will get notifications when we ask questions in the bug item."
+msgstr ""
+
+#: support\index.php:17
+msgid "We require registering because anonymous submissions caused a lot of spam and also because there were no possibility to contact people for asking more information."
+msgstr ""
+
+#: downloads\pad-file.php:72
+msgid "Web Addresses"
+msgstr "Web-adressen"
+
+#: 404.php:15
+msgid "Were you looking for..."
+msgstr ""
+
+#: index.php:13
+msgid "What is WinMerge?"
+msgstr ""
+
+#: engine\page.inc:302
+msgid "WinMerge"
+msgstr "WinMerge"
+
+#: downloads\index.php:13
+#: downloads\source-code.php:39
+msgid "WinMerge %s"
+msgstr "WinMerge %s"
+
+#: index.php:26
+msgid "WinMerge %s - latest stable version"
+msgstr "WinMerge %s - laatste stabiele versie"
+
+#: downloads\source-code.php:15
+msgid "WinMerge %s - Source Code"
+msgstr "WinMerge %s - Broncode"
+
+#: about\screenshots\index.php:32
+msgid "WinMerge 2.8 has a new professional looking splash screen."
+msgstr ""
+
+#: about\screenshots\index.php:17
+msgid "WinMerge allows selecting/opening paths in several ways. Using the Open-dialog is just one of them."
+msgstr ""
+
+#: engine\page.inc:298
+msgid "WinMerge Change Log"
+msgstr "Lijst van aanpassingen in Winmerge"
+
+#: engine\page.inc:299
+msgid "WinMerge Development Wiki"
+msgstr ""
+
+#: engine\page.inc:309
+msgid "WinMerge Discussion Forums"
+msgstr ""
+
+#: engine\page.inc:263
+#: engine\page.inc:294
+msgid "WinMerge Documentation"
+msgstr ""
+
+#: engine\page.inc:264
+msgid "WinMerge Downloads"
+msgstr ""
+
+#: engine\page.inc:290
+msgid "WinMerge History"
+msgstr ""
+
+#: engine\page.inc:261
+#: engine\page.inc:283
+msgid "WinMerge Home"
+msgstr ""
+
+#: about\license.php:10
+msgid "WinMerge is <a href=\"%1$s\">Open Source</a> software under the <a href=\"%2$s\">GNU General Public License</a>."
+msgstr ""
+
+#: index.php:19
+#: about\index.php:11
+msgid "WinMerge is an <a href=\"%s\">Open Source</a> differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle."
+msgstr ""
+
+#: index.php:6
+msgid "WinMerge is an Open Source differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle."
+msgstr ""
+
+#: index.php:46
+msgid "WinMerge is an open source project, which means that the program is maintained and developed by volunteers."
+msgstr ""
+
+#: about\index.php:5
+#: about\index.php:12
+msgid "WinMerge is highly useful for determining what has changed between project versions, and then merging changes between versions. WinMerge can be used as an external differencing/merging tool or as a standalone application."
+msgstr ""
+
+#: about\license.php:5
+msgid "WinMerge is Open Source software under the GNU General Public License. This means everybody can download the source code and improve and modify it."
+msgstr ""
+
+#: downloads\source-code.php:11
+msgid "WinMerge is released under the <a href=\"%s\">GNU General Public License</a>. That means you can get the whole source code and can build the program yourself."
+msgstr ""
+
+#: engine\page.inc:297
+msgid "WinMerge Known Issues"
+msgstr ""
+
+#: engine\page.inc:291
+msgid "WinMerge License"
+msgstr ""
+
+#: engine\page.inc:284
+msgid "WinMerge Links"
+msgstr ""
+
+#: engine\page.inc:310
+msgid "WinMerge Mailing Lists"
+msgstr ""
+
+#: engine\page.inc:295
+msgid "WinMerge Manual"
+msgstr ""
+
+#: engine\page.inc:305
+msgid "WinMerge PAD File"
+msgstr ""
+
+#: downloads\index.php:69
+msgid "WinMerge Portable"
+msgstr ""
+
+#: engine\page.inc:285
+msgid "WinMerge Project Page"
+msgstr ""
+
+#: engine\page.inc:296
+msgid "WinMerge Release Notes"
+msgstr ""
+
+#: engine\page.inc:289
+msgid "WinMerge Screenshots"
+msgstr ""
+
+#: engine\page.inc:265
+#: engine\page.inc:308
+msgid "WinMerge Support"
+msgstr ""
+
+#: engine\page.inc:311
+msgid "WinMerge Tracker"
+msgstr ""
+
+#: engine\page.inc:312
+msgid "WinMerge Tracker Shortcuts"
+msgstr ""
+
+#: engine\page.inc:266
+#: engine\page.inc:316
+msgid "WinMerge Translations"
+msgstr ""
+
+#: engine\page.inc:317
+msgid "WinMerge Translations Instructions"
+msgstr ""
+
+#: engine\page.inc:318
+msgid "WinMerge Translations Status (Stable Branch)"
+msgstr ""
+
+#: engine\page.inc:319
+msgid "WinMerge Translations Status (Unstable Trunk)"
+msgstr ""
+
+#: about\index.php:6
+msgid "WinMerge, about, features, file compare, folder compare, version control, screenshots, installation"
+msgstr ""
+
+#: docs\changelog.php:6
+msgid "WinMerge, change log, changes, release, tracker item, revision number"
+msgstr ""
+
+#: docs\index.php:6
+msgid "WinMerge, documentation, manual, release notes, known issues, change log, Development Wiki"
+msgstr ""
+
+#: downloads\plugins.php:6
+msgid "WinMerge, free, download, plugins, plugin, plug-in, setup, installer, binaries, 7-Zip, xdocdiff, Word, Excel, PowerPoint, PDF"
+msgstr ""
+
+#: downloads\source-code.php:6
+msgid "WinMerge, free, download, source code, GPL, Subversion, SVN, TortoiseSVN"
+msgstr ""
+
+#: downloads\index.php:8
+msgid "WinMerge, free, download, Windows, setup, installer, binaries, runtimes, stable, beta, experimental, portable"
+msgstr ""
+
+#: index.php:7
+msgid "WinMerge, free, open source, Windows, windiff, diff, merge, compare, tool, utility, text, file, folder, directory, compare files, compare folders, merge files, merge folders, diff tool, merge tool, compare tool"
+msgstr ""
+
+#: about\history.php:6
+msgid "WinMerge, history, version number, release date, manual, users guide"
+msgstr ""
+
+#: about\license.php:6
+msgid "WinMerge, license, open source, GNU General Public License, GPL, free software"
+msgstr ""
+
+#: support\mailing-lists.php:6
+msgid "WinMerge, mailing lists, announce, support, user, translate, development, SVN"
+msgstr ""
+
+#: downloads\pad-file.php:6
+msgid "WinMerge, PAD file, Portable Application Description"
+msgstr ""
+
+#: docs\releasenotes.php:6
+msgid "WinMerge, release notes, summary, changes, enhancements, bug fixes, known issues, release"
+msgstr ""
+
+#: about\screenshots\index.php:6
+msgid "WinMerge, screenshots, file comparison, open-dialog, folder comparison results, highlight line diff, location pane, splash screen"
+msgstr ""
+
+#: support\index.php:7
+msgid "WinMerge, support, discussion forums, mailing lists, tracker, donate, bugs, support requests, patches, feature requests, todo, open source, sourceforge.net"
+msgstr ""
+
+#: support\tracker-shortcuts.php:6
+msgid "WinMerge, tracker, shortcuts, sourceforge, project page, bug, patch, support request, feature request, todo item"
+msgstr ""
+
+#: support\index.php:19
+msgid "Wish list items on the <a href=\"%s\">feature request list</a> will also be considered, but we make absolutely no promises."
+msgstr ""
+
+#: downloads\plugins.php:31
+msgid "With this plugin you can compare Word, Excel, PowerPoint, PDF and some more files."
+msgstr ""
+
+#: about\history.php:45
+msgid "Withdrawn due to installer bug!"
+msgstr ""
+
+#: downloads\plugins.php:30
+msgid "xdocdiff Plugin"
+msgstr ""
+
+#: index.php:37
+#: downloads\index.php:88
+msgid "Y-m-d"
+msgstr ""
+
+#: downloads\source-code.php:34
+msgid "You can <a href=\"%1$s\">browse the source code</a> with a web browser or you can check out the whole code by clicking on one of the following links (if you have <a href=\"%2$s\">TortoiseSVN</a> installed):"
+msgstr ""
+
+#: downloads\index.php:53
+msgid "You can also download additional <a href=\"%1$s\">plugins</a> and the whole <a href=\"%2$s\">source code</a> from WinMerge."
+msgstr ""
+
+#: downloads\plugins.php:28
+msgid "You can also read the <a href=\"%1$s\">Release Notes</a> or search for <a href=\"%2$s\">other versions</a>."
+msgstr ""
+
+#: translations\index.php:33
+msgid "You can find a more technical view about the <a href=\"%1$s\">translation system</a> in our <a href=\"\"%2$s>Development Wiki</a>."
+msgstr ""
+
+#: support\tracker-shortcuts.php:11
+msgid "You can use this page to create a shortcut:"
+msgstr ""
+
+#: support\index.php:16
+msgid "You must <a href=\"%s\">register with SourceForge.net</a> before posting a bug report (registration is free)."
+msgstr ""
+
+#: support\mailing-lists.php:37
+msgid "You should ask all your support questions on this list."
+msgstr ""
+
+#: downloads\index.php:27
+#: downloads\index.php:33
+#: downloads\source-code.php:17
+msgid "Zip-Format (%s MB)"
+msgstr ""
+
Property changes on: trunk/Translations/Web/nl.po
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2009-09-16 18:03:59
|
Revision: 6989
http://winmerge.svn.sourceforge.net/winmerge/?rev=6989&view=rev
Author: gerundt
Date: 2009-09-16 18:03:25 +0000 (Wed, 16 Sep 2009)
Log Message:
-----------
Update German web PO file
Modified Paths:
--------------
trunk/Translations/Web/de.po
Modified: trunk/Translations/Web/de.po
===================================================================
--- trunk/Translations/Web/de.po 2009-09-15 12:29:31 UTC (rev 6988)
+++ trunk/Translations/Web/de.po 2009-09-16 18:03:25 UTC (rev 6989)
@@ -12,7 +12,7 @@
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2009-09-03 18:36+0100\n"
+"PO-Revision-Date: 2009-09-16 20:01+0100\n"
"Last-Translator: Tim Gerundt <tim at gerundt.de>\n"
"Language-Team: German <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@
#: downloads\source-code.php:33
#, c-format
msgid "The source code is hosted on <a href=\"%1$s\">SourceForge.net</a> in a <a href=\"%2$s\">Subversion</a> repository."
-msgstr ""
+msgstr "Der Quellcode ist bei <a href=\"%1$s\">SourceForge.net</a> in einem <a href=\"%2$s\">Subversion</a>-Repository gehostet."
#: about\license.php:35
#, c-format
@@ -65,17 +65,17 @@
#: support\index.php:15
#, c-format
msgid "Good information in a bug report makes it more likely that your bug will be fixed quickly."
-msgstr ""
+msgstr "Gute Informationen in einem Fehlerbericht machen es wahrscheinlich, dass Ihr Fehler schnell behoben wird."
#: about\index.php:30
#, c-format
msgid "Flexible editor with syntax highlighting, line numbers and word-wrap"
-msgstr ""
+msgstr "Flexibler Editor mit Syntaxhervorhebung, Zeilennummern und Zeilenumbruch"
#: about\index.php:22
#, c-format
msgid "Handles Windows, Unix and Mac text file formats"
-msgstr ""
+msgstr "Verarbeitet Windows-, Unix- und Mac-Textdateiformate"
#: engine\page.inc:312
#: support\tracker-shortcuts.php:7
@@ -108,7 +108,7 @@
#: about\index.php:39
#, c-format
msgid "Regular Expression based file filters allow excluding and including items"
-msgstr ""
+msgstr "Auf regulären Ausdrücken basierte Dateifilter ermöglichen das Ein- und Ausschließlichen von Objekten"
#: downloads\index.php:59
#, c-format
@@ -165,7 +165,7 @@
#: downloads\plugins.php:6
#, c-format
msgid "WinMerge, free, download, plugins, plugin, plug-in, setup, installer, binaries, 7-Zip, xdocdiff, Word, Excel, PowerPoint, PDF"
-msgstr ""
+msgstr "WinMerge, Frei, Download, Plugins, Plugin, Plug-In, Setup, Installer, Binärdateien, 7-Zip, xdocdiff, Word, Excel, PowerPoint, PDF"
#: translations\index.php:37
#, c-format
@@ -195,7 +195,7 @@
#: about\index.php:42
#, c-format
msgid "Can show folder compare results in a tree-style view"
-msgstr ""
+msgstr "Ordnervergleichs-Ergebnisse können in einer Baumansicht angezeigt werden"
#: about\index.php:16
#, c-format
@@ -218,7 +218,7 @@
#: support\mailing-lists.php:27
#, c-format
msgid "This list is only for announcing new releases of WinMerge."
-msgstr ""
+msgstr "Diese Liste ist nur für die Ankündigung neuer Versionen von WinMerge."
#: 404.php:19
#, c-format
@@ -316,7 +316,7 @@
#: about\index.php:41
#, c-format
msgid "Compares one folder or includes all subfolders"
-msgstr ""
+msgstr "Vergleicht ein Ordner oder auch alle Unterordner"
#: 404.php:12
#, c-format
@@ -327,7 +327,7 @@
#: about\index.php:11
#, c-format
msgid "WinMerge is an <a href=\"%s\">Open Source</a> differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle."
-msgstr ""
+msgstr "WinMerge ist ein <a href=\"%s\">Open-Source</a>-Programm zum Unterscheiden und Zusammenführen von Dateien sowie Ordner. Das Windows-Tool stellt Unterschiede in einem visuellen Text-Format dar, das einfach zu verstehen und zu handhaben ist."
#: support\index.php:18
#, c-format
@@ -353,12 +353,12 @@
#: downloads\index.php:53
#, c-format
msgid "You can also download additional <a href=\"%1$s\">plugins</a> and the whole <a href=\"%2$s\">source code</a> from WinMerge."
-msgstr ""
+msgstr "Sie können auch zusätzliche <a href=\"%1$s\">Plugins</a> und den gesamten <a href=\"%2$s\">Quelltext</a> von WinMerge herunterladen."
#: support\mailing-lists.php:57
#, c-format
msgid "This list is used for coordinating the translations."
-msgstr ""
+msgstr "Diese Liste wird für die Koordinierung der Übersetzungen verwendet."
#: about\license.php:30
#: engine\page.inc:284
@@ -396,7 +396,7 @@
#: support\index.php:11
#, c-format
msgid "The <a href=\"%s\">Open Discussion forum</a> is the fastest way to get help. Please be patient, it may take some time for somebody to answer."
-msgstr ""
+msgstr "Das englische <a href=\"%s\">Open Discussion</a>-Forum ist der schnellste Weg um Hilfe zu bekommen."
#: about\index.php:31
#, c-format
@@ -436,7 +436,7 @@
#: about\index.php:32
#, c-format
msgid "Difference pane shows current difference in two vertical panes"
-msgstr ""
+msgstr "Unterschiedsleiste zeigt Unterschiede in zwei vertikalen Fenstern"
#: engine\page.inc:317
#, c-format
@@ -451,7 +451,7 @@
#: index.php:48
#, c-format
msgid "In addition, WinMerge is translated into a number of different languages. See our <a href=\"%s\">information on translating WinMerge</a> into your own language."
-msgstr ""
+msgstr "Darüber hinaus ist WinMerge in einer Reihe verschiedener Sprachen übersetzt. Lesen Sie unsere Informationen zur <a href=\"%s\">Übersetzung von WinMerge</a> in Ihre eigene Sprache."
#: engine\engine.inc:19
#: translations\index.php:24
@@ -462,7 +462,7 @@
#: support\index.php:19
#, c-format
msgid "Wish list items on the <a href=\"%s\">feature request list</a> will also be considered, but we make absolutely no promises."
-msgstr ""
+msgstr "Wünsche auf der <a href=\"%s\">Funktionsanfragen-Liste</a> werden auch in Betracht gezogen, aber wir machen keinerlei Versprechen."
#: engine\engine.inc:23
#, c-format
@@ -530,7 +530,7 @@
#: engine\page.inc:311
#, c-format
msgid "Tracker"
-msgstr ""
+msgstr "Tracker"
#: about\index.php:67
#: about\screenshots\index.php:18
@@ -553,7 +553,7 @@
#: docs\changelog.php:5
#, c-format
msgid "The change log is a more complete list of changes in the last WinMerge releases."
-msgstr ""
+msgstr "Die Versionshistorie ist eine vollständigere Liste der Änderungen in den letzten WinMerge-Veröffentlichungen."
#: 404.php:15
#, c-format
@@ -563,7 +563,7 @@
#: downloads\index.php:8
#, c-format
msgid "WinMerge, free, download, Windows, setup, installer, binaries, runtimes, stable, beta, experimental, portable"
-msgstr ""
+msgstr "WinMerge, Frei, Download, Windows, Setup, Installer, Binärdateien, Laufzeitbibliotheken, Stabil, Beta, Experimentell, Portable"
#: downloads\pad-file.php:48
#, c-format
@@ -578,7 +578,7 @@
#: downloads\index.php:15
#, c-format
msgid "The current WinMerge version is <strong>%1$s</strong> and was released at <strong>%2$s</strong>."
-msgstr ""
+msgstr "Die aktuelle Version ist WinMerge <strong>%1$s</strong> und wurde am <strong>%2$s</strong> freigegeben."
#: about\index.php:21
#, c-format
@@ -598,7 +598,7 @@
#: support\index.php:16
#, c-format
msgid "You must <a href=\"%s\">register with SourceForge.net</a> before posting a bug report (registration is free)."
-msgstr ""
+msgstr "Sie müssen Sich bei <a href=\"%s\">SourceForge.net kostenlos registrieren</a>, bevor Sie einen Fehlerbericht einreichen können."
#: index.php:16
#, c-format
@@ -625,7 +625,7 @@
#: support\index.php:38
#, c-format
msgid "Since WinMerge is an <a href=\"%s\">Open Source</a> project, you may use it free of charge."
-msgstr ""
+msgstr "Da WinMerge ein <a href=\"%s\">Open-Source</a>-Projekt ist, können Sie es kostenlos verwenden."
#: engine\page.inc:285
#, c-format
@@ -659,17 +659,17 @@
#: engine\page.inc:311
#, c-format
msgid "WinMerge Tracker"
-msgstr ""
+msgstr "WinMerge Tracker"
#: support\mailing-lists.php:47
#, c-format
msgid "This list is for user related questions. Having questions posted to this list may allow others having the same problem to solve it on their own."
-msgstr ""
+msgstr "Diese Liste ist für anwenderbezogene Fragen. Wenn Sie Fragen auf dieser Liste stellen, können andere Benutzer, die das gleiche Problem auf eigene Faust gelöst haben, antworten."
#: downloads\index.php:7
#, c-format
msgid "Download the current WinMerge version %1$s, which was released at %2$s. For detailed info on what is new, read the change log and the release notes."
-msgstr ""
+msgstr "Laden Sie das aktuelle WinMerge %1$s herunter, welches am %2$s freigegeben wurde. Für detaillierte Informationen über die Änderungen lesen Sie die Versionshistorie und die Versionshinweise."
#: engine\page.inc:297
#, c-format
@@ -708,12 +708,12 @@
#: support\tracker-shortcuts.php:5
#, c-format
msgid "Tracker Shortcuts are shorter and nicer URLs to Tracker items from our SF.net project page. And you can use this page to create a shortcut."
-msgstr ""
+msgstr "Tracker-Abkürzungen sind kürzere und schönere URLs zu Tracker-Artikeln auf unserer SF.net Projekt-Seite. Sie können diese Seite nutzen, um eine Abkürzung zu erstellen."
#: support\tracker-shortcuts.php:18
#, c-format
msgid "Tracker Item"
-msgstr ""
+msgstr "Tracker-Eintrag"
#: translations\translations_branch.inc:183
#, c-format
@@ -753,7 +753,7 @@
#: about\license.php:6
#, c-format
msgid "WinMerge, license, open source, GNU General Public License, GPL, free software"
-msgstr ""
+msgstr "WinMerge, Lizenz, Open-Source, GNU General Public License, GPL, Freie Software"
#: downloads\pad-file.php:94
#, c-format
@@ -819,7 +819,7 @@
#: docs\index.php:5
#, c-format
msgid "Documentation from WinMerge like manual, release notes, change log and Development Wiki."
-msgstr ""
+msgstr "Dokumentation von WinMerge wie Handbuch, Versionshinweise, Versionshistorie und Entwickler-Wiki."
#: docs\index.php:15
#, c-format
@@ -844,12 +844,12 @@
#: downloads\index.php:16
#, c-format
msgid "For detailed info on what is new, read the <a href=\"%1$s\">change log</a> and the <a href=\"%2$s\">release notes</a>."
-msgstr ""
+msgstr "Für detaillierte Informationen über die Änderungen lesen Sie die <a href=\"%1$s\">Versionshistorie</a> und die <a href=\"%2$s\">Versionshinweise</a>."
#: support\mailing-lists.php:77
#, c-format
msgid "Subscribers to this list get notices of each and every code change commited to Subversion."
-msgstr ""
+msgstr "Abonnenten dieser Liste erhalten Nachrichten über jede Quelltext-Änderung im Subversion-Repository."
#: support\mailing-lists.php:14
#: support\mailing-lists.php:40
@@ -860,7 +860,7 @@
#: index.php:47
#, c-format
msgid "If you are interested in contributing work to the project, see our <a href=\"%s\">developer page</a> for further information on how you may contribute."
-msgstr ""
+msgstr "Wenn Sie sich für die Arbeit am Projekt interessiert sind, lesen Sie unsere <a href=\"%s\">Entwickler-Seite</a> für weitere Informationen, wie Sie beitragen können."
#: downloads\plugins.php:7
#: downloads\plugins.php:9
@@ -878,7 +878,7 @@
#: about\index.php:29
#, c-format
msgid "Visual differencing and merging of text files"
-msgstr ""
+msgstr "Visuelles Vergleichen und Zusammenführen von Textdateien"
#: engine\page.inc:285
#, c-format
@@ -937,7 +937,7 @@
#: support\tracker-shortcuts.php:11
#, c-format
msgid "You can use this page to create a shortcut:"
-msgstr ""
+msgstr "Sie können diese Seite nutzen, um eine Abkürzung zu erstellen:Sie können diese Seite nutzen, um eine Abkürzung zu erstellen:"
#: downloads\pad-file.php:5
#, c-format
@@ -963,7 +963,7 @@
#: downloads\index.php:52
#, c-format
msgid "The easiest way to install WinMerge is to download and run the Installer. Read the <a href=\"%s\">online manual</a> for help using it."
-msgstr ""
+msgstr "Der einfachste Weg WinMerge zu installieren ist, es herunterzuladen und das Installationsprogramm auszuführen. Lesen Sie das englische <a href=\"%s\">Online-Handbuch</a> für die Hilfe bei der Installation."
#: about\screenshots\index.php:23
#, c-format
@@ -982,7 +982,7 @@
#: about\index.php:72
#, c-format
msgid "Just download the <a href=\"%s\">installer</a> and double-click it."
-msgstr ""
+msgstr "Laden Sie einfach das <a href=\"%s\">Installationsprogramm</a> herunter, und doppelklicken Sie darauf."
#: downloads\source-code.php:34
#, c-format
@@ -992,7 +992,7 @@
#: downloads\source-code.php:5
#, c-format
msgid "Download the source code of WinMerge, which is released under the GNU General Public License."
-msgstr ""
+msgstr "Laden Sie den Quellcode von WinMerge herunter, welcher unter der GNU General Public License veröffentlicht ist."
#: translations\translations.inc:81
#: translations\translations.inc:95
@@ -1007,17 +1007,17 @@
#: index.php:46
#, c-format
msgid "WinMerge is an open source project, which means that the program is maintained and developed by volunteers."
-msgstr ""
+msgstr "WinMerge ist ein Open-Source-Projekt, was bedeutet, dass das Programm von Freiwilligen entwickelt und gewartet wird."
#: about\index.php:24
#, c-format
msgid "Tabbed interface"
-msgstr ""
+msgstr "Tab-Leiste"
#: about\index.php:33
#, c-format
msgid "Location pane shows map of files compared"
-msgstr ""
+msgstr "Positionsleiste zeigt Karte der verglichenen Dateien"
#: about\screenshots\index.php:17
#, c-format
@@ -1075,7 +1075,7 @@
#: index.php:6
#, c-format
msgid "WinMerge is an Open Source differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle."
-msgstr ""
+msgstr "WinMerge ist ein Open-Source-Programm zum Unterscheiden und Zusammenführen von Dateien sowie Ordner. Das Windows-Tool stellt Unterschiede in einem visuellen Text-Format dar, das einfach zu verstehen und zu handhaben ist."
#: downloads\index.php:67
#, c-format
@@ -1118,7 +1118,7 @@
#: support\index.php:12
#, c-format
msgid "A other way is a subscription to the <a href=\"%s\">support mailing list</a>."
-msgstr ""
+msgstr "Eine andere Möglichkeit ist das Abonnieren der <a href=\"%s\">Support-Verteilerliste</a>."
#: about\screenshots\index.php:5
#, c-format
@@ -1149,7 +1149,7 @@
#: translations\instructions.php:9
#, c-format
msgid "The translations instructions are currently not available..."
-msgstr ""
+msgstr "Der Übersetzungs-Status ist derzeit nicht verfügbar..."
#: support\tracker-shortcuts.php:13
#, c-format
@@ -1159,7 +1159,7 @@
#: downloads\plugins.php:31
#, c-format
msgid "With this plugin you can compare Word, Excel, PowerPoint, PDF and some more files."
-msgstr ""
+msgstr "Mit diesem Plugin können Sie Word-, Excel-, PowerPoint- und PDF-Dateien vergleichen, sowie einige Formate mehr."
#: downloads\source-code.php:6
#, c-format
@@ -1184,12 +1184,12 @@
#: downloads\pad-file.php:14
#, c-format
msgid "If you can not work with the <a href=\"%s\">PAD file</a>, you can use the following informations:"
-msgstr ""
+msgstr "Wenn Sie nicht mit der <a href=\"%s\">PAD-Datei</a> arbeiten können, verwenden Sie die folgenden Informationen:"
#: about\index.php:57
#, c-format
msgid "Localizable interface"
-msgstr ""
+msgstr "Anpassbare Oberfläche"
#: about\index.php:56
#, c-format
@@ -1204,7 +1204,7 @@
#: about\index.php:55
#, c-format
msgid "Archive file support using 7-Zip"
-msgstr ""
+msgstr "Archivdatei-Unterstützung mithilfe von 7-Zip"
#: translations\index.php:6
#: translations\status_branch.php:7
@@ -1216,7 +1216,7 @@
#: support\index.php:21
#, c-format
msgid "Tracker Statistics"
-msgstr ""
+msgstr "Tracker-Statistiken"
#: downloads\pad-file.php:64
#, c-format
@@ -1261,7 +1261,7 @@
#: docs\index.php:6
#, c-format
msgid "WinMerge, documentation, manual, release notes, known issues, change log, Development Wiki"
-msgstr ""
+msgstr "WinMerge, Dokumentation, Handbuch, Versionshinweise, Bekannte Probleme, Versionshistorie, Entwickler-Wiki"
#: about\license.php:10
#, c-format
@@ -1318,7 +1318,7 @@
#: support\index.php:14
#, c-format
msgid "Please attach as much information as you can: at a minimum, the version number of WinMerge that you are using. If you can, also attach a configuration log which, you can display by clicking <span class=\"guimenu\">Help</span> → <span class=\"guimenuitem\">Configuration</span> in the WinMerge window."
-msgstr ""
+msgstr "Bitte fügen Sie so viele Informationen an wie möglich: Mindestens die Versionsnummer von WinMerge, die Sie verwenden. Wenn Sie können, fügen Sie auch ein Konfigurationsprotokoll an, welches Sie über <span class=\"guimenu\">Hilfe</span> → <span class=\"guimenuitem\">Konfiguration</span> im WinMerge-Fenster aufrufen können."
#: engine\page.inc:261
#: engine\page.inc:283
@@ -1354,7 +1354,7 @@
#: support\mailing-lists.php:67
#, c-format
msgid "This is the list where participating developers of the WinMerge meet and discuss issues, code changes/additions, etc."
-msgstr ""
+msgstr "Dies ist die Liste, wo sich die beteiligten Entwickler von WinMerge treffen und über Fragen, Code-Änderungen/-Ergänzungen usw. diskutieren."
#: downloads\index.php:22
#: downloads\plugins.php:17
@@ -1394,7 +1394,7 @@
#: support\index.php:39
#, c-format
msgid "But please consider making a <a href=\"%s\">donation</a> to support the continued development of WinMerge."
-msgstr ""
+msgstr "Aber ziehen Sie bitte eine <a href=\"%s\">Spende</a> in Betracht, um die weitere Entwicklung von WinMerge zu unterstützen."
#: downloads\pad-file.php:74
#, c-format
@@ -1415,7 +1415,7 @@
#: about\index.php:40
#, c-format
msgid "Fast compare using file sizes and dates"
-msgstr ""
+msgstr "Schnelles Vergleichen mithilfe von Dateigrößen und Änderungsdaten"
#: support\mailing-lists.php:24
#: support\mailing-lists.php:34
@@ -1464,7 +1464,7 @@
#: support\mailing-lists.php:37
#, c-format
msgid "You should ask all your support questions on this list."
-msgstr ""
+msgstr "Sie sollten Ihre Support-Anfragen auf dieser Liste stellen."
#: about\index.php:52
#, c-format
@@ -1494,7 +1494,7 @@
#: about\index.php:49
#, c-format
msgid "Rudimentary Visual SourceSafe and Rational ClearCase integration"
-msgstr ""
+msgstr "Rudimentäre <em>Visual SourceSafe</em>- und <em>Rational ClearCase</em>-Integration"
#: translations\translations.inc:180
#: translations\translations_branch.inc:106
@@ -1553,7 +1553,7 @@
#: engine\page.inc:313
#, c-format
msgid "Donate money to WinMerge"
-msgstr ""
+msgstr "Geld spenden an WinMerge"
#: downloads\index.php:66
#, c-format
@@ -1595,7 +1595,7 @@
#: support\index.php:13
#, c-format
msgid "If you find a bug, please submit it as a <a href=\"%s\">bug report</a>."
-msgstr ""
+msgstr "Wenn Sie einen Fehler finden, senden Sie ihn uns bitte als einen <a href=\"%s\">Fehlerbericht</a>."
#: downloads\source-code.php:37
#, c-format
@@ -1697,7 +1697,7 @@
#: about\index.php:34
#, c-format
msgid "Moved lines detection"
-msgstr ""
+msgstr "Erkennung von verschobenen Zeilen"
#: downloads\index.php:69
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2009-09-15 12:29:36
|
Revision: 6988
http://winmerge.svn.sourceforge.net/winmerge/?rev=6988&view=rev
Author: gerundt
Date: 2009-09-15 12:29:31 +0000 (Tue, 15 Sep 2009)
Log Message:
-----------
PATCH: [ 2850842 ] French translation
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/Src/Languages/French.po
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2009-09-15 12:28:52 UTC (rev 6987)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2009-09-15 12:29:31 UTC (rev 6988)
@@ -7,6 +7,7 @@
Add missing keywords to Pascal highlighter (#2834192)
Translation updates:
- Dutch (#2804979)
+ - French (#2850842)
- Turkish (#2825132, #2827817)
- Ukrainian (#2817835)
Modified: branches/R2_12/Src/Languages/French.po
===================================================================
--- branches/R2_12/Src/Languages/French.po 2009-09-15 12:28:52 UTC (rev 6987)
+++ branches/R2_12/Src/Languages/French.po 2009-09-15 12:29:31 UTC (rev 6988)
@@ -1,10 +1,12 @@
# This file is part from WinMerge <http://winmerge.org/>
# Released under the "GNU General Public License"
#
+# Maintainer:
+# * Jean-F Jolin <jean-f-j at users.sourceforge.net>
+#
# Translators:
# * Gil Andre <gil_andre at compuserve.com>
# * Laurent Ganier <ccganier at club-internet.fr>
-# * Jean-F Jolin <jean-f-j at users.sourceforge.net>
# * Dominique Saussereau <redguff at users.sourceforge.net>
#
# ID line follows -- this is updated by SVN
@@ -15,8 +17,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-02-15 14:33-0500\n"
-"Last-Translator: Jean-F Jolin <jean-f-j at users.sourceforge.net>\n"
+"PO-Revision-Date: 2009-09-04 05:36-0000\n"
+"Last-Translator: Jean-F Jolin <jean-f-j at users.sourceforge.net>\n"
"Language-Team: French <win...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CP1252\n"
@@ -246,7 +248,7 @@
#: Merge.rc:420
#, c-format
msgid "Ta&b Bar"
-msgstr "Barre d'&onglet"
+msgstr "Barre d'&onglets"
#: Merge.rc:141
#: Merge.rc:241
@@ -309,7 +311,7 @@
#: Merge.rc:459
#, c-format
msgid "&Edit with Unpacker"
-msgstr "&\xC9diter avec d\xE9compression"
+msgstr "&\xC9diter avec un d\xE9compresseur"
#: Merge.rc:157
#: Merge.rc:278
@@ -337,7 +339,7 @@
#: Merge.rc:471
#, c-format
msgid "&Reset Options"
-msgstr "&Initialiser les pr\xE9f\xE9rences"
+msgstr "&R\xE9tablir les pr\xE9f\xE9rences"
#: Merge.rc:164
#: Merge.rc:285
@@ -521,7 +523,7 @@
#: Merge.rc:239
#, c-format
msgid "Compa&re Statistics"
-msgstr "Comparer les &statistiques"
+msgstr "Statistiques de comparaison"
#: Merge.rc:243
#: Merge.rc:426
@@ -1270,7 +1272,7 @@
#: Merge.rc:760
#, c-format
msgid "&Disable Splash Screen"
-msgstr "&Sans page de garde"
+msgstr "&D\xE9sactiver la page de garde"
#: Merge.rc:762
#, c-format
@@ -1332,7 +1334,7 @@
#: Merge.rc:787
#, c-format
msgid "Reset"
-msgstr "&Initialiser"
+msgstr "R\xE9tablir"
#: Merge.rc:794
#, c-format
@@ -1681,7 +1683,7 @@
#: Merge.rc:1043
#, c-format
msgid "Ig&nore all"
-msgstr "&Tout ignorer"
+msgstr "Ignorer &tout"
#: Merge.rc:1045
#, c-format
@@ -1691,7 +1693,7 @@
#: Merge.rc:1047
#, c-format
msgid "Case sensi&tive"
-msgstr "Sensi&ble \xE0 la casse"
+msgstr "Respecter la casse"
#: Merge.rc:1049
#, c-format
@@ -1828,7 +1830,7 @@
#: Merge.rc:1158
#, c-format
msgid "I&gnore all"
-msgstr "&Tout ignorer"
+msgstr "Ignorer &tout"
#: Merge.rc:1160
#, c-format
@@ -2004,7 +2006,7 @@
#: Merge.rc:1258
#, c-format
msgid "Discard All"
-msgstr "Tout ignorer"
+msgstr "Ignorer tout"
#: Merge.rc:1265
#: Merge.rc:1513
@@ -2389,12 +2391,12 @@
#: Merge.rc:1522
#, c-format
msgid "(Affects)"
-msgstr "(Affect\xE9)"
+msgstr "(Concern\xE9s)"
#: Merge.rc:1523
#, c-format
msgid "Select Codepage for"
-msgstr "S\xE9lectionner le code de page"
+msgstr "S\xE9lectionner le code de page pour"
#: Merge.rc:1524
#, c-format
@@ -2737,8 +2739,7 @@
msgid ""
"Change the printer and printing options\n"
"Print Setup"
-msgstr ""
-"Change les options d'imprimante et d'impression\n"
+msgstr "Change l'imprimante et les options d'impression\n"
"Configuration de l'impression"
#: Merge.rc:1763
@@ -2801,7 +2802,7 @@
#: Merge.rc:1781
#, c-format
msgid "Project File"
-msgstr "Fichiers du projet"
+msgstr "Fichier de projet"
#: Merge.rc:1782
#, c-format
@@ -2818,9 +2819,8 @@
msgid ""
"Save current paths and options to project file\n"
"Save Project File"
-msgstr ""
-"Enregistrer les chemins et pr\xE9f\xE9rences au projet\n"
-"Enregistrer les fichiers du projet"
+msgstr "Enregistrer les chemins et pr\xE9f\xE9rences au fichier de projet\n"
+"Enregistrer le fichier de projet"
#: Merge.rc:1789
#, c-format
@@ -2836,8 +2836,7 @@
msgid ""
"Quit the application; prompts to save documents\n"
"Exit"
-msgstr ""
-"Ferme l'application et propose d'enregistrer les documents\n"
+msgstr "Quitte l'application et propose d'enregistrer les documents\n"
"Quitter"
#: Merge.rc:1796
@@ -2910,8 +2909,7 @@
msgid ""
"Copy the selection and put it on the Clipboard\n"
"Copy"
-msgstr ""
-"Copie la s\xE9lection et la place dans le presse-papiers\n"
+msgstr "Copie la s\xE9lection dans le presse-papiers\n"
"Copier"
#: Merge.rc:1832
@@ -2921,7 +2919,7 @@
"Cut"
msgstr ""
"Supprime la s\xE9lection et la place dans le presse-papiers\n"
-"Copier"
+"Couper"
#: Merge.rc:1833
#, c-format
@@ -3010,7 +3008,7 @@
"Show or hide the tab bar\n"
"Toggle TabBar"
msgstr ""
-"Affiche ou masque la barre d'onglet\n"
+"Affiche ou masque la barre d'onglets\n"
"Barre d'onglet"
#: Merge.rc:1848
@@ -3172,7 +3170,7 @@
#: Merge.rc:1920
#, c-format
msgid "Ignore &all"
-msgstr "&Tout ignorer"
+msgstr "Ignorer &tout"
#: Merge.rc:1921
#, c-format
@@ -3202,12 +3200,12 @@
#: Merge.rc:1931
#, c-format
msgid "&Skip"
-msgstr "&Sauter"
+msgstr "&Ignorer"
#: Merge.rc:1932
#, c-format
msgid "Skip &all"
-msgstr "To&ut sauter"
+msgstr "Ignorer &tout"
#: Merge.rc:1934
#, c-format
@@ -3300,10 +3298,9 @@
"Value in Tab size -field is not in range WinMerge accepts.\n"
"\n"
"Please use values 1 - %1."
-msgstr ""
-"Taille d'une tabulation -cette \xE9tendue n'est pas accept\xE9e par WinMerge.\n"
+msgstr "La valeur de la taille des tabulations n'entre pas dans la plage accept\xE9e.\n"
"\n"
-"Veuillez utiliser ces valeurs 1 - %1."
+"Voici la plage des valeurs accept\xE9es 1 - %1."
#: Merge.rc:1984
#, c-format
@@ -3311,10 +3308,9 @@
"Are you sure you want to reset all WinMerge options to default values?\n"
"\n"
"Please re-start WinMerge after the reset."
-msgstr ""
-"Confirmer l'initialisation des valeurs par d\xE9faut des pr\xE9f\xE9rences WinMerge ?\n"
+msgstr "Confirmer le r\xE9tablissement des valeurs par d\xE9faut des pr\xE9f\xE9rences WinMerge ?\n"
"\n"
-"Veuillez red\xE9marrer WinMerge apr\xE8s l'initialisation."
+"Veuillez red\xE9marrer WinMerge apr\xE8s le r\xE9tablissement."
#: Merge.rc:1990
#, c-format
@@ -3773,7 +3769,7 @@
#: Merge.rc:2147
#, c-format
msgid "Error backing up file"
-msgstr "Erreur lors du backup du fichier"
+msgstr "Erreur durant la prise de fichiers d'archive"
#: Merge.rc:2149
#, c-format
@@ -3783,7 +3779,7 @@
"\n"
"Continue anyway?"
msgstr ""
-"Ne peut effectuer le backup du fichier d'origine:\n"
+"Ne peut effectuer la prise de fichiers d'archive:\n"
"%1\n"
"\n"
"Continuer quand m\xEAme ?"
@@ -4116,12 +4112,12 @@
#: Merge.rc:2230
#, c-format
msgid "(%1 Files Affected)"
-msgstr "(%1 Fichiers modifi\xE9s)"
+msgstr "(%1 Fichiers concern\xE9s)"
#: Merge.rc:2231
#, c-format
msgid "(%1 of %2 Files Affected)"
-msgstr "(%1 de %2 Fichiers modifi\xE9s)"
+msgstr "(%1 de %2 Fichiers concern\xE9s)"
#: Merge.rc:2237
#, c-format
@@ -4396,7 +4392,7 @@
#: Merge.rc:2320
#, c-format
msgid "Ignored Diff."
-msgstr "Diff\xE9rences ignor\xE9es."
+msgstr "Diff\xE9rences ignor\xE9es"
#: Merge.rc:2321
#, c-format
@@ -4552,12 +4548,12 @@
#: Merge.rc:2377
#, c-format
msgid "Left side creation time."
-msgstr "Temps de creation du c\xF4t\xE9 gauche."
+msgstr "Date de creation du c\xF4t\xE9 gauche."
#: Merge.rc:2378
#, c-format
msgid "Right side creation time."
-msgstr "Temps de creation du c\xF4t\xE9 droit."
+msgstr "Date de creation du c\xF4t\xE9 droit."
#: Merge.rc:2379
#, c-format
@@ -4989,7 +4985,7 @@
#: Merge.rc:2507
#, c-format
msgid "Invalid collation character"
-msgstr "Comparaison de caract\xE8re invalide"
+msgstr "Caract\xE8re de classement invalide"
#: Merge.rc:2508
#, c-format
@@ -5180,7 +5176,7 @@
#: Merge.rc:2575
#, c-format
msgid "MS-DOS French Canada"
-msgstr "MS-DOS Fran\xE7ais (Canada)"
+msgstr "MS-DOS Fran\xE7ais Canada"
#: Merge.rc:2576
#, c-format
@@ -5210,7 +5206,7 @@
#: Merge.rc:2586
#, c-format
msgid "Windows Simplified Chinese"
-msgstr "Windows Chinois (Simplifi\xE9)"
+msgstr "Windows Chinois Simplifi\xE9"
#: Merge.rc:2587
#, c-format
@@ -5220,7 +5216,7 @@
#: Merge.rc:2588
#, c-format
msgid "Windows Traditional Chinese"
-msgstr "Windows Chinois (Traditionnel)"
+msgstr "Windows Chinois Traditionnel"
#: Merge.rc:2589
#, c-format
@@ -5245,7 +5241,7 @@
#: Merge.rc:2593
#, c-format
msgid "Windows Latin 5 (Turkish)"
-msgstr "Windows Latin 5 (Turquie)"
+msgstr "Windows Latin 5 (Turc)"
#: Merge.rc:2594
#, c-format
@@ -5596,9 +5592,8 @@
msgid ""
"Select the font for the view\n"
"Select View Font"
-msgstr ""
-"S\xE9lectionner la police utilis\xE9e pour l'affichage des diff\xE9rences\n"
-"S\xE9lection de la Police Diff"
+msgstr "S\xE9lectionner la police utilis\xE9e pour l'affichage des diff\xE9rences\n"
+"S\xE9lection de la Police d'affichage"
#: Merge.rc:2709
#, c-format
@@ -5692,32 +5687,52 @@
#: Merge.rc:2722
#, c-format
msgid "Reset text zoom to default size"
-msgstr "Initialiser le zoom du texte \xE0 la taille par d\xE9faut"
+msgstr "R\xE9tablir le zoom du texte \xE0 la taille par d\xE9faut"
#: Merge.rc:2728
#, c-format
-msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)"
-msgstr "Atteindre la diff\xE9rence pr\xE9c\xE9dente\nDiff Pr\xE9c\xE9dente (Alt+Up)"
+msgid ""
+"Scroll to the previous difference\n"
+"Previous Difference (Alt+Up)"
+msgstr ""
+"Atteindre la diff\xE9rence pr\xE9c\xE9dente\n"
+"Diff Pr\xE9c\xE9dente (Alt+Up)"
#: Merge.rc:2729
#, c-format
-msgid "Scroll to the next difference\nNext Difference (Alt+Down)"
-msgstr "Atteindre la diff\xE9rence suivante\nDiff Suivante (Alt+Down)"
+msgid ""
+"Scroll to the next difference\n"
+"Next Difference (Alt+Down)"
+msgstr ""
+"Atteindre la diff\xE9rence suivante\n"
+"Diff Suivante (Alt+Down)"
#: Merge.rc:2730
#, c-format
-msgid "Scroll to the first difference\nFirst Difference (Alt+Home)"
-msgstr "Atteindre la premi\xE8re diff\xE9rence\nPremi\xE8re Diff (Alt+Home)"
+msgid ""
+"Scroll to the first difference\n"
+"First Difference (Alt+Home)"
+msgstr ""
+"Atteindre la premi\xE8re diff\xE9rence\n"
+"Premi\xE8re Diff (Alt+Home)"
#: Merge.rc:2731
#, c-format
-msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)"
-msgstr "Atteindre la diff\xE9rence courante\nDiff Courante (Alt+Enter)"
+msgid ""
+"Scroll to the current difference\n"
+"Current Difference (Alt+Enter)"
+msgstr ""
+"Atteindre la diff\xE9rence courante\n"
+"Diff Courante (Alt+Enter)"
#: Merge.rc:2732
#, c-format
-msgid "Scroll to the last difference\nLast Difference (Alt+End)"
-msgstr "Atteindre la derni\xE8re diff\xE9rence\nDerni\xE8re Diff (Alt+End)"
+msgid ""
+"Scroll to the last difference\n"
+"Last Difference (Alt+End)"
+msgstr ""
+"Atteindre la derni\xE8re diff\xE9rence\n"
+"Derni\xE8re Diff (Alt+End)"
#: Merge.rc:2733
#, c-format
@@ -6107,7 +6122,7 @@
#: Merge.rc:2848
#, c-format
msgid "Resources"
-msgstr "Resources"
+msgstr "Ressources"
#: Merge.rc:2849
#, c-format
@@ -6157,7 +6172,7 @@
#: Merge.rc:2862
#, c-format
msgid "Hide the toolbar"
-msgstr "Cacher la barre d'outils"
+msgstr "Masquer la barre d'outils"
#: Merge.rc:2863
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2009-09-15 12:29:00
|
Revision: 6987
http://winmerge.svn.sourceforge.net/winmerge/?rev=6987&view=rev
Author: gerundt
Date: 2009-09-15 12:28:52 +0000 (Tue, 15 Sep 2009)
Log Message:
-----------
PATCH: [ 2850842 ] French translation
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Translations/WinMerge/French.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2009-09-05 15:09:34 UTC (rev 6986)
+++ trunk/Docs/Users/ChangeLog.txt 2009-09-15 12:28:52 UTC (rev 6987)
@@ -21,6 +21,7 @@
Bugfix: In-line difference highlight fixes (#2824173)
Translation updates:
- Dutch (#2801690, #2804979, #2828310)
+ - French (#2850842)
- German (r6942)
- Swedish (#2805726, #2845755)
- Turkish (#2825130, #2825132, #2827820)
Modified: trunk/Translations/WinMerge/French.po
===================================================================
--- trunk/Translations/WinMerge/French.po 2009-09-05 15:09:34 UTC (rev 6986)
+++ trunk/Translations/WinMerge/French.po 2009-09-15 12:28:52 UTC (rev 6987)
@@ -1,10 +1,12 @@
# This file is part from WinMerge <http://winmerge.org/>
# Released under the "GNU General Public License"
#
+# Maintainer:
+# * Jean-F Jolin <jean-f-j at users.sourceforge.net>
+#
# Translators:
# * Gil Andre <gil_andre at compuserve.com>
# * Laurent Ganier <ccganier at club-internet.fr>
-# * Jean-F Jolin <jean-f-j at users.sourceforge.net>
# * Dominique Saussereau <redguff at users.sourceforge.net>
#
# ID line follows -- this is updated by SVN
@@ -15,8 +17,8 @@
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2009-02-15 14:33-0500\n"
-"Last-Translator: Jean-F Jolin <jean-f-j at users.sourceforge.net>\n"
+"PO-Revision-Date: 2009-09-04 05:36-0000\n"
+"Last-Translator: Jean-F Jolin <jean-f-j at users.sourceforge.net>\n"
"Language-Team: French <win...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CP1252\n"
@@ -246,7 +248,7 @@
#: Merge.rc:423
#, c-format
msgid "Ta&b Bar"
-msgstr "Barre d'&onglet"
+msgstr "Barre d'&onglets"
#: Merge.rc:141
#: Merge.rc:244
@@ -293,12 +295,12 @@
#: Merge.rc:152
#, c-format
msgid "Ma&nual Prediffer"
-msgstr ""
+msgstr "Pr\xE9-comparaison &manuelle"
#: Merge.rc:153
#, c-format
msgid "A&utomatic Prediffer"
-msgstr ""
+msgstr "Pr\xE9-comparaison &automatique"
#: Merge.rc:155
#: Merge.rc:276
@@ -319,7 +321,7 @@
#: Merge.rc:462
#, c-format
msgid "&Edit with Unpacker"
-msgstr "&\xC9diter avec d\xE9compression"
+msgstr "&\xC9diter avec un d\xE9compresseur"
#: Merge.rc:160
#: Merge.rc:281
@@ -347,7 +349,7 @@
#: Merge.rc:474
#, c-format
msgid "&Reset Options"
-msgstr "&Initialiser les pr\xE9f\xE9rences"
+msgstr "&R\xE9tablir les pr\xE9f\xE9rences"
#: Merge.rc:167
#: Merge.rc:288
@@ -531,7 +533,7 @@
#: Merge.rc:242
#, c-format
msgid "Compa&re Statistics"
-msgstr "Comparer les &statistiques"
+msgstr "Statistiques de comparaison"
#: Merge.rc:246
#: Merge.rc:429
@@ -1285,7 +1287,7 @@
#: Merge.rc:766
#, c-format
msgid "&Disable Splash Screen"
-msgstr "&Sans page de garde"
+msgstr "&D\xE9sactiver la page de garde"
#: Merge.rc:768
#, c-format
@@ -1347,7 +1349,7 @@
#: Merge.rc:793
#, c-format
msgid "Reset"
-msgstr "&Initialiser"
+msgstr "R\xE9tablir"
#: Merge.rc:800
#, c-format
@@ -1696,7 +1698,7 @@
#: Merge.rc:1055
#, c-format
msgid "Ig&nore all"
-msgstr "&Tout ignorer"
+msgstr "Ignorer &tout"
#: Merge.rc:1057
#, c-format
@@ -1706,7 +1708,7 @@
#: Merge.rc:1059
#, c-format
msgid "Case sensi&tive"
-msgstr "Sensi&ble \xE0 la casse"
+msgstr "Respecter la casse"
#: Merge.rc:1061
#, c-format
@@ -1843,7 +1845,7 @@
#: Merge.rc:1170
#, c-format
msgid "I&gnore all"
-msgstr "&Tout ignorer"
+msgstr "Ignorer &tout"
#: Merge.rc:1172
#, c-format
@@ -1954,7 +1956,7 @@
#: Merge.rc:1226
#, c-format
msgid "W&ord break characters:"
-msgstr ""
+msgstr "Caract\xE8res pour distinction de mot:"
#: Merge.rc:1239
#, c-format
@@ -2024,7 +2026,7 @@
#: Merge.rc:1272
#, c-format
msgid "Disca&rd All"
-msgstr ""
+msgstr "Ignorer tout"
#: Merge.rc:1279
#: Merge.rc:1527
@@ -2409,12 +2411,12 @@
#: Merge.rc:1536
#, c-format
msgid "(Affects)"
-msgstr "(Affect\xE9)"
+msgstr "(Concern\xE9s)"
#: Merge.rc:1537
#, c-format
msgid "Select Codepage for"
-msgstr "S\xE9lectionner le code de page"
+msgstr "S\xE9lectionner le code de page pour"
#: Merge.rc:1538
#, c-format
@@ -2757,8 +2759,7 @@
msgid ""
"Change the printer and printing options\n"
"Print Setup"
-msgstr ""
-"Change les options d'imprimante et d'impression\n"
+msgstr "Change l'imprimante et les options d'impression\n"
"Configuration de l'impression"
#: Merge.rc:1777
@@ -2821,7 +2822,7 @@
#: Merge.rc:1795
#, c-format
msgid "Project File"
-msgstr "Fichiers du projet"
+msgstr "Fichier de projet"
#: Merge.rc:1796
#, c-format
@@ -2838,9 +2839,8 @@
msgid ""
"Save current paths and options to project file\n"
"Save Project File"
-msgstr ""
-"Enregistrer les chemins et pr\xE9f\xE9rences au projet\n"
-"Enregistrer les fichiers du projet"
+msgstr "Enregistrer les chemins et pr\xE9f\xE9rences au fichier de projet\n"
+"Enregistrer le fichier de projet"
#: Merge.rc:1803
#, c-format
@@ -2856,8 +2856,7 @@
msgid ""
"Quit the application; prompts to save documents\n"
"Exit"
-msgstr ""
-"Ferme l'application et propose d'enregistrer les documents\n"
+msgstr "Quitte l'application et propose d'enregistrer les documents\n"
"Quitter"
#: Merge.rc:1810
@@ -2930,8 +2929,7 @@
msgid ""
"Copy the selection and put it on the Clipboard\n"
"Copy"
-msgstr ""
-"Copie la s\xE9lection et la place dans le presse-papiers\n"
+msgstr "Copie la s\xE9lection dans le presse-papiers\n"
"Copier"
#: Merge.rc:1846
@@ -2941,7 +2939,7 @@
"Cut"
msgstr ""
"Supprime la s\xE9lection et la place dans le presse-papiers\n"
-"Copier"
+"Couper"
#: Merge.rc:1847
#, c-format
@@ -3030,7 +3028,7 @@
"Show or hide the tab bar\n"
"Toggle TabBar"
msgstr ""
-"Affiche ou masque la barre d'onglet\n"
+"Affiche ou masque la barre d'onglets\n"
"Barre d'onglet"
#: Merge.rc:1862
@@ -3192,7 +3190,7 @@
#: Merge.rc:1934
#, c-format
msgid "Ignore &all"
-msgstr "&Tout ignorer"
+msgstr "Ignorer &tout"
#: Merge.rc:1935
#, c-format
@@ -3222,12 +3220,12 @@
#: Merge.rc:1945
#, c-format
msgid "&Skip"
-msgstr "&Sauter"
+msgstr "&Ignorer"
#: Merge.rc:1946
#, c-format
msgid "Skip &all"
-msgstr "To&ut sauter"
+msgstr "Ignorer &tout"
#: Merge.rc:1948
#, c-format
@@ -3320,10 +3318,9 @@
"Value in Tab size -field is not in range WinMerge accepts.\n"
"\n"
"Please use values 1 - %1."
-msgstr ""
-"Taille d'une tabulation -cette \xE9tendue n'est pas accept\xE9e par WinMerge.\n"
+msgstr "La valeur de la taille des tabulations n'entre pas dans la plage accept\xE9e.\n"
"\n"
-"Veuillez utiliser ces valeurs 1 - %1."
+"Voici la plage des valeurs accept\xE9es 1 - %1."
#: Merge.rc:1998
#, c-format
@@ -3331,10 +3328,9 @@
"Are you sure you want to reset all WinMerge options to default values?\n"
"\n"
"Please re-start WinMerge after the reset."
-msgstr ""
-"Confirmer l'initialisation des valeurs par d\xE9faut des pr\xE9f\xE9rences WinMerge ?\n"
+msgstr "Confirmer le r\xE9tablissement des valeurs par d\xE9faut des pr\xE9f\xE9rences WinMerge ?\n"
"\n"
-"Veuillez red\xE9marrer WinMerge apr\xE8s l'initialisation."
+"Veuillez red\xE9marrer WinMerge apr\xE8s le r\xE9tablissement."
#: Merge.rc:2004
#, c-format
@@ -3793,7 +3789,7 @@
#: Merge.rc:2161
#, c-format
msgid "Error backing up file"
-msgstr "Erreur lors du backup du fichier"
+msgstr "Erreur durant la prise de fichiers d'archive"
#: Merge.rc:2163
#, c-format
@@ -3803,7 +3799,7 @@
"\n"
"Continue anyway?"
msgstr ""
-"Ne peut effectuer le backup du fichier d'origine:\n"
+"Ne peut effectuer la prise de fichiers d'archive:\n"
"%1\n"
"\n"
"Continuer quand m\xEAme ?"
@@ -4136,12 +4132,12 @@
#: Merge.rc:2244
#, c-format
msgid "(%1 Files Affected)"
-msgstr "(%1 Fichiers modifi\xE9s)"
+msgstr "(%1 Fichiers concern\xE9s)"
#: Merge.rc:2245
#, c-format
msgid "(%1 of %2 Files Affected)"
-msgstr "(%1 de %2 Fichiers modifi\xE9s)"
+msgstr "(%1 de %2 Fichiers concern\xE9s)"
#: Merge.rc:2251
#, c-format
@@ -4416,7 +4412,7 @@
#: Merge.rc:2334
#, c-format
msgid "Ignored Diff."
-msgstr "Diff\xE9rences ignor\xE9es."
+msgstr "Diff\xE9rences ignor\xE9es"
#: Merge.rc:2335
#, c-format
@@ -4572,12 +4568,12 @@
#: Merge.rc:2391
#, c-format
msgid "Left side creation time."
-msgstr "Temps de creation du c\xF4t\xE9 gauche."
+msgstr "Date de creation du c\xF4t\xE9 gauche."
#: Merge.rc:2392
#, c-format
msgid "Right side creation time."
-msgstr "Temps de creation du c\xF4t\xE9 droit."
+msgstr "Date de creation du c\xF4t\xE9 droit."
#: Merge.rc:2393
#, c-format
@@ -5009,7 +5005,7 @@
#: Merge.rc:2521
#, c-format
msgid "Invalid collation character"
-msgstr "Comparaison de caract\xE8re invalide"
+msgstr "Caract\xE8re de classement invalide"
#: Merge.rc:2522
#, c-format
@@ -5200,7 +5196,7 @@
#: Merge.rc:2589
#, c-format
msgid "MS-DOS French Canada"
-msgstr "MS-DOS Fran\xE7ais (Canada)"
+msgstr "MS-DOS Fran\xE7ais Canada"
#: Merge.rc:2590
#, c-format
@@ -5230,7 +5226,7 @@
#: Merge.rc:2600
#, c-format
msgid "Windows Simplified Chinese"
-msgstr "Windows Chinois (Simplifi\xE9)"
+msgstr "Windows Chinois Simplifi\xE9"
#: Merge.rc:2601
#, c-format
@@ -5240,7 +5236,7 @@
#: Merge.rc:2602
#, c-format
msgid "Windows Traditional Chinese"
-msgstr "Windows Chinois (Traditionnel)"
+msgstr "Windows Chinois Traditionnel"
#: Merge.rc:2603
#, c-format
@@ -5265,7 +5261,7 @@
#: Merge.rc:2607
#, c-format
msgid "Windows Latin 5 (Turkish)"
-msgstr "Windows Latin 5 (Turquie)"
+msgstr "Windows Latin 5 (Turc)"
#: Merge.rc:2608
#, c-format
@@ -5616,9 +5612,8 @@
msgid ""
"Select the font for the view\n"
"Select View Font"
-msgstr ""
-"S\xE9lectionner la police utilis\xE9e pour l'affichage des diff\xE9rences\n"
-"S\xE9lection de la Police Diff"
+msgstr "S\xE9lectionner la police utilis\xE9e pour l'affichage des diff\xE9rences\n"
+"S\xE9lection de la Police d'affichage"
#: Merge.rc:2723
#, c-format
@@ -5712,7 +5707,7 @@
#: Merge.rc:2736
#, c-format
msgid "Reset text zoom to default size"
-msgstr "Initialiser le zoom du texte \xE0 la taille par d\xE9faut"
+msgstr "R\xE9tablir le zoom du texte \xE0 la taille par d\xE9faut"
#: Merge.rc:2742
#, c-format
@@ -6147,7 +6142,7 @@
#: Merge.rc:2862
#, c-format
msgid "Resources"
-msgstr "Resources"
+msgstr "Ressources"
#: Merge.rc:2863
#, c-format
@@ -6197,7 +6192,7 @@
#: Merge.rc:2876
#, c-format
msgid "Hide the toolbar"
-msgstr "Cacher la barre d'outils"
+msgstr "Masquer la barre d'outils"
#: Merge.rc:2877
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2009-09-05 15:09:40
|
Revision: 6986
http://winmerge.svn.sourceforge.net/winmerge/?rev=6986&view=rev
Author: gerundt
Date: 2009-09-05 15:09:34 +0000 (Sat, 05 Sep 2009)
Log Message:
-----------
Add "Web" project to translations status
Modified Paths:
--------------
trunk/Translations/GetTranslationsStatus.py
Modified: trunk/Translations/GetTranslationsStatus.py
===================================================================
--- trunk/Translations/GetTranslationsStatus.py 2009-09-03 16:38:47 UTC (rev 6985)
+++ trunk/Translations/GetTranslationsStatus.py 2009-09-05 15:09:34 UTC (rev 6986)
@@ -286,7 +286,10 @@
@property
def language(self):
- return os.path.splitext(self.filename)[0]
+ if self._poeditlanguage: #If "X-Poedit-Language"...
+ return self._poeditlanguage
+ else: #If NOT "X-Poedit-Language"...
+ return os.path.splitext(self.filename)[0]
@property
def count(self):
@@ -344,6 +347,7 @@
self._fuzzy = 0
self._porevisiondate = ''
self._potcreationdate = ''
+ self._poeditlanguage = ''
self._translators = []
if os.access(filepath, os.R_OK): #If PO(T) file can read...
@@ -353,6 +357,7 @@
reTranslator = re.compile('^# \* (.*)$', re.IGNORECASE)
rePoRevisionDate = re.compile('PO-Revision-Date: ([0-9 :\+\-]+)', re.IGNORECASE)
rePotCreationDate = re.compile('POT-Creation-Date: ([0-9 :\+\-]+)', re.IGNORECASE)
+ rePoeditLanguage = re.compile('X-Poedit-Language: ([A-Z]+)', re.IGNORECASE)
iMsgStarted = 0
sMsgId = ''
@@ -420,6 +425,9 @@
if tmp: #If "POT-Creation-Date"...
#TODO: Convert to date!
self._potcreationdate = tmp[0]
+ tmp = rePoeditLanguage.findall(sMsgStr)
+ if tmp: #If "X-Poedit-Language"...
+ self._poeditlanguage = tmp[0]
sMsgId = ''
sMsgStr = ''
bIsFuzzy = False
@@ -509,6 +517,7 @@
status.addProject(PoProject('ShellExtension', 'ShellExtension/English.pot', 'ShellExtension'))
status.addProject(InnoSetupProject('InnoSetup', 'InnoSetup/English.isl', 'InnoSetup'))
status.addProject(ReadmeProject('Docs/Readme', 'Docs/Readme.txt', 'Docs/Readme'))
+ status.addProject(PoProject('Web', 'Web/en-US.pot', 'Web'))
status.writeToXmlFile('TranslationsStatus.xml')
status.writeToHtmlFile('TranslationsStatus.html')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2009-09-03 16:38:59
|
Revision: 6985
http://winmerge.svn.sourceforge.net/winmerge/?rev=6985&view=rev
Author: gerundt
Date: 2009-09-03 16:38:47 +0000 (Thu, 03 Sep 2009)
Log Message:
-----------
Update German web PO file
Modified Paths:
--------------
trunk/Translations/Web/de.po
Modified: trunk/Translations/Web/de.po
===================================================================
--- trunk/Translations/Web/de.po 2009-09-03 15:29:35 UTC (rev 6984)
+++ trunk/Translations/Web/de.po 2009-09-03 16:38:47 UTC (rev 6985)
@@ -12,7 +12,7 @@
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2009-08-29 18:11+0100\n"
+"PO-Revision-Date: 2009-09-03 18:36+0100\n"
"Last-Translator: Tim Gerundt <tim at gerundt.de>\n"
"Language-Team: German <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -40,7 +40,7 @@
#: docs\changelog.php:11
#, c-format
msgid "The change log is currently not available..."
-msgstr ""
+msgstr "Die Versionshistorie ist derzeit nicht verfügbar..."
#: downloads\index.php:55
#, c-format
@@ -82,7 +82,7 @@
#: support\tracker-shortcuts.php:9
#, c-format
msgid "Tracker Shortcuts"
-msgstr ""
+msgstr "Tracker-Abkürzungen"
#: engine\page.inc:298
#, c-format
@@ -113,13 +113,13 @@
#: downloads\index.php:59
#, c-format
msgid "Microsoft Visual C++ 2003 Runtime Components (included in the installer)"
-msgstr ""
+msgstr "Microsoft Visual C++ 2003 Laufzeitkomponenten (im Setup enthalten)"
#: translations\status_branch.php:18
#: translations\status_trunk.php:18
#, c-format
msgid "The translations status is currently not available..."
-msgstr ""
+msgstr "Der Übersetzungs-Status ist derzeit nicht verfügbar..."
#: engine\page.inc:295
#, c-format
@@ -134,7 +134,7 @@
#: about\license.php:5
#, c-format
msgid "WinMerge is Open Source software under the GNU General Public License. This means everybody can download the source code and improve and modify it."
-msgstr ""
+msgstr "WinMerge ist Open-Source-Software unter der GNU General Public License. Das bedeutet, dass jeder den Quellcode herunterladen kann um ihn zu verändern und zu verbessern."
#: downloads\pad-file.php:90
#, c-format
@@ -200,7 +200,7 @@
#: about\index.php:16
#, c-format
msgid "In addition, WinMerge has many helpful supporting features that make comparing, synchronising, and merging as easy and useful as possible:"
-msgstr ""
+msgstr "Darüber hinaus hat WinMerge viele hilfreiche Funktionen, die das Vergleichen, Synchronisieren und Zusammenführen so einfach und nützlich wie möglich macht:"
#: support\mailing-lists.php:22
#: support\mailing-lists.php:52
@@ -263,17 +263,17 @@
#: about\index.php:58
#, c-format
msgid "<a href=\"%s\">Online manual</a> and installed HTML Help manual"
-msgstr ""
+msgstr "<a href=\"%s\">Online-Handbuch</a> und installierte HTML-Hilfedatei"
#: engine\page.inc:312
#, c-format
msgid "WinMerge Tracker Shortcuts"
-msgstr ""
+msgstr "WinMerge-Tracker-Abkürzungen"
#: support\tracker-shortcuts.php:10
#, c-format
msgid "<em>Tracker Shortcuts</em> are shorter and nicer URLs to <a href=\"%1$s\">Tracker</a> items from our <a href=\"%2$s\">SF.net project page</a>."
-msgstr ""
+msgstr "<em>Tracker-Abkürzungen</em> sind kürzere und schönere URLs zu <a href=\"%1$s\">Tracker</a>-Artikeln auf unserer <a href=\"%2$s\">SF.net Projekt-Seite</a>."
#: downloads\pad-file.php:10
#, c-format
@@ -401,7 +401,7 @@
#: about\index.php:31
#, c-format
msgid "Highlights differences inside lines"
-msgstr ""
+msgstr "Unterschiede innerhalb von Zeilen hervorheben"
#: 404.php:28
#, c-format
@@ -416,7 +416,7 @@
#: about\screenshots\index.php:6
#, c-format
msgid "WinMerge, screenshots, file comparison, open-dialog, folder comparison results, highlight line diff, location pane, splash screen"
-msgstr ""
+msgstr "WinMerge, Screenshots, Dateivergleich, Öffnen-Dialog, Ordnervergleichs-Ergebnisse, Zeilenunterschiede hervorheben, Positionsleiste, Startbildschirm"
#: downloads\pad-file.php:72
#, c-format
@@ -537,7 +537,7 @@
#: about\screenshots\index.php:19
#, c-format
msgid "Folder Comparison Results"
-msgstr ""
+msgstr "Ordnervergleichs-Ergebnisse"
#: downloads\index.php:69
#, c-format
@@ -649,12 +649,12 @@
#: downloads\pad-file.php:6
#, c-format
msgid "WinMerge, PAD file, Portable Application Description"
-msgstr ""
+msgstr "WinMerge, PAD-Datei, Portable Application Description"
#: downloads\pad-file.php:40
#, c-format
msgid "Release Status"
-msgstr ""
+msgstr "Veröffentlichungsstatus"
#: engine\page.inc:311
#, c-format
@@ -696,7 +696,7 @@
#: about\screenshots\index.php:22
#, c-format
msgid "Folder Compare Tree View"
-msgstr ""
+msgstr "Ordnervergleichs-Baumansicht"
#: downloads\index.php:27
#: downloads\index.php:33
@@ -748,7 +748,7 @@
#: docs\index.php:13
#, c-format
msgid "The <a href=\"%1$s\">release notes</a> are a short summary of important changes, enhancements, bug fixes and <a href=\"%2$s\">known issues</a> in the current WinMerge release."
-msgstr ""
+msgstr "Die <a href=\"%1$s\">Versionshinweise</a> sind eine kurze Zusammenfassung der wichtigsten Änderungen, Verbesserungen, Fehlerbereinigungen und <a href=\"%2$s\">bekannten Problemen</a> in der aktuellen Version von WinMerge."
#: about\license.php:6
#, c-format
@@ -774,7 +774,7 @@
#: docs\releasenotes.php:11
#, c-format
msgid "The release notes are currently not available..."
-msgstr ""
+msgstr "Die Versionshinweise sind derzeit nicht verfügbar..."
#: support\tracker-shortcuts.php:23
#, c-format
@@ -824,7 +824,7 @@
#: docs\index.php:15
#, c-format
msgid "The <a href=\"%s\">change log</a> is a more complete list of changes in the last WinMerge releases."
-msgstr ""
+msgstr "Die <a href=\"%s\">Versionshistorie</a> ist eine vollständigere Liste der Änderungen in den letzten WinMerge-Veröffentlichungen."
#: engine\page.inc:303
#, c-format
@@ -839,7 +839,7 @@
#: docs\index.php:17
#, c-format
msgid "The <a href=\"%s\">Development Wiki</a> contains much information about the WinMerge development."
-msgstr ""
+msgstr "Das <a href=\"%s\">Entwickler-Wiki</a> enthält viele Informationen über die WinMerge-Entwicklung."
#: downloads\index.php:16
#, c-format
@@ -1134,7 +1134,7 @@
#: index.php:43
#, c-format
msgid "If you need support, look at our <a href=\"%s\">support page</a> for more information how you can get it."
-msgstr ""
+msgstr "Wenn Sie Hilfe benötigen, schauen Sie sich unsere <a href=\"%s\">Support-Seite</a> für mehr Informationen an."
#: engine\page.inc:318
#, c-format
@@ -1164,7 +1164,7 @@
#: downloads\source-code.php:6
#, c-format
msgid "WinMerge, free, download, source code, GPL, Subversion, SVN, TortoiseSVN"
-msgstr ""
+msgstr "WinMerge, frei, Download, Quelltext, GPL, Subversion, SVN, TortoiseSVN"
#: docs\releasenotes.php:5
#, c-format
@@ -1334,7 +1334,7 @@
#: docs\index.php:11
#, c-format
msgid "The <a href=\"%s\">manual</a> explains how to use WinMerge, and documents its capabilities and limitations."
-msgstr ""
+msgstr "Das <a href=\"%s\">Handbuch</a> erklärt wie man WinMerge verwendet und dokumentiert Fähigkeiten sowie Einschränkungen."
#: engine\page.inc:302
#, c-format
@@ -1446,7 +1446,7 @@
#: about\screenshots\index.php:25
#, c-format
msgid "Highlight Line Diff"
-msgstr ""
+msgstr "Zeilenunterschiede hervorheben"
#: index.php:15
#: about\index.php:66
@@ -1526,7 +1526,7 @@
#: about\index.php:69
#, c-format
msgid "See the <a href=\"%s\">screenshots page</a> for more screenshots."
-msgstr ""
+msgstr "Schauen Sie sich die <a href=\"%s\">Screenshots-Seite</a> für mehr Bildschirmfotos an."
#: index.php:37
#: downloads\index.php:88
@@ -1548,7 +1548,7 @@
#: downloads\index.php:68
#, c-format
msgid "Experimental Builds"
-msgstr ""
+msgstr "Experimentelle Builds"
#: engine\page.inc:313
#, c-format
@@ -1590,7 +1590,7 @@
#: downloads\pad-file.php:38
#, c-format
msgid "Release Date"
-msgstr ""
+msgstr "Veröffentlichungsdatum"
#: support\index.php:13
#, c-format
@@ -1653,7 +1653,7 @@
#: translations\index.php:31
#, c-format
msgid "Translating"
-msgstr ""
+msgstr "Übersetzen"
#: about\screenshots\index.php:15
#: about\screenshots\index.php:16
@@ -1717,7 +1717,7 @@
#: about\history.php:6
#, c-format
msgid "WinMerge, history, version number, release date, manual, users guide"
-msgstr ""
+msgstr "WinMerge, Historie, Versionsnummer, Veröffentlichungsdatum , Handbuch, Benutzerhandbuch"
#: downloads\index.php:10
#: downloads\index.php:12
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2009-09-03 15:29:45
|
Revision: 6984
http://winmerge.svn.sourceforge.net/winmerge/?rev=6984&view=rev
Author: gerundt
Date: 2009-09-03 15:29:35 +0000 (Thu, 03 Sep 2009)
Log Message:
-----------
Update Swedish website translation
Modified Paths:
--------------
trunk/Translations/Web/se.po
Modified: trunk/Translations/Web/se.po
===================================================================
--- trunk/Translations/Web/se.po 2009-09-01 17:00:32 UTC (rev 6983)
+++ trunk/Translations/Web/se.po 2009-09-03 15:29:35 UTC (rev 6984)
@@ -155,7 +155,7 @@
#: engine\engine.inc:21
#, c-format
msgid "French"
-msgstr "Fransk"
+msgstr "Franska"
#: translations\instructions.php:15
#, c-format
@@ -457,7 +457,7 @@
#: translations\index.php:24
#, c-format
msgid "English"
-msgstr "Engelsk"
+msgstr "Engelska"
#: support\index.php:19
#, c-format
@@ -467,7 +467,7 @@
#: engine\engine.inc:23
#, c-format
msgid "Swedish"
-msgstr "Svensk"
+msgstr "Svenska"
#: engine\page.inc:283
#: engine\page.inc:288
@@ -1280,7 +1280,7 @@
#: downloads\plugins.php:11
#, c-format
msgid "This is the 7-Zip plugin for WinMerge and the current version <strong>%1$s</strong> was released at <strong>%2$s</strong>."
-msgstr "Detta är 7-Zip plugin för WinMergeoch den akuella versionen <strong>%1$s</strong> släpptes <strong>%2$s</strong>."
+msgstr "Detta är 7-Zip plugin för WinMerge och den aktuella versionen <strong>%1$s</strong> släpptes <strong>%2$s</strong>."
#: 404.php:23
#, c-format
@@ -1315,7 +1315,7 @@
#: engine\engine.inc:20
#, c-format
msgid "German"
-msgstr "Tysk"
+msgstr "Tyska"
#: support\index.php:14
#, c-format
@@ -1456,7 +1456,7 @@
#: about\screenshots\index.php:13
#, c-format
msgid "File Comparison"
-msgstr "Filjänförelse"
+msgstr "Filjämförelse"
#: engine\page.inc:261
#, c-format
@@ -1481,7 +1481,7 @@
#: engine\engine.inc:22
#, c-format
msgid "Dutch"
-msgstr "Nederländsk"
+msgstr "Nederländska"
#: support\index.php:7
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2009-09-01 17:00:41
|
Revision: 6983
http://winmerge.svn.sourceforge.net/winmerge/?rev=6983&view=rev
Author: gerundt
Date: 2009-09-01 17:00:32 +0000 (Tue, 01 Sep 2009)
Log Message:
-----------
Update German web PO file
Modified Paths:
--------------
trunk/Translations/Web/de.po
Modified: trunk/Translations/Web/de.po
===================================================================
--- trunk/Translations/Web/de.po 2009-09-01 16:54:14 UTC (rev 6982)
+++ trunk/Translations/Web/de.po 2009-09-01 17:00:32 UTC (rev 6983)
@@ -12,7 +12,7 @@
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2009-08-26 19:57+0100\n"
+"PO-Revision-Date: 2009-08-29 18:11+0100\n"
"Last-Translator: Tim Gerundt <tim at gerundt.de>\n"
"Language-Team: German <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -22,10 +22,10 @@
"X-Poedit-SourceCharset: utf-8\n"
"X-Poedit-Basepath: ../../Web/\n"
-#: downloads\index.php:22
+#: about\screenshots\index.php:26
#, c-format
-msgid "Exe-Format (%s MB)"
-msgstr "Exe-Format (%s MB)"
+msgid "Many times it is useful to see exact differences inside lines. WinMerge can highlight different areas between lines."
+msgstr ""
#: 404.php:13
#, c-format
@@ -77,14 +77,14 @@
msgid "Handles Windows, Unix and Mac text file formats"
msgstr ""
-#: translations\index.php:6
-#: translations\status_branch.php:7
-#: translations\status_branch.php:10
+#: engine\page.inc:312
+#: support\tracker-shortcuts.php:7
+#: support\tracker-shortcuts.php:9
#, c-format
-msgid "Translations Status (Stable Branch)"
-msgstr "Übersetzungs-Status (Stabiler „Branch“)"
+msgid "Tracker Shortcuts"
+msgstr ""
-#: engine\page.inc:295
+#: engine\page.inc:298
#, c-format
msgid "WinMerge Change Log"
msgstr "WinMerge Versionshistorie"
@@ -121,37 +121,52 @@
msgid "The translations status is currently not available..."
msgstr ""
-#: engine\page.inc:306
+#: engine\page.inc:295
#, c-format
+msgid "WinMerge Manual"
+msgstr "WinMerge Handbuch"
+
+#: engine\page.inc:309
+#, c-format
msgid "WinMerge Discussion Forums"
msgstr "WinMerge Diskussionsforen"
-#: support\mailing-lists.php:77
+#: about\license.php:5
#, c-format
-msgid "Subscribers to this list get notices of each and every code change commited to Subversion."
+msgid "WinMerge is Open Source software under the GNU General Public License. This means everybody can download the source code and improve and modify it."
msgstr ""
+#: downloads\pad-file.php:90
+#, c-format
+msgid "Company"
+msgstr "Firma"
+
#: support\mailing-lists.php:13
#: support\mailing-lists.php:30
#, c-format
msgid "Support List"
msgstr "Support-Liste"
-#: engine\page.inc:302
+#: engine\page.inc:305
#, c-format
msgid "WinMerge PAD File"
msgstr "WinMerge PAD-Datei"
-#: about\screenshots\index.php:26
+#: engine\engine.inc:21
#, c-format
-msgid "Many times it is useful to see exact differences inside lines. WinMerge can highlight different area between lines."
-msgstr ""
+msgid "French"
+msgstr "Französisch"
#: translations\instructions.php:15
#, c-format
msgid "Source: %s"
msgstr "Quelle: %s"
+#: downloads\plugins.php:6
+#, c-format
+msgid "WinMerge, free, download, plugins, plugin, plug-in, setup, installer, binaries, 7-Zip, xdocdiff, Word, Excel, PowerPoint, PDF"
+msgstr ""
+
#: translations\index.php:37
#, c-format
msgid "The following two pages inform you about the translations status of the stable and developer version of WinMerge:"
@@ -165,7 +180,7 @@
#: about\history.php:45
#, c-format
msgid "Withdrawn due to installer bug!"
-msgstr ""
+msgstr "Zurückgezogen wegen Setup-Fehler!"
#: translations\index.php:40
#, c-format
@@ -195,7 +210,7 @@
#: about\history.php:7
#: about\history.php:9
-#: engine\page.inc:287
+#: engine\page.inc:290
#, c-format
msgid "History"
msgstr "Historie"
@@ -210,10 +225,10 @@
msgid "<a href=\"%s\">Documentation</a>?"
msgstr "<a href=\"%s\">Dokumentation</a>?"
-#: support\mailing-lists.php:57
+#: downloads\pad-file.php:78
#, c-format
-msgid "This list is used for coordinating the translations."
-msgstr ""
+msgid "Icon"
+msgstr "Icon"
#: support\mailing-lists.php:32
#: support\mailing-lists.php:42
@@ -224,6 +239,7 @@
#: downloads\index.php:28
#: downloads\index.php:34
+#: downloads\plugins.php:22
#: downloads\source-code.php:18
#, c-format
msgid "7z-Format (%s MB)"
@@ -239,17 +255,17 @@
msgid "Installation"
msgstr "Installation"
-#: support\index.php:19
+#: downloads\source-code.php:15
#, c-format
-msgid "Wish list items on the <a href=\"%s\">feature request list</a> will also be considered, but we make absolutely no promises."
-msgstr ""
+msgid "WinMerge %s - Source Code"
+msgstr "WinMerge %s - Quelltext"
#: about\index.php:58
#, c-format
msgid "<a href=\"%s\">Online manual</a> and installed HTML Help manual"
msgstr ""
-#: engine\page.inc:309
+#: engine\page.inc:312
#, c-format
msgid "WinMerge Tracker Shortcuts"
msgstr ""
@@ -259,6 +275,11 @@
msgid "<em>Tracker Shortcuts</em> are shorter and nicer URLs to <a href=\"%1$s\">Tracker</a> items from our <a href=\"%2$s\">SF.net project page</a>."
msgstr ""
+#: downloads\pad-file.php:10
+#, c-format
+msgid "The easiest way to get informations about the latest stable version from WinMerge for your web site is the <a href=\"%s\">Portable Application Description</a> file, which you find here:"
+msgstr ""
+
#: support\tracker-shortcuts.php:14
#, c-format
msgid "Patch"
@@ -274,8 +295,8 @@
msgid "Folder compare shows all files and subfolders found from compared folders as list. Folder compare allows synchronising folders by copying and deleting files and subfolders. Folder compare view can be versatile customised."
msgstr ""
-#: engine\page.inc:262
-#: engine\page.inc:305
+#: engine\page.inc:265
+#: engine\page.inc:308
#, c-format
msgid "WinMerge Support"
msgstr "WinMerge Support"
@@ -285,10 +306,12 @@
msgid "We require registering because anonymous submissions caused a lot of spam and also because there were no possibility to contact people for asking more information."
msgstr ""
-#: docs\index.php:5
+#: engine\page.inc:310
+#: support\mailing-lists.php:7
+#: support\mailing-lists.php:9
#, c-format
-msgid "Documentation from WinMerge like manual, release notes, change log and development wiki."
-msgstr ""
+msgid "Mailing Lists"
+msgstr "Verteilerlisten"
#: about\index.php:41
#, c-format
@@ -306,17 +329,18 @@
msgid "WinMerge is an <a href=\"%s\">Open Source</a> differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle."
msgstr ""
-#: support\tracker-shortcuts.php:5
+#: support\index.php:18
#, c-format
-msgid "Tracker Shortcuts are shorter and nicer URLs to Tracker items from our SF.net project page. And you can use this page to create a shortcut."
+msgid "We rarely sent direct emails but you will get notifications when we ask questions in the bug item."
msgstr ""
#: downloads\index.php:25
+#: downloads\plugins.php:20
#, c-format
msgid "Binaries"
msgstr "Binärdateien"
-#: engine\page.inc:294
+#: engine\page.inc:297
#, c-format
msgid "WinMerge Known Issues"
msgstr "Bekannte WinMerge Probleme"
@@ -331,8 +355,13 @@
msgid "You can also download additional <a href=\"%1$s\">plugins</a> and the whole <a href=\"%2$s\">source code</a> from WinMerge."
msgstr ""
+#: support\mailing-lists.php:57
+#, c-format
+msgid "This list is used for coordinating the translations."
+msgstr ""
+
#: about\license.php:30
-#: engine\page.inc:281
+#: engine\page.inc:284
#, c-format
msgid "Links"
msgstr "Links"
@@ -345,7 +374,7 @@
#: support\tracker-shortcuts.php:15
#, c-format
msgid "Support Request"
-msgstr ""
+msgstr "Support-Anfrage"
#: support\mailing-lists.php:17
#: support\mailing-lists.php:70
@@ -362,14 +391,12 @@
#: support\tracker-shortcuts.php:16
#, c-format
msgid "Feature Request"
-msgstr ""
+msgstr "Funktions-Anfrage"
-#: engine\page.inc:307
-#: support\mailing-lists.php:7
-#: support\mailing-lists.php:9
+#: support\index.php:11
#, c-format
-msgid "Mailing Lists"
-msgstr "Verteilerlisten"
+msgid "The <a href=\"%s\">Open Discussion forum</a> is the fastest way to get help. Please be patient, it may take some time for somebody to answer."
+msgstr ""
#: about\index.php:31
#, c-format
@@ -391,10 +418,15 @@
msgid "WinMerge, screenshots, file comparison, open-dialog, folder comparison results, highlight line diff, location pane, splash screen"
msgstr ""
-#: engine\page.inc:315
+#: downloads\pad-file.php:72
#, c-format
+msgid "Web Addresses"
+msgstr "Internet-Adressen"
+
+#: engine\page.inc:318
+#, c-format
msgid "WinMerge Translations Status (Stable Branch)"
-msgstr ""
+msgstr "WinMerge Übersetzungs-Status (Stabiler „Branch“)"
#: about\index.php:74
#, c-format
@@ -406,10 +438,10 @@
msgid "Difference pane shows current difference in two vertical panes"
msgstr ""
-#: downloads\index.php:58
+#: engine\page.inc:317
#, c-format
-msgid "Microsoft Windows 98/2000/XP/2003/Vista/2008"
-msgstr "Microsoft Windows 98/2000/XP/2003/Vista/2008"
+msgid "Instructions"
+msgstr "Anleitung"
#: index.php:27
#, c-format
@@ -427,24 +459,29 @@
msgid "English"
msgstr "Englisch"
-#: support\tracker-shortcuts.php:11
+#: support\index.php:19
#, c-format
-msgid "You can use this page to create a shortcut:"
+msgid "Wish list items on the <a href=\"%s\">feature request list</a> will also be considered, but we make absolutely no promises."
msgstr ""
-#: engine\page.inc:280
-#: engine\page.inc:285
-#: engine\page.inc:291
-#: engine\page.inc:305
-#: engine\page.inc:313
+#: engine\engine.inc:23
#, c-format
+msgid "Swedish"
+msgstr "Schwedisch"
+
+#: engine\page.inc:283
+#: engine\page.inc:288
+#: engine\page.inc:294
+#: engine\page.inc:308
+#: engine\page.inc:316
+#, c-format
msgid "Index"
msgstr "Index"
-#: engine\page.inc:300
+#: downloads\plugins.php:10
#, c-format
-msgid "Download WinMerge Plugins"
-msgstr "WinMerge Plugins herunterladen"
+msgid "7-Zip Plugin"
+msgstr "7-Zip Plugin"
#: index.php:20
#, c-format
@@ -454,7 +491,7 @@
#: translations\index.php:11
#, c-format
msgid "We currently have WinMerge translated into the languages listed below:"
-msgstr ""
+msgstr "Wir haben aktuell WinMerge in die folgenden Sprachen übersetzt:"
#: translations\index.php:33
#, c-format
@@ -475,12 +512,12 @@
msgid "Announce List"
msgstr "Ankündigungsliste"
-#: engine\page.inc:316
+#: engine\page.inc:319
#, c-format
msgid "Status (Unstable Trunk)"
msgstr "Status (Unstabiler „Trunk“)"
-#: engine\page.inc:261
+#: engine\page.inc:264
#, c-format
msgid "WinMerge Downloads"
msgstr "WinMerge Downloads"
@@ -490,19 +527,17 @@
msgid "Japanese WinMerge Version"
msgstr "Japanische WinMerge-Version"
-#: engine\page.inc:308
+#: engine\page.inc:311
#, c-format
msgid "Tracker"
msgstr ""
-#: about\history.php:20
-#: docs\changelog.php:7
-#: docs\changelog.php:8
-#: docs\index.php:14
-#: engine\page.inc:295
+#: about\index.php:67
+#: about\screenshots\index.php:18
+#: about\screenshots\index.php:19
#, c-format
-msgid "Change Log"
-msgstr "Versionshistorie"
+msgid "Folder Comparison Results"
+msgstr ""
#: downloads\index.php:69
#, c-format
@@ -530,16 +565,26 @@
msgid "WinMerge, free, download, Windows, setup, installer, binaries, runtimes, stable, beta, experimental, portable"
msgstr ""
-#: engine\page.inc:296
+#: downloads\pad-file.php:48
#, c-format
+msgid "Type"
+msgstr "Typ"
+
+#: engine\page.inc:299
+#, c-format
msgid "WinMerge Development Wiki"
-msgstr ""
+msgstr "WinMerge Entwickler-Wiki"
#: downloads\index.php:15
#, c-format
msgid "The current WinMerge version is <strong>%1$s</strong> and was released at <strong>%2$s</strong>."
msgstr ""
+#: about\index.php:21
+#, c-format
+msgid "Supports Microsoft Windows 98/ME/2000/XP/2003/Vista/2008"
+msgstr "Unterstützt Microsoft Windows 98/ME/2000/XP/2003/Vista/2008"
+
#: 404.php:22
#, c-format
msgid "<a href=\"%s\">Release Notes</a>?"
@@ -565,17 +610,12 @@
msgid "Resolve conflict files"
msgstr "Konflikt-Dateien lösen"
-#: engine\page.inc:261
+#: engine\page.inc:264
#, c-format
msgid "Downloads"
msgstr "Downloads"
-#: translations\index.php:29
-#, c-format
-msgid "To change languages, select the desired language from the <span class=\"guimenu\">View</span>→ <span class=\"guimenuitem\">Languages</span> menu choice."
-msgstr ""
-
-#: engine\page.inc:263
+#: engine\page.inc:266
#: translations\index.php:8
#: translations\index.php:10
#, c-format
@@ -587,27 +627,37 @@
msgid "Since WinMerge is an <a href=\"%s\">Open Source</a> project, you may use it free of charge."
msgstr ""
-#: engine\page.inc:282
+#: engine\page.inc:285
#, c-format
msgid "Project Page"
msgstr "Projektseite"
#: about\index.php:7
#: about\index.php:10
-#: engine\page.inc:259
-#: engine\page.inc:285
+#: engine\page.inc:262
+#: engine\page.inc:288
#, c-format
msgid "About WinMerge"
msgstr "Über WinMerge"
-#: engine\page.inc:263
-#: engine\page.inc:313
+#: engine\page.inc:266
+#: engine\page.inc:316
#, c-format
msgid "WinMerge Translations"
msgstr "WinMerge Übersetzungen"
-#: engine\page.inc:308
+#: downloads\pad-file.php:6
#, c-format
+msgid "WinMerge, PAD file, Portable Application Description"
+msgstr ""
+
+#: downloads\pad-file.php:40
+#, c-format
+msgid "Release Status"
+msgstr ""
+
+#: engine\page.inc:311
+#, c-format
msgid "WinMerge Tracker"
msgstr ""
@@ -621,18 +671,23 @@
msgid "Download the current WinMerge version %1$s, which was released at %2$s. For detailed info on what is new, read the change log and the release notes."
msgstr ""
-#: engine\page.inc:294
+#: engine\page.inc:297
#, c-format
msgid "Known Issues"
msgstr "Bekannte Probleme"
+#: translations\index.php:29
+#, c-format
+msgid "To change language, select the desired language from the <span class=\"guimenu\">View</span>→ <span class=\"guimenuitem\">Language</span> menu choice."
+msgstr ""
+
#: translations\translations.inc:136
#: translations\translations_branch.inc:71
#, c-format
msgid "Last Update"
msgstr "Letztes Update"
-#: engine\page.inc:301
+#: engine\page.inc:304
#, c-format
msgid "Source Code"
msgstr "Quelltext"
@@ -650,6 +705,11 @@
msgid "Zip-Format (%s MB)"
msgstr "Zip-Format (%s MB)"
+#: support\tracker-shortcuts.php:5
+#, c-format
+msgid "Tracker Shortcuts are shorter and nicer URLs to Tracker items from our SF.net project page. And you can use this page to create a shortcut."
+msgstr ""
+
#: support\tracker-shortcuts.php:18
#, c-format
msgid "Tracker Item"
@@ -667,23 +727,18 @@
#: docs\index.php:7
#: docs\index.php:9
-#: engine\page.inc:260
+#: engine\page.inc:263
#, c-format
msgid "Documentation"
msgstr "Dokumentation"
#: about\history.php:19
#: docs\index.php:10
-#: engine\page.inc:292
+#: engine\page.inc:295
#, c-format
msgid "Manual"
msgstr "Handbuch"
-#: docs\index.php:17
-#, c-format
-msgid "The <a href=\"%s\">Development Wiki</a> contains many informations about the WinMerge development."
-msgstr ""
-
#: index.php:8
#: index.php:30
#, c-format
@@ -700,10 +755,10 @@
msgid "WinMerge, license, open source, GNU General Public License, GPL, free software"
msgstr ""
-#: engine\page.inc:282
+#: downloads\pad-file.php:94
#, c-format
-msgid "WinMerge Project Page"
-msgstr "WinMerge Projektseite"
+msgid "Contact"
+msgstr "Kontakt"
#: downloads\index.php:40
#: downloads\source-code.php:24
@@ -711,7 +766,7 @@
msgid "SHA-1 Checksums"
msgstr "SHA-1 Prüfsummen"
-#: engine\page.inc:228
+#: engine\page.inc:231
#, c-format
msgid "Version %1$s; %2$s MB"
msgstr "Version %1$s; %2$s MB"
@@ -721,15 +776,10 @@
msgid "The release notes are currently not available..."
msgstr ""
-#: translations\translations.inc:81
-#: translations\translations.inc:95
-#: translations\translations.inc:133
-#: translations\translations_branch.inc:49
-#: translations\translations_branch.inc:68
-#: translations\translations_branch.inc:118
+#: support\tracker-shortcuts.php:23
#, c-format
-msgid "Translated"
-msgstr "Übersetzt"
+msgid "Type:"
+msgstr "Typ:"
#: support\tracker-shortcuts.php:6
#, c-format
@@ -741,6 +791,11 @@
msgid "The Open Discussion forum is the fastest way to get help. A other way is a subscription to the support mailing list."
msgstr ""
+#: downloads\plugins.php:32
+#, c-format
+msgid "For more details and the download go to the <a href=\"%s\">xdocdiff plugin homepage</a>."
+msgstr ""
+
#: translations\index.php:39
#, c-format
msgid "Stable Version (Branch)"
@@ -751,7 +806,7 @@
msgid "English (Template)"
msgstr "Englisch (Vorlage)"
-#: engine\page.inc:281
+#: engine\page.inc:284
#, c-format
msgid "WinMerge Links"
msgstr "WinMerge Links"
@@ -761,38 +816,41 @@
msgid "Location pane is a handy side-pane showing a overall (difference) map of files compared."
msgstr ""
-#: about\license.php:10
+#: docs\index.php:5
#, c-format
-msgid ""
-"This means everybody can download the <a href=\"%s\">source code</a> and improve and modify them.\n"
-"The only thing we ask is that people submit their improvements and modifications back to us so that all WinMerge users may benefit."
+msgid "Documentation from WinMerge like manual, release notes, change log and Development Wiki."
msgstr ""
-#: engine\page.inc:302
-#, c-format
-msgid "PAD File"
-msgstr "PAD-Datei"
-
#: docs\index.php:15
#, c-format
msgid "The <a href=\"%s\">change log</a> is a more complete list of changes in the last WinMerge releases."
msgstr ""
-#: engine\page.inc:316
+#: engine\page.inc:303
#, c-format
+msgid "Download WinMerge Plugins"
+msgstr "WinMerge Plugins herunterladen"
+
+#: engine\page.inc:319
+#, c-format
msgid "WinMerge Translations Status (Unstable Trunk)"
-msgstr ""
+msgstr "WinMerge Übersetzungs-Status (Unstabiler „Trunk“)"
-#: support\tracker-shortcuts.php:23
+#: docs\index.php:17
#, c-format
-msgid "Type:"
-msgstr "Typ:"
+msgid "The <a href=\"%s\">Development Wiki</a> contains much information about the WinMerge development."
+msgstr ""
#: downloads\index.php:16
#, c-format
msgid "For detailed info on what is new, read the <a href=\"%1$s\">change log</a> and the <a href=\"%2$s\">release notes</a>."
msgstr ""
+#: support\mailing-lists.php:77
+#, c-format
+msgid "Subscribers to this list get notices of each and every code change commited to Subversion."
+msgstr ""
+
#: support\mailing-lists.php:14
#: support\mailing-lists.php:40
#, c-format
@@ -804,43 +862,51 @@
msgid "If you are interested in contributing work to the project, see our <a href=\"%s\">developer page</a> for further information on how you may contribute."
msgstr ""
-#: translations\translations.inc:182
+#: downloads\plugins.php:7
+#: downloads\plugins.php:9
#, c-format
-msgid "Total: Unknown"
-msgstr "Gesamt: Unbekannt"
+msgid "Download Plugins"
+msgstr "Plugins herunterladen"
+#: downloads\pad-file.php:58
+#: downloads\pad-file.php:60
+#: downloads\pad-file.php:62
+#, c-format
+msgid "English Description (%d chars)"
+msgstr "Englische Beschreibung (%d Zeichen)"
+
#: about\index.php:29
#, c-format
msgid "Visual differencing and merging of text files"
msgstr ""
+#: engine\page.inc:285
+#, c-format
+msgid "WinMerge Project Page"
+msgstr "WinMerge Projektseite"
+
#: downloads\index.php:60
#, c-format
msgid "Admin rights for the installer"
msgstr "Administrationsrechte für den Setup"
-#: support\mailing-lists.php:15
-#: support\mailing-lists.php:50
+#: downloads\plugins.php:28
#, c-format
-msgid "Translate List"
-msgstr "Übersetzungsliste"
+msgid "You can also read the <a href=\"%1$s\">Release Notes</a> or search for <a href=\"%2$s\">other versions</a>."
+msgstr ""
-#: support\mailing-lists.php:25
-#: support\mailing-lists.php:35
-#: support\mailing-lists.php:45
-#: support\mailing-lists.php:55
-#: support\mailing-lists.php:65
-#: support\mailing-lists.php:75
+#: engine\page.inc:289
#, c-format
-msgid "Archive"
-msgstr "Archiv"
+msgid "WinMerge Screenshots"
+msgstr "WinMerge Screenshots"
-#: support\index.php:18
+#: downloads\pad-file.php:42
#, c-format
-msgid "We rarely sent direct emails but you will get notifications when we ask questions in the bug item."
-msgstr ""
+msgid "Download"
+msgstr "Download"
#: downloads\index.php:20
+#: downloads\plugins.php:15
#, c-format
msgid "Installer"
msgstr "Setup"
@@ -853,12 +919,12 @@
#: about\index.php:64
#: about\screenshots\index.php:7
#: about\screenshots\index.php:9
-#: engine\page.inc:286
+#: engine\page.inc:289
#, c-format
msgid "Screenshots"
msgstr "Screenshots"
-#: engine\page.inc:287
+#: engine\page.inc:290
#, c-format
msgid "WinMerge History"
msgstr "WinMerge Historie"
@@ -866,8 +932,18 @@
#: about\index.php:78
#, c-format
msgid "Here is the current <a href=\"%s\">change log</a>."
+msgstr "Hier ist die aktuelle <a href=\"%s\">Versionshistorie</a>."
+
+#: support\tracker-shortcuts.php:11
+#, c-format
+msgid "You can use this page to create a shortcut:"
msgstr ""
+#: downloads\pad-file.php:5
+#, c-format
+msgid "The easiest way to get informations about the latest stable version from WinMerge for your web site is the Portable Application Description file, which you find here."
+msgstr ""
+
#: translations\translations.inc:41
#, c-format
msgid "File not found."
@@ -895,7 +971,8 @@
msgstr ""
#: index.php:42
-#: engine\page.inc:262
+#: downloads\pad-file.php:96
+#: engine\page.inc:265
#: support\index.php:8
#: support\index.php:10
#, c-format
@@ -917,6 +994,16 @@
msgid "Download the source code of WinMerge, which is released under the GNU General Public License."
msgstr ""
+#: translations\translations.inc:81
+#: translations\translations.inc:95
+#: translations\translations.inc:133
+#: translations\translations_branch.inc:49
+#: translations\translations_branch.inc:68
+#: translations\translations_branch.inc:118
+#, c-format
+msgid "Translated"
+msgstr "Übersetzt"
+
#: index.php:46
#, c-format
msgid "WinMerge is an open source project, which means that the program is maintained and developed by volunteers."
@@ -947,14 +1034,12 @@
msgid "Or you may simply unzip the <a href=\"%s\">binary zip package</a> into the desired location, and run <code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>)."
msgstr ""
-#: engine\page.inc:309
-#: support\tracker-shortcuts.php:7
-#: support\tracker-shortcuts.php:9
+#: downloads\pad-file.php:56
#, c-format
-msgid "Tracker Shortcuts"
-msgstr ""
+msgid "English Descriptions"
+msgstr "Englische Beschreibungen"
-#: engine\page.inc:310
+#: engine\page.inc:313
#: support\index.php:37
#, c-format
msgid "Donate"
@@ -982,10 +1067,10 @@
msgid "The Open Source Definition"
msgstr "Die Open-Source-Definition"
-#: engine\page.inc:258
+#: downloads\pad-file.php:46
#, c-format
-msgid "Home"
-msgstr "Home"
+msgid "Supported Languages"
+msgstr "Unterstützte Sprachen"
#: index.php:6
#, c-format
@@ -997,16 +1082,32 @@
msgid "Beta Versions"
msgstr "Beta-Versionen"
+#: downloads\pad-file.php:76
+#, c-format
+msgid "Screenshot"
+msgstr "Screenshot"
+
#: about\index.php:6
#, c-format
msgid "WinMerge, about, features, file compare, folder compare, version control, screenshots, installation"
msgstr ""
-#: engine\page.inc:286
+#: support\mailing-lists.php:15
+#: support\mailing-lists.php:50
#, c-format
-msgid "WinMerge Screenshots"
-msgstr "WinMerge Screenshots"
+msgid "Translate List"
+msgstr "Übersetzungsliste"
+#: downloads\index.php:58
+#, c-format
+msgid "Microsoft Windows 98/ME/2000/XP/2003/Vista/2008"
+msgstr "Microsoft Windows 98/ME/2000/XP/2003/Vista/2008"
+
+#: downloads\plugins.php:5
+#, c-format
+msgid "Download additional plugins for WinMerge, like the 7-Zip plugin or the xdocdiff Plugin."
+msgstr ""
+
#: translations\index.php:7
#: translations\status_trunk.php:7
#: translations\status_trunk.php:9
@@ -1035,7 +1136,7 @@
msgid "If you need support, look at our <a href=\"%s\">support page</a> for more information how you can get it."
msgstr ""
-#: engine\page.inc:315
+#: engine\page.inc:318
#, c-format
msgid "Status (Stable Branch)"
msgstr "Status (Stabiler „Branch“)"
@@ -1043,7 +1144,7 @@
#: about\index.php:47
#, c-format
msgid "Creates patch files (Normal-, Context- and Unified formats)"
-msgstr ""
+msgstr "Patch-Datei erzeugen (Normal-, Context- und Unified-Format)"
#: translations\instructions.php:9
#, c-format
@@ -1055,6 +1156,11 @@
msgid "Bug"
msgstr "Fehler"
+#: downloads\plugins.php:31
+#, c-format
+msgid "With this plugin you can compare Word, Excel, PowerPoint, PDF and some more files."
+msgstr ""
+
#: downloads\source-code.php:6
#, c-format
msgid "WinMerge, free, download, source code, GPL, Subversion, SVN, TortoiseSVN"
@@ -1075,6 +1181,11 @@
msgid "WinMerge, release notes, summary, changes, enhancements, bug fixes, known issues, release"
msgstr ""
+#: downloads\pad-file.php:14
+#, c-format
+msgid "If you can not work with the <a href=\"%s\">PAD file</a>, you can use the following informations:"
+msgstr ""
+
#: about\index.php:57
#, c-format
msgid "Localizable interface"
@@ -1088,28 +1199,43 @@
#: about\index.php:54
#, c-format
msgid "Shell Integration (supports 64-bit Windows versions)"
-msgstr ""
+msgstr "Shell-Integration (unterstützt 64-bit Windows-Versionen)"
#: about\index.php:55
#, c-format
msgid "Archive file support using 7-Zip"
msgstr ""
-#: support\index.php:11
+#: translations\index.php:6
+#: translations\status_branch.php:7
+#: translations\status_branch.php:10
#, c-format
-msgid "The <a href=\"%s\">Open Discussion forum</a> is the fastest way to get help. Please be patient, it may take some time for somebody to answer."
-msgstr ""
+msgid "Translations Status (Stable Branch)"
+msgstr "Übersetzungs-Status (Stabiler „Branch“)"
#: support\index.php:21
#, c-format
msgid "Tracker Statistics"
msgstr ""
-#: engine\page.inc:301
+#: downloads\pad-file.php:64
#, c-format
+msgid "English Keywords"
+msgstr "Englische Stichwörter"
+
+#: engine\page.inc:304
+#, c-format
msgid "Download WinMerge Source Code"
msgstr "WinMerge Quelltext herunterladen"
+#: downloads\pad-file.php:7
+#: downloads\pad-file.php:9
+#: downloads\pad-file.php:80
+#: engine\page.inc:305
+#, c-format
+msgid "PAD File"
+msgstr "PAD-Datei"
+
#: downloads\index.php:13
#: downloads\source-code.php:39
#, c-format
@@ -1132,20 +1258,27 @@
msgid "Fuzzy"
msgstr "Unklar"
-#: downloads\source-code.php:15
+#: docs\index.php:6
#, c-format
-msgid "WinMerge %s - Source Code"
-msgstr "WinMerge %s - Quelltext"
+msgid "WinMerge, documentation, manual, release notes, known issues, change log, Development Wiki"
+msgstr ""
+#: about\license.php:10
+#, c-format
+msgid ""
+"This means everybody can download the <a href=\"%s\">source code</a> and improve and modify it.\n"
+"The only thing we ask is that people submit their improvements and modifications back to us so that all WinMerge users may benefit."
+msgstr ""
+
#: about\history.php:5
#, c-format
msgid "History of WinMerge releases with version numbers, release dates and manuals."
msgstr ""
-#: engine\page.inc:292
+#: downloads\plugins.php:11
#, c-format
-msgid "WinMerge Manual"
-msgstr "WinMerge Handbuch"
+msgid "This is the 7-Zip plugin for WinMerge and the current version <strong>%1$s</strong> was released at <strong>%2$s</strong>."
+msgstr ""
#: 404.php:23
#, c-format
@@ -1167,6 +1300,16 @@
msgid "Features"
msgstr "Funktionen"
+#: support\mailing-lists.php:25
+#: support\mailing-lists.php:35
+#: support\mailing-lists.php:45
+#: support\mailing-lists.php:55
+#: support\mailing-lists.php:65
+#: support\mailing-lists.php:75
+#, c-format
+msgid "Archive"
+msgstr "Archiv"
+
#: engine\engine.inc:20
#, c-format
msgid "German"
@@ -1177,8 +1320,8 @@
msgid "Please attach as much information as you can: at a minimum, the version number of WinMerge that you are using. If you can, also attach a configuration log which, you can display by clicking <span class=\"guimenu\">Help</span> → <span class=\"guimenuitem\">Configuration</span> in the WinMerge window."
msgstr ""
-#: engine\page.inc:258
-#: engine\page.inc:280
+#: engine\page.inc:261
+#: engine\page.inc:283
#, c-format
msgid "WinMerge Home"
msgstr "WinMerge Home"
@@ -1193,11 +1336,16 @@
msgid "The <a href=\"%s\">manual</a> explains how to use WinMerge, and documents its capabilities and limitations."
msgstr ""
-#: engine\page.inc:299
+#: engine\page.inc:302
#, c-format
msgid "WinMerge"
msgstr "WinMerge"
+#: downloads\plugins.php:30
+#, c-format
+msgid "xdocdiff Plugin"
+msgstr "xdocdiff Plugin"
+
#: support\tracker-shortcuts.php:17
#, c-format
msgid "Todo Item"
@@ -1208,12 +1356,13 @@
msgid "This is the list where participating developers of the WinMerge meet and discuss issues, code changes/additions, etc."
msgstr ""
-#: about\license.php:5
+#: downloads\index.php:22
+#: downloads\plugins.php:17
#, c-format
-msgid "WinMerge is Open Source software under the GNU General Public License. This means everybody can download the source code and improve and modify them."
-msgstr ""
+msgid "Exe-Format (%s MB)"
+msgstr "Exe-Format (%s MB)"
-#: engine\page.inc:300
+#: engine\page.inc:303
#, c-format
msgid "Plugins"
msgstr "Plugins"
@@ -1223,13 +1372,20 @@
msgid "WinMerge, mailing lists, announce, support, user, translate, development, SVN"
msgstr ""
-#: about\index.php:67
-#: about\screenshots\index.php:18
-#: about\screenshots\index.php:19
+#: about\history.php:20
+#: docs\changelog.php:7
+#: docs\changelog.php:8
+#: docs\index.php:14
+#: engine\page.inc:298
#, c-format
-msgid "Folder Comparison Results"
-msgstr ""
+msgid "Change Log"
+msgstr "Versionshistorie"
+#: support\tracker-shortcuts.php:37
+#, c-format
+msgid "Generate"
+msgstr "Erzeugen"
+
#: about\index.php:23
#, c-format
msgid "Unicode support"
@@ -1240,13 +1396,13 @@
msgid "But please consider making a <a href=\"%s\">donation</a> to support the continued development of WinMerge."
msgstr ""
-#: about\index.php:21
+#: downloads\pad-file.php:74
#, c-format
-msgid "Supports Microsoft Windows 98/2000/XP/2003/Vista/2008"
-msgstr "Unterstützt Microsoft Windows 98/2000/XP/2003/Vista/2008"
+msgid "Information"
+msgstr "Information"
-#: engine\page.inc:260
-#: engine\page.inc:291
+#: engine\page.inc:263
+#: engine\page.inc:294
#, c-format
msgid "WinMerge Documentation"
msgstr "WinMerge Dokumentation"
@@ -1300,6 +1456,11 @@
msgid "File Comparison"
msgstr "Dateivergleich"
+#: engine\page.inc:261
+#, c-format
+msgid "Home"
+msgstr "Home"
+
#: support\mailing-lists.php:37
#, c-format
msgid "You should ask all your support questions on this list."
@@ -1315,10 +1476,10 @@
msgid "<a href=\"%s\">Support</a>?"
msgstr "<a href=\"%s\">Support</a>?"
-#: docs\index.php:6
+#: engine\engine.inc:22
#, c-format
-msgid "WinMerge, documentation, manual, release notes, known issues, change log, development wiki"
-msgstr ""
+msgid "Dutch"
+msgstr "Niederländisch"
#: support\index.php:7
#, c-format
@@ -1352,11 +1513,16 @@
msgstr "<a href=\"%s\">Screenshots</a>?"
#: docs\index.php:16
-#: engine\page.inc:296
+#: engine\page.inc:299
#, c-format
msgid "Development Wiki"
-msgstr ""
+msgstr "Entwickler-Wiki"
+#: translations\translations.inc:182
+#, c-format
+msgid "Total: Unknown"
+msgstr "Gesamt: Unbekannt"
+
#: about\index.php:69
#, c-format
msgid "See the <a href=\"%s\">screenshots page</a> for more screenshots."
@@ -1374,7 +1540,7 @@
msgid "Translations instructions"
msgstr "Übersetzungsanleitung"
-#: engine\page.inc:307
+#: engine\page.inc:310
#, c-format
msgid "WinMerge Mailing Lists"
msgstr "WinMerge Verteilerlisten"
@@ -1384,7 +1550,7 @@
msgid "Experimental Builds"
msgstr ""
-#: engine\page.inc:310
+#: engine\page.inc:313
#, c-format
msgid "Donate money to WinMerge"
msgstr ""
@@ -1394,14 +1560,19 @@
msgid "Stable Versions"
msgstr "Stabile Versionen"
-#: engine\page.inc:259
+#: engine\page.inc:262
#, c-format
msgid "About"
msgstr "Über"
+#: downloads\pad-file.php:92
+#, c-format
+msgid "Name"
+msgstr "Name"
+
#: about\license.php:7
#: about\license.php:9
-#: engine\page.inc:288
+#: engine\page.inc:291
#, c-format
msgid "License"
msgstr "Lizenz"
@@ -1411,19 +1582,14 @@
msgid "Other Versions"
msgstr "Andere Versionen"
-#: engine\page.inc:314
+#: engine\page.inc:309
#, c-format
-msgid "Instructions"
-msgstr "Anleitung"
-
-#: engine\page.inc:306
-#, c-format
msgid "Discussion Forums"
msgstr "Diskussionsforen"
-#: support\tracker-shortcuts.php:37
+#: downloads\pad-file.php:38
#, c-format
-msgid "Generate"
+msgid "Release Date"
msgstr ""
#: support\index.php:13
@@ -1441,7 +1607,7 @@
msgid "WinMerge, free, open source, Windows, windiff, diff, merge, compare, tool, utility, text, file, folder, directory, compare files, compare folders, merge files, merge folders, diff tool, merge tool, compare tool"
msgstr ""
-#: engine\page.inc:227
+#: engine\page.inc:230
#, c-format
msgid "Download Now!"
msgstr "Jetzt herunterladen!"
@@ -1459,17 +1625,17 @@
#: docs\index.php:12
#: docs\releasenotes.php:7
#: docs\releasenotes.php:10
-#: engine\page.inc:293
+#: engine\page.inc:296
#, c-format
msgid "Release Notes"
msgstr "Versionshinweise"
-#: engine\page.inc:314
+#: engine\page.inc:317
#, c-format
msgid "WinMerge Translations Instructions"
msgstr "WinMerge Übersetzungsanleitung"
-#: engine\page.inc:293
+#: engine\page.inc:296
#, c-format
msgid "WinMerge Release Notes"
msgstr "WinMerge Versionshinweise"
@@ -1541,9 +1707,9 @@
#: about\license.php:10
#, c-format
msgid "WinMerge is <a href=\"%1$s\">Open Source</a> software under the <a href=\"%2$s\">GNU General Public License</a>."
-msgstr ""
+msgstr "WinMerge ist <a href=\"%1$s\">Open-Source</a>-Software unter der <a href=\"%2$s\">GNU General Public License</a>."
-#: engine\page.inc:288
+#: engine\page.inc:291
#, c-format
msgid "WinMerge License"
msgstr "WinMerge Lizenz"
@@ -1555,16 +1721,21 @@
#: downloads\index.php:10
#: downloads\index.php:12
-#: engine\page.inc:299
+#: engine\page.inc:302
#, c-format
msgid "Download WinMerge"
msgstr "WinMerge herunterladen"
-#: engine\page.inc:366
+#: engine\page.inc:369
#, c-format
msgid "Bookmark this on Delicious"
-msgstr ""
+msgstr "Bookmarken Sie diese Seite bei Delicious"
+#: downloads\pad-file.php:44
+#, c-format
+msgid "Operating Systems"
+msgstr "Betriebssysteme"
+
#: about\screenshots\index.php:14
#, c-format
msgid "File compare window is basically two files opened to editor into two horizontal panes. Editing allows user to easily do small changes without need to open files to other editor or development environment."
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2009-09-01 16:54:21
|
Revision: 6982
http://winmerge.svn.sourceforge.net/winmerge/?rev=6982&view=rev
Author: gerundt
Date: 2009-09-01 16:54:14 +0000 (Tue, 01 Sep 2009)
Log Message:
-----------
Add Frensh website translation by Fr?\195?\169d?\195?\169ric Dectot
Added Paths:
-----------
trunk/Translations/Web/fr.po
Added: trunk/Translations/Web/fr.po
===================================================================
--- trunk/Translations/Web/fr.po (rev 0)
+++ trunk/Translations/Web/fr.po 2009-09-01 16:54:14 UTC (rev 6982)
@@ -0,0 +1,1745 @@
+# This file is part from WinMerge <http://winmerge.org/>
+# Released under the "GNU General Public License"
+#
+# Translators:
+# * Frédéric Dectot <fre...@fr...>
+#
+# ID line follows -- this is updated by SVN
+# $Id$
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: WinMerge\n"
+"Report-Msgid-Bugs-To: http://bugs.winmerge.org\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2009-09-21 01:04+0000\n"
+"Last-Translator: Frédéric Dectot <fre...@fr...>\n"
+"Language-Team: French <win...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: French\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-Basepath: ../../Web/\n"
+
+#: about\screenshots\index.php:26
+#, c-format
+msgid "Many times it is useful to see exact differences inside lines. WinMerge can highlight different areas between lines."
+msgstr "En plusieurs occasions il est utile de voir les différences exactes entre les lignes. Winmerge peut surligner les différentes aires entre les lignes."
+
+#: 404.php:13
+#, c-format
+msgid "This site has recently undergone a major re-working, so that might explain why you got this page instead."
+msgstr "Le site a récemment subi une refonte majeure, alors cela pourrait expliquer pourquoi vous avez cette page en fait."
+
+#: translations\index.php:36
+#, c-format
+msgid "Status"
+msgstr "Statut"
+
+#: docs\changelog.php:11
+#, c-format
+msgid "The change log is currently not available..."
+msgstr "Le journal des changements est encore indisponible..."
+
+#: downloads\index.php:55
+#, c-format
+msgid "Requirements"
+msgstr "Exigences"
+
+#: downloads\source-code.php:33
+#, c-format
+msgid "The source code is hosted on <a href=\"%1$s\">SourceForge.net</a> in a <a href=\"%2$s\">Subversion</a> repository."
+msgstr "Le code source est hébergé chez <a href=\"%1$s\">SourceForge.net</a> dans un référentiel <a href=\"%2$s\">de sous version</a>."
+
+#: about\license.php:35
+#, c-format
+msgid "Open Source Software"
+msgstr "Logiciel open source"
+
+#: index.php:13
+#, c-format
+msgid "What is WinMerge?"
+msgstr "Qu'est-ce que Winmerge ?"
+
+#: support\index.php:15
+#, c-format
+msgid "Good information in a bug report makes it more likely that your bug will be fixed quickly."
+msgstr "Une bonne information dans un rapport de bogue signifie souvent que votre bogue sera éliminé rapidement."
+
+#: about\index.php:30
+#, c-format
+msgid "Flexible editor with syntax highlighting, line numbers and word-wrap"
+msgstr "Un éditeur fléxible avec un surlignage de la syntaxe, les numéros de lignes et les césures de mots"
+
+#: about\index.php:22
+#, c-format
+msgid "Handles Windows, Unix and Mac text file formats"
+msgstr "Gère les formats de fichiers textes Windows, Unix et Mac"
+
+#: engine\page.inc:312
+#: support\tracker-shortcuts.php:7
+#: support\tracker-shortcuts.php:9
+#, c-format
+msgid "Tracker Shortcuts"
+msgstr "Raccourcis traqueurs"
+
+#: engine\page.inc:298
+#, c-format
+msgid "WinMerge Change Log"
+msgstr "Journal des changements de Winmerge"
+
+#: about\screenshots\index.php:27
+#: about\screenshots\index.php:28
+#, c-format
+msgid "Location Pane"
+msgstr "Panneau d'emplacement"
+
+#: translations\translations.inc:177
+#, c-format
+msgid "Template"
+msgstr "Modèle"
+
+#: index.php:45
+#, c-format
+msgid "Developers"
+msgstr "Développeurs"
+
+#: about\index.php:39
+#, c-format
+msgid "Regular Expression based file filters allow excluding and including items"
+msgstr "Une expréssion régulière basée sur les filtres permet l'exclusion et l'inclusion d'objets"
+
+#: downloads\index.php:59
+#, c-format
+msgid "Microsoft Visual C++ 2003 Runtime Components (included in the installer)"
+msgstr "Composants runtime Microsoft Visual C++ 2003 (inclus dans l'installeur)"
+
+#: translations\status_branch.php:18
+#: translations\status_trunk.php:18
+#, c-format
+msgid "The translations status is currently not available..."
+msgstr "Le statut de la traduction est actuellement indisponible..."
+
+#: engine\page.inc:295
+#, c-format
+msgid "WinMerge Manual"
+msgstr "Manuel de Winmerge"
+
+#: engine\page.inc:309
+#, c-format
+msgid "WinMerge Discussion Forums"
+msgstr "Forums de discussion de Winmerge"
+
+#: about\license.php:5
+#, c-format
+msgid "WinMerge is Open Source software under the GNU General Public License. This means everybody can download the source code and improve and modify it."
+msgstr "Winmerge est un logiciel Open source sous la licence générale publique GNU. Cela signifie que tout le monde peut télécharger le code source et l'améliorer et le modifier. "
+
+#: downloads\pad-file.php:90
+#, c-format
+msgid "Company"
+msgstr "Compagnie"
+
+#: support\mailing-lists.php:13
+#: support\mailing-lists.php:30
+#, c-format
+msgid "Support List"
+msgstr "Liste du support"
+
+#: engine\page.inc:305
+#, c-format
+msgid "WinMerge PAD File"
+msgstr "Fichier PAD de Winmerge"
+
+#: engine\engine.inc:21
+#, c-format
+msgid "French"
+msgstr "Français"
+
+#: translations\instructions.php:15
+#, c-format
+msgid "Source: %s"
+msgstr "Source: %s"
+
+#: downloads\plugins.php:6
+#, c-format
+msgid "WinMerge, free, download, plugins, plugin, plug-in, setup, installer, binaries, 7-Zip, xdocdiff, Word, Excel, PowerPoint, PDF"
+msgstr "Winmerge, libre télécharger, plugins, plugin, plug-in, installation, installeur, binaires, 7-zip, xdocdiff, Word, Excel, Powerpoint, PDF"
+
+#: translations\index.php:37
+#, c-format
+msgid "The following two pages inform you about the translations status of the stable and developer version of WinMerge:"
+msgstr "Les deux pages suivantes vous informent sur le statut des traduction des versions stables et développeur de Winmerge:"
+
+#: support\tracker-shortcuts.php:55
+#, c-format
+msgid "Subdomains"
+msgstr "Sous-domaines"
+
+#: about\history.php:45
+#, c-format
+msgid "Withdrawn due to installer bug!"
+msgstr "Retrait du à un bogue de l'installeur !"
+
+#: translations\index.php:40
+#, c-format
+msgid "Unstable Version (Trunk)"
+msgstr "Version instable (tronçon)"
+
+#: about\screenshots\index.php:32
+#, c-format
+msgid "WinMerge 2.8 has a new professional looking splash screen."
+msgstr "Winmerge 2.8 a un nouvel aspect professionnel avec l'écran de démarrage."
+
+#: about\index.php:42
+#, c-format
+msgid "Can show folder compare results in a tree-style view"
+msgstr "Peut montrer les résultats de dossiers comparés dans une vue de style arborescente"
+
+#: about\index.php:16
+#, c-format
+msgid "In addition, WinMerge has many helpful supporting features that make comparing, synchronising, and merging as easy and useful as possible:"
+msgstr "De plus, Winmerge supporte de nombreuses fonctions utiles qui font les comparaisons, la synchronisation, et la fusion et il les rend aussi faciles et utiles que possible:"
+
+#: support\mailing-lists.php:22
+#: support\mailing-lists.php:52
+#, c-format
+msgid "Low Traffic"
+msgstr "Trafic faible"
+
+#: about\history.php:7
+#: about\history.php:9
+#: engine\page.inc:290
+#, c-format
+msgid "History"
+msgstr "Historique"
+
+#: support\mailing-lists.php:27
+#, c-format
+msgid "This list is only for announcing new releases of WinMerge."
+msgstr "Cette liste est réservée aux annonces de nouvelles versions de Winmerge."
+
+#: 404.php:19
+#, c-format
+msgid "<a href=\"%s\">Documentation</a>?"
+msgstr "<a href=\"%s\">Documentation</a>?"
+
+#: downloads\pad-file.php:78
+#, c-format
+msgid "Icon"
+msgstr "Icône"
+
+#: support\mailing-lists.php:32
+#: support\mailing-lists.php:42
+#: support\mailing-lists.php:62
+#, c-format
+msgid "Normal Traffic"
+msgstr "Trafic normal"
+
+#: downloads\index.php:28
+#: downloads\index.php:34
+#: downloads\plugins.php:22
+#: downloads\source-code.php:18
+#, c-format
+msgid "7z-Format (%s MB)"
+msgstr "Format 7z (%s MB)"
+
+#: about\license.php:34
+#, c-format
+msgid "GNU General Public License v2.0"
+msgstr "Licence Générale Publique GNU v2.0"
+
+#: about\index.php:71
+#, c-format
+msgid "Installation"
+msgstr "Installation"
+
+#: downloads\source-code.php:15
+#, c-format
+msgid "WinMerge %s - Source Code"
+msgstr "WinMerge %s - Code source "
+
+#: about\index.php:58
+#, c-format
+msgid "<a href=\"%s\">Online manual</a> and installed HTML Help manual"
+msgstr "<a href=\"%s\">manuel en ligne</a> et manuel d'aide HTML installé"
+
+#: engine\page.inc:312
+#, c-format
+msgid "WinMerge Tracker Shortcuts"
+msgstr "Raccourcis traqueurs de Winmerge"
+
+#: support\tracker-shortcuts.php:10
+#, c-format
+msgid "<em>Tracker Shortcuts</em> are shorter and nicer URLs to <a href=\"%1$s\">Tracker</a> items from our <a href=\"%2$s\">SF.net project page</a>."
+msgstr "<em>Les raccourcis traqueurs</em> sont des adresses web plus courtes et agréables vers le <a href=\"%1$s\">Traqueur</a> des objets issus de notre <a href=\"%2$s\">Page de projet SF.net</a>."
+
+#: downloads\pad-file.php:10
+#, c-format
+msgid "The easiest way to get informations about the latest stable version from WinMerge for your web site is the <a href=\"%s\">Portable Application Description</a> file, which you find here:"
+msgstr "Le moyen le plus facile pour obtenir des informations sur les dernières version stables de Winmerge sont sur notre site web dans le fichier <a href=\"%s\">Description d'application potable</a>, qui peut être trouvé ici:"
+
+#: support\tracker-shortcuts.php:14
+#, c-format
+msgid "Patch"
+msgstr "Patch"
+
+#: support\mailing-lists.php:5
+#, c-format
+msgid "Subscribe or unsubscribe to one of the following mailing lists: Announce, Support, User, Translate, Development and SVN"
+msgstr "S'inscrire ou se désinscrire de l'une des listes de mailing suivantes: Annonces, Support, Traduction, Développement et SVN"
+
+#: about\screenshots\index.php:20
+#, c-format
+msgid "Folder compare shows all files and subfolders found from compared folders as list. Folder compare allows synchronising folders by copying and deleting files and subfolders. Folder compare view can be versatile customised."
+msgstr "Le comparateur de dossiers montre tous les fichiers et sous-dossiers trouvés des dossiers comparés sous forme de listes. Le comparateur de dossiers permet la synchronisation de dossiers en copiant et supprimant les fichiers et sous-dossiers La vue dossier du comparateur peut être particulièrement personnalisée. "
+
+#: engine\page.inc:265
+#: engine\page.inc:308
+#, c-format
+msgid "WinMerge Support"
+msgstr "Support de Winmerge"
+
+#: support\index.php:17
+#, c-format
+msgid "We require registering because anonymous submissions caused a lot of spam and also because there were no possibility to contact people for asking more information."
+msgstr "Nous demandons un enregistrement car les sousmissions anonymes ont causé beaucoup de spams et aussi car il n'y a aucune possibilité de contacter les personnes pour la demande de plus d'informations."
+
+#: engine\page.inc:310
+#: support\mailing-lists.php:7
+#: support\mailing-lists.php:9
+#, c-format
+msgid "Mailing Lists"
+msgstr "Listes de mailing"
+
+#: about\index.php:41
+#, c-format
+msgid "Compares one folder or includes all subfolders"
+msgstr "Compare un dossier ou inclut tous les sous-dossiers"
+
+#: 404.php:12
+#, c-format
+msgid "For some reason (mis-typed URL, faulty referral from another site, out-of-date search engine listing or we simply deleted a file) the page you were looking for could not be found."
+msgstr "Pour certaines raisons (adresses web mal tapées, références erronnées à un autre site, liste de moteurs de recherche trop ancienne ou nous avons simplement supprimé un fichier) la page que vous recherchiez n'a pas pu être trouvée."
+
+#: index.php:19
+#: about\index.php:11
+#, c-format
+msgid "WinMerge is an <a href=\"%s\">Open Source</a> differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle."
+msgstr "WinMerge est un outil <a href=\"%s\">Open Source</a> de différenciation et de fusion pour Windows. WinMerge peut comparer et les dossiers et les fichiers, en repésentant les différences dans un fichier texte visuel qui est facile à comprendre ou manipuler."
+
+#: support\index.php:18
+#, c-format
+msgid "We rarely sent direct emails but you will get notifications when we ask questions in the bug item."
+msgstr "Nous envoyons rarement des mails directs mais vous aurez des notifications quand nous demandons des questions dans les affaires de bogues."
+
+#: downloads\index.php:25
+#: downloads\plugins.php:20
+#, c-format
+msgid "Binaries"
+msgstr "Binaires"
+
+#: engine\page.inc:297
+#, c-format
+msgid "WinMerge Known Issues"
+msgstr "Problèmes connus de Winmerge"
+
+#: about\index.php:76
+#, c-format
+msgid "Using WinMerge"
+msgstr "Utilisation de Winmerge"
+
+#: downloads\index.php:53
+#, c-format
+msgid "You can also download additional <a href=\"%1$s\">plugins</a> and the whole <a href=\"%2$s\">source code</a> from WinMerge."
+msgstr "Vous pouvez aussi télécharger des plugins <a href=\"%1$s\">additionnels </a> et tout <a href=\"%2$s\">le code source</a> de WinMerge."
+
+#: support\mailing-lists.php:57
+#, c-format
+msgid "This list is used for coordinating the translations."
+msgstr "La liste est utilisée pour la coordination des traductions."
+
+#: about\license.php:30
+#: engine\page.inc:284
+#, c-format
+msgid "Links"
+msgstr "Liens"
+
+#: index.php:49
+#, c-format
+msgid "The WinMerge Development Team"
+msgstr "L'équipe de développement de Winmerge"
+
+#: support\tracker-shortcuts.php:15
+#, c-format
+msgid "Support Request"
+msgstr "Requête de support"
+
+#: support\mailing-lists.php:17
+#: support\mailing-lists.php:70
+#, c-format
+msgid "SVN List"
+msgstr "Liste SVN"
+
+#: translations\translations.inc:132
+#: translations\translations_branch.inc:67
+#, c-format
+msgid "Graph"
+msgstr "Graphe"
+
+#: support\tracker-shortcuts.php:16
+#, c-format
+msgid "Feature Request"
+msgstr "Requête de fonction"
+
+#: support\index.php:11
+#, c-format
+msgid "The <a href=\"%s\">Open Discussion forum</a> is the fastest way to get help. Please be patient, it may take some time for somebody to answer."
+msgstr "Le <a href=\"%s\">forum de discussion ouvert</a> est la manière la plus rapide pour obtenir de l'aide. Veuillez être patients, cela peut prendre du temps pour que quelqu'un réponde."
+
+#: about\index.php:31
+#, c-format
+msgid "Highlights differences inside lines"
+msgstr "Surlignages des différences dans les lignes "
+
+#: 404.php:28
+#, c-format
+msgid "<a href=\"%s\">Translations</a>?"
+msgstr "<a href=\"%s\">Traductions</a>?"
+
+#: translations\translations.inc:38
+#, c-format
+msgid "File not valid."
+msgstr "Le fichier n'est pas valide."
+
+#: about\screenshots\index.php:6
+#, c-format
+msgid "WinMerge, screenshots, file comparison, open-dialog, folder comparison results, highlight line diff, location pane, splash screen"
+msgstr "WinMerge, raccourcis, comparaison de fichiers, dialogue-ouvert, résultats de comparaison des dossiers, Surlignage des différences des lignes, panneau d'emplacement, écran de démarrage"
+
+#: downloads\pad-file.php:72
+#, c-format
+msgid "Web Addresses"
+msgstr "Adresses web"
+
+#: engine\page.inc:318
+#, c-format
+msgid "WinMerge Translations Status (Stable Branch)"
+msgstr "Statut des traductions de Winmerge (branche stable)"
+
+#: about\index.php:74
+#, c-format
+msgid "For more information, please see the <a href=\"%1$s\">Installation section</a> of the <a href=\"%2$s\">Manual</a>."
+msgstr "Pour plus d'informations, veuillez vous référer à la <a href=\"%1$s\">Section installation</a> du <a href=\"%2$s\">Manuel</a>."
+
+#: about\index.php:32
+#, c-format
+msgid "Difference pane shows current difference in two vertical panes"
+msgstr "Le panneau des différences montre les différences actuelles entre les deux panneaux verticaux"
+
+#: engine\page.inc:317
+#, c-format
+msgid "Instructions"
+msgstr "Instructions"
+
+#: index.php:27
+#, c-format
+msgid "<a href=\"%1$s\">WinMerge %2$s</a> is the latest stable version, and is recommended for most users."
+msgstr "<a href=\"%1$s\">WinMerge %2$s</a> est la dernière édition stable, et est recommandé pour la plupart des utilisateurs."
+
+#: index.php:48
+#, c-format
+msgid "In addition, WinMerge is translated into a number of different languages. See our <a href=\"%s\">information on translating WinMerge</a> into your own language."
+msgstr "De plus, Winmerge est traduit dans de nombreuses langues. Lisez notre <a href=\"%s\">information sur la traduction de WinMerge</a> dans votre propre langue."
+
+#: engine\engine.inc:19
+#: translations\index.php:24
+#, c-format
+msgid "English"
+msgstr "Anglais"
+
+#: support\index.php:19
+#, c-format
+msgid "Wish list items on the <a href=\"%s\">feature request list</a> will also be considered, but we make absolutely no promises."
+msgstr "Les objets de la liste des voeux <a href=\"%s\">fonction liste des requêtes</a> seront également considérés, mais nous ne faisons absolument aucune promesse."
+
+#: engine\engine.inc:23
+#, c-format
+msgid "Swedish"
+msgstr "Suédois"
+
+#: engine\page.inc:283
+#: engine\page.inc:288
+#: engine\page.inc:294
+#: engine\page.inc:308
+#: engine\page.inc:316
+#, c-format
+msgid "Index"
+msgstr "Index"
+
+#: downloads\plugins.php:10
+#, c-format
+msgid "7-Zip Plugin"
+msgstr "plugin 7-Zip"
+
+#: index.php:20
+#, c-format
+msgid "<a href=\"%1$s\">Learn More</a> or <a href=\"%2$s\">Download Now!</a>"
+msgstr "<a href=\"%1$s\">En apprendre plus</a> ou <a href=\"%2$s\">Télécharger maintenant !</a>"
+
+#: translations\index.php:11
+#, c-format
+msgid "We currently have WinMerge translated into the languages listed below:"
+msgstr "Nous avons actuellement traduit Winmerge dans les langues listées ci-dessous:"
+
+#: translations\index.php:33
+#, c-format
+msgid "You can find a more technical view about the <a href=\"%1$s\">translation system</a> in our <a href=\"\"%2$s>Development Wiki</a>."
+msgstr "Nous pouvons trouver une vue plus technique sur le <a href=\"%1$s\">système de traduction</a> dans notre <a href=\"\"%2$s>Wiki Développement</a>."
+
+#: translations\translations.inc:131
+#: translations\translations.inc:288
+#: translations\translations_branch.inc:66
+#: translations\translations_branch.inc:182
+#, c-format
+msgid "Language"
+msgstr "langue"
+
+#: support\mailing-lists.php:12
+#: support\mailing-lists.php:20
+#, c-format
+msgid "Announce List"
+msgstr "Liste d'annonces"
+
+#: engine\page.inc:319
+#, c-format
+msgid "Status (Unstable Trunk)"
+msgstr "Stable (tronçon instable)"
+
+#: engine\page.inc:264
+#, c-format
+msgid "WinMerge Downloads"
+msgstr "Téléchargements Winmerge"
+
+#: downloads\index.php:70
+#, c-format
+msgid "Japanese WinMerge Version"
+msgstr "Version japonaise de Winmerge"
+
+#: engine\page.inc:311
+#, c-format
+msgid "Tracker"
+msgstr "Traqueur"
+
+#: about\index.php:67
+#: about\screenshots\index.php:18
+#: about\screenshots\index.php:19
+#, c-format
+msgid "Folder Comparison Results"
+msgstr "Résultats de la comparaison des dossiers"
+
+#: downloads\index.php:69
+#, c-format
+msgid "WinMerge Portable"
+msgstr "WinMerge Portable"
+
+#: translations\translations.inc:83
+#: translations\translations_branch.inc:51
+#, c-format
+msgid "Fuzzy: %d%%"
+msgstr "Flou: %d%%"
+
+#: docs\changelog.php:5
+#, c-format
+msgid "The change log is a more complete list of changes in the last WinMerge releases."
+msgstr "Le journal des changements est une liste plus complète des changements dans les dernières versions de Winmerge."
+
+#: 404.php:15
+#, c-format
+msgid "Were you looking for..."
+msgstr "Nous recherchons..."
+
+#: downloads\index.php:8
+#, c-format
+msgid "WinMerge, free, download, Windows, setup, installer, binaries, runtimes, stable, beta, experimental, portable"
+msgstr "WinMerge, libre, télécharger, Windows, installation, installeur, binaires, runtimes, stable, beta, expérimental, portable"
+
+#: downloads\pad-file.php:48
+#, c-format
+msgid "Type"
+msgstr "Type"
+
+#: engine\page.inc:299
+#, c-format
+msgid "WinMerge Development Wiki"
+msgstr "Wiki du développement de Winmerge"
+
+#: downloads\index.php:15
+#, c-format
+msgid "The current WinMerge version is <strong>%1$s</strong> and was released at <strong>%2$s</strong>."
+msgstr "La version actuelle de Winmerge est <strong>%1$s</strong> et a été publiée le <strong>%2$s</strong>."
+
+#: about\index.php:21
+#, c-format
+msgid "Supports Microsoft Windows 98/ME/2000/XP/2003/Vista/2008"
+msgstr "Supporte Microsoft Windows 98/ME/2000/XP/2003/Vista/2008"
+
+#: 404.php:22
+#, c-format
+msgid "<a href=\"%s\">Release Notes</a>?"
+msgstr "<a href=\"%s\">Notes de version</a>?"
+
+#: 404.php:11
+#, c-format
+msgid "Page Not Found..."
+msgstr "Page non trouvée..."
+
+#: support\index.php:16
+#, c-format
+msgid "You must <a href=\"%s\">register with SourceForge.net</a> before posting a bug report (registration is free)."
+msgstr "Vous devez <a href=\"%s\">vous enregistrer auprés de SourceForge.net</a> avant de poster un rapport de bogue (l'enregistrement est gratuit)."
+
+#: index.php:16
+#, c-format
+msgid "More Screenshots…"
+msgstr "Plus de captures d'écran…"
+
+#: about\index.php:48
+#, c-format
+msgid "Resolve conflict files"
+msgstr "Résoudre les conflits de fichiers"
+
+#: engine\page.inc:264
+#, c-format
+msgid "Downloads"
+msgstr "Téléchargements"
+
+#: engine\page.inc:266
+#: translations\index.php:8
+#: translations\index.php:10
+#, c-format
+msgid "Translations"
+msgstr "Traductions"
+
+#: support\index.php:38
+#, c-format
+msgid "Since WinMerge is an <a href=\"%s\">Open Source</a> project, you may use it free of charge."
+msgstr "Depuis que Winmerge est un projet <a href=\"%s\">Open Source</a> , vous pouvez l'utiliser gratuitement."
+
+#: engine\page.inc:285
+#, c-format
+msgid "Project Page"
+msgstr "Page du projet"
+
+#: about\index.php:7
+#: about\index.php:10
+#: engine\page.inc:262
+#: engine\page.inc:288
+#, c-format
+msgid "About WinMerge"
+msgstr "À propos de Winmerge"
+
+#: engine\page.inc:266
+#: engine\page.inc:316
+#, c-format
+msgid "WinMerge Translations"
+msgstr "Traductions de Winmerge"
+
+#: downloads\pad-file.php:6
+#, c-format
+msgid "WinMerge, PAD file, Portable Application Description"
+msgstr "WinMerge, fichier PAD, Description de l'application portable"
+
+#: downloads\pad-file.php:40
+#, c-format
+msgid "Release Status"
+msgstr "Statut de la version"
+
+#: engine\page.inc:311
+#, c-format
+msgid "WinMerge Tracker"
+msgstr "Traqueur Winmerge"
+
+#: support\mailing-lists.php:47
+#, c-format
+msgid "This list is for user related questions. Having questions posted to this list may allow others having the same problem to solve it on their own."
+msgstr "Cette liste est pour les questions des utilisateurs. Le fait de poser des questions sur cette liste permet aux autres ayant le même problème de le résoudre par eux-même."
+
+#: downloads\index.php:7
+#, c-format
+msgid "Download the current WinMerge version %1$s, which was released at %2$s. For detailed info on what is new, read the change log and the release notes."
+msgstr "Télécharger la version actuelle de Winmerge %1$s, qui a été publiée le %2$s. Pour une info détaillée sur les nouveautés, lisez le journal des changements et les notes de versions."
+
+#: engine\page.inc:297
+#, c-format
+msgid "Known Issues"
+msgstr "Problèmes connus"
+
+#: translations\index.php:29
+#, c-format
+msgid "To change language, select the desired language from the <span class=\"guimenu\">View</span>→ <span class=\"guimenuitem\">Language</span> menu choice."
+msgstr "Pour chnager la langue, sélectionnez la langue désirée dans choix du menu <span class=\"guimenu\">Affichage</span>→ <span class=\"guimenuitem\">Langue</span> ."
+
+#: translations\translations.inc:136
+#: translations\translations_branch.inc:71
+#, c-format
+msgid "Last Update"
+msgstr "Dernière mise à jour"
+
+#: engine\page.inc:304
+#, c-format
+msgid "Source Code"
+msgstr "Code source"
+
+#: about\screenshots\index.php:21
+#: about\screenshots\index.php:22
+#, c-format
+msgid "Folder Compare Tree View"
+msgstr "Voir l'arborescence de la comparaison de dossiers"
+
+#: downloads\index.php:27
+#: downloads\index.php:33
+#: downloads\source-code.php:17
+#, c-format
+msgid "Zip-Format (%s MB)"
+msgstr "Format-zip (%s MB)"
+
+#: support\tracker-shortcuts.php:5
+#, c-format
+msgid "Tracker Shortcuts are shorter and nicer URLs to Tracker items from our SF.net project page. And you can use this page to create a shortcut."
+msgstr "Les raccourcis traqueurs sont des adresses web plus agréables pour traquer les objets de notre page projet SF.net. Et vous pouvez utiliser cette page pour créer un raccourci."
+
+#: support\tracker-shortcuts.php:18
+#, c-format
+msgid "Tracker Item"
+msgstr "Traqueur d'objet"
+
+#: translations\translations_branch.inc:183
+#, c-format
+msgid "Translator(s)"
+msgstr "Traducteur(s)"
+
+#: 404.php:21
+#, c-format
+msgid "<a href=\"%s\">Manual</a>?"
+msgstr "<a href=\"%s\">Manuel</a>?"
+
+#: docs\index.php:7
+#: docs\index.php:9
+#: engine\page.inc:263
+#, c-format
+msgid "Documentation"
+msgstr "Documentation"
+
+#: about\history.php:19
+#: docs\index.php:10
+#: engine\page.inc:295
+#, c-format
+msgid "Manual"
+msgstr "Manuel"
+
+#: index.php:8
+#: index.php:30
+#, c-format
+msgid "Project News"
+msgstr "Nouvelles du projet"
+
+#: docs\index.php:13
+#, c-format
+msgid "The <a href=\"%1$s\">release notes</a> are a short summary of important changes, enhancements, bug fixes and <a href=\"%2$s\">known issues</a> in the current WinMerge release."
+msgstr "Les <a href=\"%1$s\">notes de version</a> sont un court résumé des changements importants, améliorations, corrections de bogues et <a href=\"%2$s\">problèmes connus</a> dans la version actuelle de WinMerge."
+
+#: about\license.php:6
+#, c-format
+msgid "WinMerge, license, open source, GNU General Public License, GPL, free software"
+msgstr "WinMerge, licence, open source, GNU Licence Générale Publique, GPL, logiciel libre"
+
+#: downloads\pad-file.php:94
+#, c-format
+msgid "Contact"
+msgstr "Contact"
+
+#: downloads\index.php:40
+#: downloads\source-code.php:24
+#, c-format
+msgid "SHA-1 Checksums"
+msgstr "SHA-1 Checksums"
+
+#: engine\page.inc:231
+#, c-format
+msgid "Version %1$s; %2$s MB"
+msgstr "Version %1$s; %2$s MB"
+
+#: docs\releasenotes.php:11
+#, c-format
+msgid "The release notes are currently not available..."
+msgstr "Les notes de version sont actuellement indisponibles..."
+
+#: support\tracker-shortcuts.php:23
+#, c-format
+msgid "Type:"
+msgstr "Type:"
+
+#: support\tracker-shortcuts.php:6
+#, c-format
+msgid "WinMerge, tracker, shortcuts, sourceforge, project page, bug, patch, support request, feature request, todo item"
+msgstr "WinMerge, traqueur, raccourcis, sourceforge, page projet, bogue, patch, requête de support, requête de fonction, objet \"à faire\""
+
+#: support\index.php:6
+#, c-format
+msgid "The Open Discussion forum is the fastest way to get help. A other way is a subscription to the support mailing list."
+msgstr "Le forum de discussion du libre est la manière la plus rapide d'obtenir de l'aide. Une aure manière est l'inscription à une liste de mailing."
+
+#: downloads\plugins.php:32
+#, c-format
+msgid "For more details and the download go to the <a href=\"%s\">xdocdiff plugin homepage</a>."
+msgstr "Pour plus de détails et le téléchargement allez à la <a href=\"%s\">page d'accueil plugin xdocdiff</a>."
+
+#: translations\index.php:39
+#, c-format
+msgid "Stable Version (Branch)"
+msgstr "Version stable (branche)"
+
+#: translations\translations_branch.inc:104
+#, c-format
+msgid "English (Template)"
+msgstr "Anglais (Modèle)"
+
+#: engine\page.inc:284
+#, c-format
+msgid "WinMerge Links"
+msgstr "Liens Winmerge"
+
+#: about\screenshots\index.php:29
+#, c-format
+msgid "Location pane is a handy side-pane showing a overall (difference) map of files compared."
+msgstr "Le panneau d'emplacement est un panneau latéral pratique montrant une carte globale (différence) des fichiers comparés."
+
+#: docs\index.php:5
+#, c-format
+msgid "Documentation from WinMerge like manual, release notes, change log and Development Wiki."
+msgstr "La documentation de Winmerge comme la manuel, les notes de versions, le journal des changements et le wiki du développement."
+
+#: docs\index.php:15
+#, c-format
+msgid "The <a href=\"%s\">change log</a> is a more complete list of changes in the last WinMerge releases."
+msgstr "Le <a href=\"%s\">journal des changements</a> est une liste plus complète des changements dans la dernière version de WinMerge."
+
+#: engine\page.inc:303
+#, c-format
+msgid "Download WinMerge Plugins"
+msgstr "Télécharger les plugins de Winmerge"
+
+#: engine\page.inc:319
+#, c-format
+msgid "WinMerge Translations Status (Unstable Trunk)"
+msgstr "Statut de la traduction de Winmerge (Tronçon instable)"
+
+#: docs\index.php:17
+#, c-format
+msgid "The <a href=\"%s\">Development Wiki</a> contains much information about the WinMerge development."
+msgstr "Le <a href=\"%s\">Wiki du développement</a> contient plus d'informations sur le développement de WinMerge."
+
+#: downloads\index.php:16
+#, c-format
+msgid "For detailed info on what is new, read the <a href=\"%1$s\">change log</a> and the <a href=\"%2$s\">release notes</a>."
+msgstr "Pour une information détaillée sur ce qui est nouveau, lisez le <a href=\"%1$s\">journal des changements</a> et les <a href=\"%2$s\">notes de versions</a>."
+
+#: support\mailing-lists.php:77
+#, c-format
+msgid "Subscribers to this list get notices of each and every code change commited to Subversion."
+msgstr "Les souscripteurs à cette liste obtiennent des informations sur chacun et tous les changements du code intervenus dans la sous-version."
+
+#: support\mailing-lists.php:14
+#: support\mailing-lists.php:40
+#, c-format
+msgid "User List"
+msgstr "Liste utilisateur"
+
+#: index.php:47
+#, c-format
+msgid "If you are interested in contributing work to the project, see our <a href=\"%s\">developer page</a> for further information on how you may contribute."
+msgstr "Si vous désirez contribuer au travail du projet, voyez notre <a href=\"%s\">page développeur</a> pour de plus amples informations sur comment vous pourriez contribuer."
+
+#: downloads\plugins.php:7
+#: downloads\plugins.php:9
+#, c-format
+msgid "Download Plugins"
+msgstr "Télécharger les plugins"
+
+#: downloads\pad-file.php:58
+#: downloads\pad-file.php:60
+#: downloads\pad-file.php:62
+#, c-format
+msgid "English Description (%d chars)"
+msgstr "Description anglaise (%d signes)"
+
+#: about\index.php:29
+#, c-format
+msgid "Visual differencing and merging of text files"
+msgstr "Différenciation visuelle et fusion de fichiers textes"
+
+#: engine\page.inc:285
+#, c-format
+msgid "WinMerge Project Page"
+msgstr "Page du projet Winmerge"
+
+#: downloads\index.php:60
+#, c-format
+msgid "Admin rights for the installer"
+msgstr "Droits administrateurs pour l'installeur"
+
+#: downloads\plugins.php:28
+#, c-format
+msgid "You can also read the <a href=\"%1$s\">Release Notes</a> or search for <a href=\"%2$s\">other versions</a>."
+msgstr "Vous pouvez aussi lire les <a href=\"%1$s\">Notes de version</a> ou rechercher <a href=\"%2$s\">d'autres versions</a>."
+
+#: engine\page.inc:289
+#, c-format
+msgid "WinMerge Screenshots"
+msgstr "Captures d'écran de Winmerge"
+
+#: downloads\pad-file.php:42
+#, c-format
+msgid "Download"
+msgstr "Télécharger"
+
+#: downloads\index.php:20
+#: downloads\plugins.php:15
+#, c-format
+msgid "Installer"
+msgstr "Installeur"
+
+#: 404.php:26
+#, c-format
+msgid "<a href=\"%s\">Downloads</a>?"
+msgstr "<a href=\"%s\">Téléchargements</a>?"
+
+#: about\index.php:64
+#: about\screenshots\index.php:7
+#: about\screenshots\index.php:9
+#: engine\page.inc:289
+#, c-format
+msgid "Screenshots"
+msgstr "Captures d'écrans"
+
+#: engine\page.inc:290
+#, c-format
+msgid "WinMerge History"
+msgstr "Historique de Winmerge"
+
+#: about\index.php:78
+#, c-format
+msgid "Here is the current <a href=\"%s\">change log</a>."
+msgstr "Ici est l'actuel <a href=\"%s\">journal des changements</a>."
+
+#: support\tracker-shortcuts.php:11
+#, c-format
+msgid "You can use this page to create a shortcut:"
+msgstr "Vous pouvez utiliser cette page pour créer un raccourci:"
+
+#: downloads\pad-file.php:5
+#, c-format
+msgid "The easiest way to get informations about the latest stable version from WinMerge for your web site is the Portable Application Description file, which you find here."
+msgstr "La façon la plus facile pour obtenir des informations sur la dernière version de Winmerge pour votre site web est le fichier de description de l'application portablen que vous pouvez trouver ici."
+
+#: translations\translations.inc:41
+#, c-format
+msgid "File not found."
+msgstr "Fichier non trouvé."
+
+#: downloads\index.php:9
+#: downloads\index.php:73
+#, c-format
+msgid "Project File Releases"
+msgstr "Versions du fichier projet"
+
+#: 404.php:9
+#, c-format
+msgid "Error 404 (Page Not Found)"
+msgstr "Erreur 404 (Page non trouvée)"
+
+#: downloads\index.php:52
+#, c-format
+msgid "The easiest way to install WinMerge is to download and run the Installer. Read the <a href=\"%s\">online manual</a> for help using it."
+msgstr "La plus facile façon d'installer winmerge est de le télécharger et exécuter l'installeur. Lisez le <a href=\"%s\">manuel en ligne</a> pour vous aider à l'utiliser."
+
+#: about\screenshots\index.php:23
+#, c-format
+msgid "In the tree view, folders are expandable and collapsible, containing files and subfolders. This is useful for an easier navigation in deeply nested directory structures. <em>The tree view is available only in recursive compares."
+msgstr "Dans la vue arborescente, les dossiers sont extensibles et rétractables et contiennent les fichiers et sous-dossiers. Cela est très utile pour une navigation plus facile dans les structures les plus profondes et imbriquées du répertoire. <em>La vue arborescente n'est disponible que pour les comparaisons récursives."
+
+#: index.php:42
+#: downloads\pad-file.php:96
+#: engine\page.inc:265
+#: support\index.php:8
+#: support\index.php:10
+#, c-format
+msgid "Support"
+msgstr "Support"
+
+#: about\index.php:72
+#, c-format
+msgid "Just download the <a href=\"%s\">installer</a> and double-click it."
+msgstr "Il suffit de télécharger <a href=\"%s\">l'installeur</a> et double-cliquer dessus."
+
+#: downloads\source-code.php:34
+#, c-format
+msgid "You can <a href=\"%1$s\">browse the source code</a> with a web browser or you can check out the whole code by clicking on one of the following links (if you have <a href=\"%2$s\">TortoiseSVN</a> installed):"
+msgstr "Vous pouvez <a href=\"%1$s\">parcourir le code source</a> avec une navigateur web ou vous pouvez examiner tout le code en cliquant sur l'un des liens suivants (si vous avez <a href=\"%2$s\">TortoiseSVN</a> installé):"
+
+#: downloads\source-code.php:5
+#, c-format
+msgid "Download the source code of WinMerge, which is released under the GNU General Public License."
+msgstr "Télécharger le code source de Winmerge, qui est fourni sous la licence générale publique GNU."
+
+#: translations\translations.inc:81
+#: translations\translations.inc:95
+#: translations\translations.inc:133
+#: translations\translations_branch.inc:49
+#: translations\translations_branch.inc:68
+#: translations\translations_branch.inc:118
+#, c-format
+msgid "Translated"
+msgstr "Traduit"
+
+#: index.php:46
+#, c-format
+msgid "WinMerge is an open source project, which means that the program is maintained and developed by volunteers."
+msgstr "Winmerge est un projet open source, ce qui signifie que le programme est maintenu et développé par des volontaires."
+
+#: about\index.php:24
+#, c-format
+msgid "Tabbed interface"
+msgstr "Interface à onglets"
+
+#: about\index.php:33
+#, c-format
+msgid "Location pane shows map of files compared"
+msgstr "Le panneau d'emplacement montre la carte des fichiers comparés"
+
+#: about\screenshots\index.php:17
+#, c-format
+msgid "WinMerge allows selecting/opening paths in several ways. Using the Open-dialog is just one of them."
+msgstr "Winmerge permet de sélectionner/ouvrir les emplacements de plusieurs manière. L'utilisation du dialogue-ouvert est juste l'un d'entre eux."
+
+#: about\index.php:77
+#, c-format
+msgid "For information on using WinMerge, see our <a href=\"%s\">online Manual</a>, or you can use the local help file (just press <code>F1</code> inside WinMerge) for offline use."
+msgstr "pour plus d'information sur l'utilisation de WinMerge, voyez notre <a href=\"%s\">Manuel en ligne</a>, ou vous pouvez utiliser le fichier d'aide local (pressez juste sur <code>F1</code> dans WinMerge) pour un usage hors ligne."
+
+#: about\index.php:73
+#, c-format
+msgid "Or you may simply unzip the <a href=\"%s\">binary zip package</a> into the desired location, and run <code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>)."
+msgstr "Ou vous pouvez simplement dézipper le <a href=\"%s\">paquetage zip binaire</a> dans l'emplacement désiré, et exécuter <code>WinMergeU.exe</code> (sauf pour les utilisateurs de Windows 98/ME qui doivent utiliser <code>WinMerge.exe</code>."
+
+#: downloads\pad-file.php:56
+#, c-format
+msgid "English Descriptions"
+msgstr "Descriptions anglaises"
+
+#: engine\page.inc:313
+#: support\index.php:37
+#, c-format
+msgid "Donate"
+msgstr "Faire un don"
+
+#: about\index.php:45
+#, c-format
+msgid "Version Control"
+msgstr "Contrôle de la version"
+
+#: translations\translations.inc:81
+#: translations\translations_branch.inc:49
+#, c-format
+msgid "Translated: %d%%"
+msgstr "Traduit: %d%%"
+
+#: about\screenshots\index.php:30
+#: about\screenshots\index.php:31
+#, c-format
+msgid "Splash Screen"
+msgstr "Ecran de démarrage"
+
+#: about\license.php:33
+#, c-format
+msgid "The Open Source Definition"
+msgstr "La définition de l'open source"
+
+#: downloads\pad-file.php:46
+#, c-format
+msgid "Supported Languages"
+msgstr "Langues supportées"
+
+#: index.php:6
+#, c-format
+msgid "WinMerge is an Open Source differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle."
+msgstr "Winmerge est un outil open source de défférenciation et fusion pour Windows. Winmerge peut comparer ensemble fichiers et dossiers, présentant des différences dans un format texte visuel qui est facile à comprendre et manipuler. "
+
+#: downloads\index.php:67
+#, c-format
+msgid "Beta Versions"
+msgstr "Versions beta"
+
+#: downloads\pad-file.php:76
+#, c-format
+msgid "Screenshot"
+msgstr "Captures d'écran"
+
+#: about\index.php:6
+#, c-format
+msgid "WinMerge, about, features, file compare, folder compare, version control, screenshots, installation"
+msgstr "WinMerge, à propos, fonctions, comparer les fichiers, comparer les dossiers, contrôle de version, captures d'écrans, installation"
+
+#: support\mailing-lists.php:15
+#: support\mailing-lists.php:50
+#, c-format
+msgid "Translate List"
+msgstr "Liste des traductions"
+
+#: downloads\index.php:58
+#, c-format
+msgid "Microsoft Windows 98/ME/2000/XP/2003/Vista/2008"
+msgstr "Microsoft Windows 98/ME/2000/XP/2003/Vista/2008"
+
+#: downloads\plugins.php:5
+#, c-format
+msgid "Download additional plugins for WinMerge, like the 7-Zip plugin or the xdocdiff Plugin."
+msgstr "Télécharger les plugins additionnels pour Winmerge, comme le plugin 7-zip ou le plugin xdocdiff."
+
+#: translations\index.php:7
+#: translations\status_trunk.php:7
+#: translations\status_trunk.php:9
+#, c-format
+msgid "Translations Status (Unstable Trunk)"
+msgstr "Statut de la traduction (tronçon instable)"
+
+#: support\index.php:12
+#, c-format
+msgid "A other way is a subscription to the <a href=\"%s\">support mailing list</a>."
+msgstr "Une autre manière est la souscription à la <a href=\"%s\">liste de support par mailing</a>."
+
+#: about\screenshots\index.php:5
+#, c-format
+msgid "Screenshots from WinMerge features like file comparison, folder comparison results and location pane."
+msgstr "Captures d'écran des fonctions de Winmerge comme la comparaison, les résultats des comparaisons de fichiers et le panneau d'emplacement."
+
+#: translations\translations.inc:85
+#: translations\translations_branch.inc:53
+#, c-format
+msgid "Untranslated: %d%%"
+msgstr "Non traduit: %d%%"
+
+#: index.php:43
+#, c-format
+msgid "If you need support, look at our <a href=\"%s\">support page</a> for more information how you can get it."
+msgstr "Si vous avez besoin de support, reportez vous sur <a href=\"%s\">la page de support</a> pour plus d'information sur comment vous pouvez l'obtenir."
+
+#: engine\page.inc:318
+#, c-format
+msgid "Status (Stable Branch)"
+msgstr "Statut (branche stable)"
+
+#: about\index.php:47
+#, c-format
+msgid "Creates patch files (Normal-, Context- and Unified formats)"
+msgstr "Crée des fichiers patch (Normal-, Contextuel- et formats unifiés)"
+
+#: translations\instructions.php:9
+#, c-format
+msgid "The translations instructions are currently not available..."
+msgstr "Les instructions de traduction sont actuellement indisponibles..."
+
+#: support\tracker-shortcuts.php:13
+#, c-format
+msgid "Bug"
+msgstr "Bogue"
+
+#: downloads\plugins.php:31
+#, c-format
+msgid "With this plugin you can compare Word, Excel, PowerPoint, PDF and some more files."
+msgstr "Avec ce plugin vous pouvez comparer Word, Excel, Powerpoint, PDF et quelques autres fichiers."
+
+#: downloads\source-code.php:6
+#, c-format
+msgid "WinMerge, free, download, source code, GPL, Subversion, SVN, TortoiseSVN"
+msgstr "WinMerge, libre , téléchargement, code source, GPL, sous-version, SVN, TortoiseSVN"
+
+#: docs\releasenotes.php:5
+#, c-format
+msgid "The release notes are a short summary of important changes, enhancements, bug fixes and known issues in the current WinMerge release."
+msgstr "Les notes de version sont un court résumé des changements importants, améliorations, bogues arrangés et problèmes connus dans la version actuelle de Winmerge."
+
+#: docs\changelog.php:6
+#, c-format
+msgid "WinMerge, change log, changes, release, tracker item, revision number"
+msgstr "Winmerge, Journal des changements, version, traqueur d'objet, numéro de révision"
+
+#: docs\releasenotes.php:6
+#, c-format
+msgid "WinMerge, release notes, summary, changes, enhancements, bug fixes, known issues, release"
+msgstr "WinMerge, notes de version, résumé, changements, amélioration, résolution de bogues, problèmes connus, version"
+
+#: downloads\pad-file.php:14
+#, c-format
+msgid "If you can not work with the <a href=\"%s\">PAD file</a>, you can use the following informations:"
+msgstr "Si vous ne pouvez pas travailler avec le <a href=\"%s\">fichier PAD</a>, vous pouvez utiliser les informations suivantes:"
+
+#: about\index.php:57
+#, c-format
+msgid "Localizable interface"
+msgstr "Interface localisable"
+
+#: about\index.php:56
+#, c-format
+msgid "Plugin support"
+msgstr "Support de plugins"
+
+#: about\index.php:54
+#, c-format
+msgid "Shell Integration (supports 64-bit Windows versions)"
+msgstr "Intégration Shell (supporte les versions 64-bit de Windows)"
+
+#: about\index.php:55
+#, c-format
+msgid "Archive file support using 7-Zip"
+msgstr "Le fichier archive supporte l'utilisation de 7-zip"
+
+#: translations\index.php:6
+#: translations\status_branch.php:7
+#: translations\status_branch.php:10
+#, c-format
+msgid "Translations Status (Stable Branch)"
+msgstr "Statut de la traduction (branche stable)"
+
+#: support\index.php:21
+#, c-format
+msgid "Tracker Statistics"
+msgstr "Statistiques du traqueur"
+
+#: downloads\pad-file.php:64
+#, c-format
+msgid "English Keywords"
+msgstr "Mots clés anglais"
+
+#: engine\page.inc:304
+#, c-format
+msgid "Download WinMerge Source Code"
+msgstr "Télécharger le code source de Winmerge"
+
+#: downloads\pad-file.php:7
+#: downloads\pad-file.php:9
+#: downloads\pad-file.php:80
+#: engine\page.inc:305
+#, c-format
+msgid "PAD File"
+msgstr "Fichiers PAD"
+
+#: downloads\index.php:13
+#: downloads\source-code.php:39
+#, c-format
+msgid "WinMerge %s"
+msgstr "WinMerge %s"
+
+#: translations\status_branch.php:14
+#: translations\translations.inc:285
+#, c-format
+msgid "Translators"
+msgstr "traducteurs"
+
+#: translations\translations.inc:83
+#: translations\translations.inc:96
+#: translations\translations.inc:134
+#: translations\translations_branch.inc:51
+#: translations\translations_branch.inc:69
+#: translations\translations_branch.inc:119
+#, c-format
+msgid "Fuzzy"
+msgstr "Flou"
+
+#: docs\index.php:6
+#, c-format
+msgid "WinMerge, documentation, manual, release notes, known issues, change log, Development Wiki"
+msgstr "WinMerge, documentation, manuel, notes de version, problèmes connus, journal des changements, Wiki du développement"
+
+#: about\license.php:10
+#, c-format
+msgid ""
+"This means everybody can download the <a href=\"%s\">source code</a> and improve and modify it.\n"
+"The only thing we ask is that people submit their improvements and modifications back to us so that all WinMerge users may benefit."
+msgstr ""
+"Cela signifie que tout le monde peut télécharger le <a href=\"%s\">code source</a> et l'améliorer et le modifier.\n"
+"La seule chose que nous vous demandond et que les personnes nous soumettent en retour leurs modifications et amélioration pour que tous les utilisateurs de WinMerge puissent en profiter."
+
+#: about\history.php:5
+#, c-format
+msgid "History of WinMerge releases with version numbers, release dates and manuals."
+msgstr "Historique des versions de Winmerge avec les numéros des version, les dates et manuels des versions."
+
+#: downloads\plugins.php:11
+#, c-format
+msgid "This is the 7-Zip plugin for WinMerge and the current version <strong>%1$s</strong> was released at <strong>%2$s</strong>."
+msgstr "C'est le plugin 7-Zip pour WinMerge et la version actuelle <strong>%1$s</strong> a été publiée le <strong>%2$s</strong>."
+
+#: 404.php:23
+#, c-format
+msgid "<a href=\"%s\">Change Log</a>?"
+msgstr "<a href=\"%s\">Journal des changements</a>?"
+
+#: about\index.php:27
+#, c-format
+msgid "File Compare"
+msgstr "Comparer les fichiers"
+
+#: support\tracker-shortcuts.php:41
+#, c-format
+msgid "ID:"
+msgstr "ID:"
+
+#: about\index.php:15
+#, c-format
+msgid "Features"
+msgstr "Fonctions"
+
+#: support\mailing-lists.php:25
+#: support\mailing-lists.php:35
+#: support\mailing-lists.php:45
+#: support\mailing-lists.php:55
+#: support\mailing-lists.php:65
+#: support\mailing-lists.php:75
+#, c-format
+msgid "Archive"
+msgstr "Archive"
+
+#: engine\engine.inc:20
+#, c-format
+msgid "German"
+msgstr "Allemand"
+
+#: support\index.php:14
+#, c-format
+msgid "Please attach as much information as you can: at a minimum, the version number of WinMerge that you are using. If you can, also attach a configuration log which, you can display by clicking <span class=\"guimenu\">Help</span> → <span class=\"guimenuitem\">Configuration</span> in the WinMerge window."
+msgstr "Veuillez attacher autant d'information que possible: au minimum, le numéro de la version utilisées de WinMerge. Si vous le pouvez, veuillez attacher le journal de configuration que, vous pouvez afficher en cliquant sur <span class=\"guimenu\">Aide</span> → <span class=\"guimenuitem\">Configuration</span> dans la fenêtre de WinMerge."
+
+#: engine\page.inc:261
+#: engine\page.inc:283
+#, c-format
+msgid "WinMerge Home"
+msgstr "Page d'accueil de Winmerge"
+
+#: about\index.php:19
+#, c-format
+msgid "General"
+msgstr "Général"
+
+#: docs\index.php:11
+#, c-format
+msgid "The <a href=\"%s\">manual</a> explains how to use WinMerge, and documents its capabilities and limitations."
+msgstr "Le <a href=\"%s\">manuel</a> explique comment utiliser WinMerge, et les documents ses capacités et limitations."
+
+#: engine\page.inc:302
+#, c-format
+msgid "WinMerge"
+msgstr "WinMerge"
+
+#: downloads\plugins.php:30
+#, c-format
+msgid "xdocdiff Plugin"
+msgstr "Plugin xdocdiff"
+
+#: support\tracker-shortcuts.php:17
+#, c-format
+msgid "Todo Item"
+msgstr "Objet à faire"
+
+#: support\mailing-lists.php:67
+#, c-format
+msgid "This is the list where participating developers of the WinMerge meet and discuss issues, code changes/additions, etc."
+msgstr "C'est la liste où les développeurs participant de Winmerge se rencontrent et discutent des problèmes, changements du code/ajouts, etc. "
+
+#: downloads\index.php:22
+#: downloads\plugins.php:17
+#, c-format
+msgid "Exe-Format (%s MB)"
+msgstr "Format-exe (%s MB)"
+
+#: engine\page.inc:303
+#, c-format
+msgid "Plugins"
+msgstr "Plugins"
+
+#: support\mailing-lists.php:6
+#, c-format
+msgid "WinMerge, mailing lists, announce, support, user, translate, development, SVN"
+msgstr "WinMerge, listes de mailing, annonce, support, utilisateur, traduction, développement, SVN"
+
+#: about\history.php:20
+#: docs\changelog.php:7
+#: docs\changelog.php:8
+#: docs\index.php:14
+#: engine\page.inc:298
+#, c-format
+msgid "Change Log"
+msgstr "Journal des changements"
+
+#: support\tracker-shortcuts.php:37
+#, c-format
+msgid "Generate"
+msgstr "Générer"
+
+#: about\index.php:23
+#, c-format
+msgid "Unicode support"
+msgstr "Support unicode"
+
+#: support\index.php:39
+#, c-format
+msgid "But please consider making a <a href=\"%s\">donation</a> to support the continued development of WinMerge."
+msgstr "Veuillez considérer l'action d'une <a href=\"%s\">donation</a> pour supporter le développement continu de WinMerge."
+
+#: downloads\pad-file.php:74
+#, c-format
+msgid "Information"
+msgstr "Information"
+
+#: engine\page.inc:263
+#: engine\page.inc:294
+#, c-format
+msgid "WinMerge Documentation"
+msgstr "Documentation de WinMerge "
+
+#: downloads\source-code.php:11
+#, c-format
+msgid "WinMerge is released under the <a href=\"%s\">GNU General Public License</a>. That means you can get the whole source code and can build the program yourself."
+msgstr "WinMerge est fourni sous la <a href=\"%s\">licence Générale Publique GNU</a>. Cela signifie que vous pouvez obtenir tout le code source et développer le programme par vous-même."
+
+#: about\index.php:40
+#, c-format
+msgid "Fast compare using file sizes and dates"
+msgstr "Comparaison rapid en utilisant les tailles des fichiers et les dates"
+
+#: support\mailing-lists.php:24
+#: support\mailing-lists.php:34
+#: support\mailing-lists.php:44
+#: support\mailing-lists.php:54
+#: support\mailing-lists.php:64
+#: support\mailing-lists.php:74
+#, c-format
+msgid "Unsubscribe"
+msgstr "Se désinsrire"
+
+#: about\license.php:14
+#, c-format
+msgid "GNU General Public License"
+msgstr "GNU Licence Générale Publique"
+
+#: translations\translations.inc:85
+#: translations\translations.inc:97
+#: translations\translations.inc:135
+#: translations\translations_branch.inc:53
+#: translations\translations_branch.inc:70
+#: translations\translations_branch.inc:120
+#, c-format
+msgid "Untranslated"
+msgstr "Non traduit"
+
+#: about\screenshots\index.php:24
+#: about\screenshots\index.php:25
+#, c-format
+msgid "Highlight Line Diff"
+msgstr "Surligne les différences des lignes"
+
+#: index.php:15
+#: about\index.php:66
+#: about\screenshots\index.php:12
+#: about\screenshots\index.php:13
+#, c-format
+msgid "File Comparison"
+msgstr "Comparaison de fichiers "
+
+#: engine\page.inc:261
+#, c-format
+msgid "Home"
+msgstr "Page d'accueil"
+
+#: support\mailing-lists.php:37
+#, c-format
+msgid "You should ask all your support questions on this list."
+msgstr "Vous devriez poser toutes vos questions de support sur cette liste."
+
+#: about\index.php:52
+#, c-format
+msgid "Other"
+msgstr "Autres"
+
+#: 404.php:27
+#, c-format
+msgid "<a href=\"%s\">Support</a>?"
+msgstr "<a href=\"%s\">Support</a>?"
+
+#: engine\engine.inc:22
+#, c-format
+msgid "Dutch"
+msgstr "Hollandais"
+
+#: support\index.php:7
+#, c-format
+msgid "WinMerge, support, discussion forums, mailing lists, tracker, donate, bugs, support requests, patches, feature requests, todo, open source, sourceforge.net"
+msgstr "WinMerge, support, forums de discussion, listes de mailing, traqueur, donner, bogues, requêtes de support, patches, requêtes de fonction, à faire, open source, sourceforge.net"
+
+#: downloads\index.php:31
+#, c-format
+msgid "Runtimes"
+msgstr "Runtimes"
+
+#: about\index.php:49
+#, c-format
+msgid "Rudimentary Visual SourceSafe and Rational ClearCase integration"
+msgstr "Visual Sourcesafe rudimentaire et intégration de ClearCase rationnel"
+
+#: translations\translations.inc:180
+#: translations\translations_branch.inc:106
+#, c-format
+msgid "Total: %d"
+msgstr "Total: %d"
+
+#: support\mailing-lists.php:72
+#, c-format
+msgid "High Traffic"
+msgstr "Trafic élevé"
+
+#: 404.php:18
+#, c-format
+msgid "<a href=\"%s\">Screenshots</a>?"
+msgstr "<a href=\"%s\">Captures d'écran</a>?"
+
+#: docs\index.php:16
+#: engine\page.inc:299
+#, c-format
+msgid "Development Wiki"
+msgstr "Wiki du dévelopment "
+
+#: translations\translations.inc:182
+#, c-format
+msgid "Total: Unknown"
+msgstr "Total: Inconnu"
+
+#: about\index.php:69
+#, c-format
+msgid "See the <a href=\"%s\">screenshots page</a> for more screenshots."
+msgstr "Voyez la <a href=\"%s\">page des captures d'écran</a> pour plusieurs captures d'écran."
+
+#: index.php:37
+#: downloads\index.php:88
+#, c-format
+msgid "Y-m-d"
+msgstr "Y-m-d"
+
+#: translations\instructions.php:5
+#: translations\instructions.php:8
+#, c-format
+msgid "Translations instructions"
+msgstr "Instructions de traduction"
+
+#: engine\page.inc:310
+#, c-format
+msgid "WinMerge Mailing Lists"
+msgstr "Listes de mailing de Winmerge"
+
+#: downloads\index.php:68
+#, c-format
+msgid "Experimental Builds"
+msgstr "Versions expérimentales"
+
+#: engine\page.inc:313
+#, c-format
+msgid "Donate money to WinMerge"
+msgstr "Donner de l'argent à Winmerge"
+
+#: downloads\index.php:66
+#, c-format
+msgid "Stable Versions"
+msgstr "Versions stables"
+
+#: engine\page.inc:262
+#, c-format
+msgid "About"
+msgstr "À propos"
+
+#: downloads\pad-file.php:92
+#, c-format
+msgid "Name"
+msgstr "Nom"
+
+#: about\license.php:7
+#: about\license.php:9
+#: engine\page.inc:291
+#, c-format
+msgid "License"
+msgstr "Licence"
+
+#: downloads\index.php:63
+#, c-format
+msgid "Other Versions"
+msgstr "Autres versions"
+
+#: engine\page.inc:309
+#, c-format
+msgid "Discussion Forums"
+msgstr "Forums de discussion "
+
+#: downloads\pad-file.php:38
+#, c-format
+msgid "Release Date"
+msgstr "Date de version"
+
+#: support\index.php:13
+#, c-format
+msgid "If you find a bug, please submit it as a <a href=\"%s\">bug report</a>."
+msgstr "Si vous trouvez un bogue, veuillez le soumettre comme un <a href=\"%s\">rapport de bogue</a>."
+
+#: downloads\source-code.php:37
+#, c-format
+msgid "Developer Version"
+msgstr "Version développeur"
+
+#: index.php:7
+#, c-format
+msgid "WinMerge, free, open source, Windows, windiff, diff, merge, compare, tool, utility, text, file, folder, directory, compare files, compare folders, merge files, merge folders, diff tool, merge tool, compare tool"
+msgstr "WinMerge, libre, open source, Windows, windiff, diff, fusion, comparer, outil, utilitaire, texte, fichier, dossier, répertoire, comparaison de fichiers, comparaison de dossiers, fusion de fichiers, fusion de dossiers, outil de diff, outil de fusion, outil de comparaison"
+
+#: engine\page.inc:230
+#, c-format
+msgid "Download Now!"
+msgstr "Télécharger maintenant !"
+
+#: index.php:39
+#, c-format
+msgid "View all news…"
+msgstr "Voir toutes les nouvelles…"
+
+#: about\index.php:37
+#, c-format
+msgid "Folder Compare"
+msgstr "Comparaison de dossiers"
+
+#: docs\index.php:12
+#: docs\releasenotes.php:7
+#: docs\releasenotes.php:10
+#: engine\page.inc:296
+#, c-format
+msgid "Release Notes"
+msgstr "Notes de version"
+
+#: engine\page.inc:317
+#, c-format
+msgid "WinMerge Translations Instructions"
+msgstr "Instructions de traductions de Winmerge"
+
+#: engine\page.inc:296
+#, c-format
+msgid "WinMerge Release Notes"
+msgstr "Notes de versions de Winmerge"
+
+#: index.php:26
+#, c-format
+msgid "WinMerge %s - latest stable version"
+msgstr "WinMerge %s - dernière version stable"
+
+#: translations\index.php:32
+#, c-format
+msgid "If you would like to update any of these translations or add another translation, then please follow <a href=\"%s\">these instructions</a>."
+msgstr "Si vous voulez mettre à jour l'une de ces traductions ou ajouter une autre traduction, alors veuillez suivre <a href=\"%s\">ces instructions</a>."
+
+#: translations\index.php:31
+#, c-format
+msgid "Translating"
+msgstr "Traduction en cours"
+
+#: about\screenshots\index.php:15
+#: about\screenshots\index.php:16
+#, c-format
+msgid "Open-dialog"
+msgstr "Dialogue-ouvert"
+
+#: downloads\index.php:90
+#, c-format
+msgid "View all file releases…"
+msgstr "Voir toutes les versions de fichier…"
+
+#: about\index.php:5
+#: about\index.php:12
+#, c-format
+msgid "WinMerge is highly useful for determining what has changed between project versions, and then merging changes between versions. WinMerge can be used as an external differencing/merging tool or as a standalone application."
+msgstr "WinMerge est très utile pour déterminer ce qui a changé entre les projets de versions, et alors fusionner les changements entre les versions. WinMerge peut être utiliser comme outil externe de différenciation/fusion ou en tant qu'application autonome."
+
+#: downloads\source-code.php:7
+#: downloads\source-code.php:10
+#, c-format
+msgid "Download Source Code"
+msgstr "Télécharger le code source"
+
+#: support\mailing-lists.php:23
+#: support\mailing-lists.php:33
+#: support\mailing-lists.php:43
+#: support\mailing-lists.php:53
+#: support\mailing-lists.php:63
+#: support\mailing-lists.php:73
+#, c-format
+msgid "Subscribe"
+msgstr "Souscrire"
+
+#: support\mailing-lists.php:16
+#: support\mailing-lists.php:60
+#, c-format
+msgid "Development List"
+msgstr "Liste de développement"
+
+#: about\index.php:34
+#, c-format
+msgid "Moved lines detection"
+msgstr "Détection des lignes déplacées"
+
+#: downloads\index.php:69
+#, c-format
+msgid "(by PortableApps.com)"
+msgstr "(par PortableApps.com)"
+
+#: about\license.php:10
+#, c-format
+msgid "WinMerge is <a href=\"%1$s\">Open Source</a> software under the <a href=\"%2$s\">GNU General Public License</a>."
+msgstr "WinMerge est un logiciel <a href=\"%1$s\">Open Source</a> sous la <a href=\"%2$s\">Licence Générale Publique GNU</a>."
+
+#: engine\page.inc:291
+#, c-format
+msgid "WinMerge License"
+msgstr "Licence Winmerge"
+
+#: about\history.php:6
+#, c-format
+msgid "WinMerge, history, version number, release date, manual, users guide"
+msgstr "WinMerge, historique, numéro de version, date de version, manuel, guide utilisateur"
+
+#: downloads\index.php:10
+#: downloads\index.php:12
+#: engine\page.inc:302
+#, c-format
+msgid "Download WinMerge"
+msgstr "Télécharger Winmerge"
+
+#: engine\page.inc:369
+#, c-format
+msgid "Bookmark this on Delicious"
+msgstr "Ajouter aux favoris sur Délicious"
+
+#: downloads\pad-file.php:44
+#, c-format
+msgid "Operating Systems"
+msgstr "Système d'exploitation"
+
+#: about\screenshots\index.php:14
+#, c-format
+msgid "File compare window is basically two files opened to editor into two horizontal panes. Editing allows user to easily do small changes without need to open files to other editor or development environment."
+msgstr "La fenêtre de compraison de fichiers est basiquement deux fichiers ouverts dans les deux panneaux horizontaux des panneaux. L'édition permet de faire de petits changements sans avoir besoin d'autres éditeur ou environnement de développement"
+
Property changes on: trunk/Translations/Web/fr.po
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative devel...
[truncated message content] |
|
From: <ge...@us...> - 2009-08-31 07:55:49
|
Revision: 6981
http://winmerge.svn.sourceforge.net/winmerge/?rev=6981&view=rev
Author: gerundt
Date: 2009-08-31 07:55:42 +0000 (Mon, 31 Aug 2009)
Log Message:
-----------
Update Swedish website translation
Modified Paths:
--------------
trunk/Translations/Web/se.po
Modified: trunk/Translations/Web/se.po
===================================================================
--- trunk/Translations/Web/se.po 2009-08-30 10:59:27 UTC (rev 6980)
+++ trunk/Translations/Web/se.po 2009-08-31 07:55:42 UTC (rev 6981)
@@ -12,7 +12,7 @@
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2009-08-27 02:23+0100\n"
+"PO-Revision-Date: 2009-08-31 00:43+0100\n"
"Last-Translator: Hans Eriksson <hans.ericson at bredband.net>\n"
"Language-Team: Swedish <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -22,10 +22,10 @@
"X-Poedit-SourceCharset: utf-8\n"
"X-Poedit-Basepath: ../../Web/\n"
-#: downloads\index.php:22
+#: about\screenshots\index.php:26
#, c-format
-msgid "Exe-Format (%s MB)"
-msgstr "Exe-format (%s MB)"
+msgid "Many times it is useful to see exact differences inside lines. WinMerge can highlight different areas between lines."
+msgstr "Många gånger är det användbart att se exakta skillnader i rader. WinMerge kan markera olika områden mellan rader."
#: 404.php:13
#, c-format
@@ -77,14 +77,14 @@
msgid "Handles Windows, Unix and Mac text file formats"
msgstr "Hanterar Windows, Unix och Mac textfilformat"
-#: translations\index.php:6
-#: translations\status_branch.php:7
-#: translations\status_branch.php:10
+#: engine\page.inc:312
+#: support\tracker-shortcuts.php:7
+#: support\tracker-shortcuts.php:9
#, c-format
-msgid "Translations Status (Stable Branch)"
-msgstr "Översättningsstatus (Stabil gren)"
+msgid "Tracker Shortcuts"
+msgstr "Trackergenvägar"
-#: engine\page.inc:295
+#: engine\page.inc:298
#, c-format
msgid "WinMerge Change Log"
msgstr "WinMerges versionshistoria"
@@ -121,37 +121,52 @@
msgid "The translations status is currently not available..."
msgstr "Översättningsstatusen är nu inte tillgänglig..."
-#: engine\page.inc:306
+#: engine\page.inc:295
#, c-format
+msgid "WinMerge Manual"
+msgstr "WinMerge manual"
+
+#: engine\page.inc:309
+#, c-format
msgid "WinMerge Discussion Forums"
msgstr "WinMerges Diskussionsforum"
-#: support\mailing-lists.php:77
+#: about\license.php:5
#, c-format
-msgid "Subscribers to this list get notices of each and every code change commited to Subversion."
-msgstr "Prenumeranter av denna lista får noter om varje kodändring tillhandahållen till Subversion"
+msgid "WinMerge is Open Source software under the GNU General Public License. This means everybody can download the source code and improve and modify it."
+msgstr "WinMerge är ett Open Source program under GNU General Public License. Detta betyder att alla kan ladda ner källkoden och förbättra och ändra i den."
+#: downloads\pad-file.php:90
+#, c-format
+msgid "Company"
+msgstr "Företag"
+
#: support\mailing-lists.php:13
#: support\mailing-lists.php:30
#, c-format
msgid "Support List"
msgstr "Supportlista"
-#: engine\page.inc:302
+#: engine\page.inc:305
#, c-format
msgid "WinMerge PAD File"
msgstr "WinMerge PAD-fil"
-#: about\screenshots\index.php:26
+#: engine\engine.inc:21
#, c-format
-msgid "Many times it is useful to see exact differences inside lines. WinMerge can highlight different area between lines."
-msgstr "Många gånger är det användbart att se exakta skillnader i rader. WinMerge kan markera olika områden mellan rader."
+msgid "French"
+msgstr "Fransk"
#: translations\instructions.php:15
#, c-format
msgid "Source: %s"
msgstr "Källa: %s"
+#: downloads\plugins.php:6
+#, c-format
+msgid "WinMerge, free, download, plugins, plugin, plug-in, setup, installer, binaries, 7-Zip, xdocdiff, Word, Excel, PowerPoint, PDF"
+msgstr "WinMerge, gratis, ladda ner,plugins, plugin,plug-in,setup, installerare, program,7-Zip, xdocdiff, Word, Excel, PowerPoint, PDF "
+
#: translations\index.php:37
#, c-format
msgid "The following two pages inform you about the translations status of the stable and developer version of WinMerge:"
@@ -195,7 +210,7 @@
#: about\history.php:7
#: about\history.php:9
-#: engine\page.inc:287
+#: engine\page.inc:290
#, c-format
msgid "History"
msgstr "Historia"
@@ -210,10 +225,10 @@
msgid "<a href=\"%s\">Documentation</a>?"
msgstr "<a href=\"%s\">Dokumentation</a>?"
-#: support\mailing-lists.php:57
+#: downloads\pad-file.php:78
#, c-format
-msgid "This list is used for coordinating the translations."
-msgstr "Denna lista används för att koordinera översättningarna."
+msgid "Icon"
+msgstr "Ikon"
#: support\mailing-lists.php:32
#: support\mailing-lists.php:42
@@ -224,6 +239,7 @@
#: downloads\index.php:28
#: downloads\index.php:34
+#: downloads\plugins.php:22
#: downloads\source-code.php:18
#, c-format
msgid "7z-Format (%s MB)"
@@ -239,17 +255,17 @@
msgid "Installation"
msgstr "Installation"
-#: support\index.php:19
+#: downloads\source-code.php:15
#, c-format
-msgid "Wish list items on the <a href=\"%s\">feature request list</a> will also be considered, but we make absolutely no promises."
-msgstr "Önskningar i <a href=\"%s\">funktionsäskandelistan</a> kommer också i åtanke, men vi ger absolut inga löften."
+msgid "WinMerge %s - Source Code"
+msgstr "WinMerge %s - källkod"
#: about\index.php:58
#, c-format
msgid "<a href=\"%s\">Online manual</a> and installed HTML Help manual"
msgstr "<a href=\"%s\">Onlinemanual</a> och installerad HTML-hjälpmanual"
-#: engine\page.inc:309
+#: engine\page.inc:312
#, c-format
msgid "WinMerge Tracker Shortcuts"
msgstr "WinMerge Trackergenvägar"
@@ -259,6 +275,11 @@
msgid "<em>Tracker Shortcuts</em> are shorter and nicer URLs to <a href=\"%1$s\">Tracker</a> items from our <a href=\"%2$s\">SF.net project page</a>."
msgstr "<em>Trackergenvägar</em> är kortare och vackrare URLer till <a href=\"%1$s\">Tracker</a> objekt från vår <a href=\"%2$s\">SF.net projektsida</a>."
+#: downloads\pad-file.php:10
+#, c-format
+msgid "The easiest way to get informations about the latest stable version from WinMerge for your web site is the <a href=\"%s\">Portable Application Description</a> file, which you find here:"
+msgstr "Det enklaste sättet att få information om den senaste stabila versionen av WinMerge för din hemsida är den <a href=\"%s\">Portabla Applikation Deskriptions</a> -filen, som du kan finna här:"
+
#: support\tracker-shortcuts.php:14
#, c-format
msgid "Patch"
@@ -274,8 +295,8 @@
msgid "Folder compare shows all files and subfolders found from compared folders as list. Folder compare allows synchronising folders by copying and deleting files and subfolders. Folder compare view can be versatile customised."
msgstr "Katalogjämförelse visar alla filer och underkataloger funna från jämförda kataloger som en lista. Katalogjämförelse tillåter synkronisering av kataloger genom att kopiera och ta bort filer och underkataloger. Katalogjämförelseutseendet kan bli versantilt anpassat."
-#: engine\page.inc:262
-#: engine\page.inc:305
+#: engine\page.inc:265
+#: engine\page.inc:308
#, c-format
msgid "WinMerge Support"
msgstr "WinMerge-support"
@@ -285,10 +306,12 @@
msgid "We require registering because anonymous submissions caused a lot of spam and also because there were no possibility to contact people for asking more information."
msgstr "Vi kräver registrering eftersom anonyma bidrag skapade mycket spam men även eftersom det inte fanns någon möjlighet att kontakta människor och fråga efter mer information."
-#: docs\index.php:5
+#: engine\page.inc:310
+#: support\mailing-lists.php:7
+#: support\mailing-lists.php:9
#, c-format
-msgid "Documentation from WinMerge like manual, release notes, change log and development wiki."
-msgstr "Documentation från WinMerge som manual, releasenoteringar, ändringslog och utvecklings Wiki."
+msgid "Mailing Lists"
+msgstr "Mailinglistor"
#: about\index.php:41
#, c-format
@@ -306,17 +329,18 @@
msgid "WinMerge is an <a href=\"%s\">Open Source</a> differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle."
msgstr "WinMerge är ett <a href=\"%s\">Open Source</a> skillnads och hopläggningsverktyg för Windows. WinMerge kan jämföra både kataloger och filer, presentera skillnader i ett visuellt textformat som är enkelt att förstå och hantera."
-#: support\tracker-shortcuts.php:5
+#: support\index.php:18
#, c-format
-msgid "Tracker Shortcuts are shorter and nicer URLs to Tracker items from our SF.net project page. And you can use this page to create a shortcut."
-msgstr "Trackergenvägar är kortare och vackrare URLer till Trackerobjekt från vår SF.net projektsida. Och du kan använda denna sida för att skapa en genväg."
+msgid "We rarely sent direct emails but you will get notifications when we ask questions in the bug item."
+msgstr "Vi skickar sällan direkta email men du får notifikationer när vi ställer frågor om fel."
#: downloads\index.php:25
+#: downloads\plugins.php:20
#, c-format
msgid "Binaries"
msgstr "Binärfiler"
-#: engine\page.inc:294
+#: engine\page.inc:297
#, c-format
msgid "WinMerge Known Issues"
msgstr "Kända WinMerge problem"
@@ -331,8 +355,13 @@
msgid "You can also download additional <a href=\"%1$s\">plugins</a> and the whole <a href=\"%2$s\">source code</a> from WinMerge."
msgstr "Du kan även ladda ner ytterliggare <a href=\"%1$s\">plugins</a> och hela <a href=\"%2$s\">källkoden</a> från WinMerge."
+#: support\mailing-lists.php:57
+#, c-format
+msgid "This list is used for coordinating the translations."
+msgstr "Denna lista används för att koordinera översättningarna."
+
#: about\license.php:30
-#: engine\page.inc:281
+#: engine\page.inc:284
#, c-format
msgid "Links"
msgstr "Länkar"
@@ -364,12 +393,10 @@
msgid "Feature Request"
msgstr "Funktionsäskande"
-#: engine\page.inc:307
-#: support\mailing-lists.php:7
-#: support\mailing-lists.php:9
+#: support\index.php:11
#, c-format
-msgid "Mailing Lists"
-msgstr "Mailinglistor"
+msgid "The <a href=\"%s\">Open Discussion forum</a> is the fastest way to get help. Please be patient, it may take some time for somebody to answer."
+msgstr "<a href=\"%s\">Det öppna diskussionsforumet</a> är snabbaste sättet att få hjälp. Var god och var tålmodig, det kan ta lite tid för någon att svara."
#: about\index.php:31
#, c-format
@@ -391,8 +418,13 @@
msgid "WinMerge, screenshots, file comparison, open-dialog, folder comparison results, highlight line diff, location pane, splash screen"
msgstr "WinMerge, skärmdumpar, filjämförelse, öppna-dialog, katalogjämförelseresultat, markera radskillnad, skillnadsfält, startskärm"
-#: engine\page.inc:315
+#: downloads\pad-file.php:72
#, c-format
+msgid "Web Addresses"
+msgstr "Webaddresser"
+
+#: engine\page.inc:318
+#, c-format
msgid "WinMerge Translations Status (Stable Branch)"
msgstr "WinMerge Översättningsstatus (Stabil gren)"
@@ -406,10 +438,10 @@
msgid "Difference pane shows current difference in two vertical panes"
msgstr "Skillnadsfältet visar aktuella skillnader i två vertikala fält"
-#: downloads\index.php:58
+#: engine\page.inc:317
#, c-format
-msgid "Microsoft Windows 98/2000/XP/2003/Vista/2008"
-msgstr "Microsoft Windows 98/2000/XP/2003/Vista/2008"
+msgid "Instructions"
+msgstr "Instruktioner"
#: index.php:27
#, c-format
@@ -427,24 +459,29 @@
msgid "English"
msgstr "Engelsk"
-#: support\tracker-shortcuts.php:11
+#: support\index.php:19
#, c-format
-msgid "You can use this page to create a shortcut:"
-msgstr "Du kan använda denna sida för att skapa en genväg:"
+msgid "Wish list items on the <a href=\"%s\">feature request list</a> will also be considered, but we make absolutely no promises."
+msgstr "Önskningar i <a href=\"%s\">funktionsäskandelistan</a> kommer också i åtanke, men vi ger absolut inga löften."
-#: engine\page.inc:280
-#: engine\page.inc:285
-#: engine\page.inc:291
-#: engine\page.inc:305
-#: engine\page.inc:313
+#: engine\engine.inc:23
#, c-format
+msgid "Swedish"
+msgstr "Svensk"
+
+#: engine\page.inc:283
+#: engine\page.inc:288
+#: engine\page.inc:294
+#: engine\page.inc:308
+#: engine\page.inc:316
+#, c-format
msgid "Index"
msgstr "Index"
-#: engine\page.inc:300
+#: downloads\plugins.php:10
#, c-format
-msgid "Download WinMerge Plugins"
-msgstr "Ladda ner WinMerge Plugins"
+msgid "7-Zip Plugin"
+msgstr "7-Zip Plugin"
#: index.php:20
#, c-format
@@ -475,12 +512,12 @@
msgid "Announce List"
msgstr "Annonseringslista"
-#: engine\page.inc:316
+#: engine\page.inc:319
#, c-format
msgid "Status (Unstable Trunk)"
msgstr "Status (Instabil Trunk)"
-#: engine\page.inc:261
+#: engine\page.inc:264
#, c-format
msgid "WinMerge Downloads"
msgstr "WinMerge nerladdning"
@@ -490,19 +527,17 @@
msgid "Japanese WinMerge Version"
msgstr "Japansk WinMerge-version"
-#: engine\page.inc:308
+#: engine\page.inc:311
#, c-format
msgid "Tracker"
msgstr "Tracker"
-#: about\history.php:20
-#: docs\changelog.php:7
-#: docs\changelog.php:8
-#: docs\index.php:14
-#: engine\page.inc:295
+#: about\index.php:67
+#: about\screenshots\index.php:18
+#: about\screenshots\index.php:19
#, c-format
-msgid "Change Log"
-msgstr "Versionshistoria"
+msgid "Folder Comparison Results"
+msgstr "Katalogjämförelseresultat"
#: downloads\index.php:69
#, c-format
@@ -530,8 +565,13 @@
msgid "WinMerge, free, download, Windows, setup, installer, binaries, runtimes, stable, beta, experimental, portable"
msgstr "WinMerge, fri, ladda ner, Windows, setup, installerare, program, körfiler, stabil, beta, experimental, portabel"
-#: engine\page.inc:296
+#: downloads\pad-file.php:48
#, c-format
+msgid "Type"
+msgstr "Typ:"
+
+#: engine\page.inc:299
+#, c-format
msgid "WinMerge Development Wiki"
msgstr "WinMerge Utvecklings-Wiki"
@@ -540,6 +580,11 @@
msgid "The current WinMerge version is <strong>%1$s</strong> and was released at <strong>%2$s</strong>."
msgstr "Den aktuella WinMerge versionen är <strong>%1$s</strong> och den släpptes <strong>%2$s</strong>."
+#: about\index.php:21
+#, c-format
+msgid "Supports Microsoft Windows 98/ME/2000/XP/2003/Vista/2008"
+msgstr "Stöder Microsoft Windows 98/ME/2000/XP/2003/Vista/2008"
+
#: 404.php:22
#, c-format
msgid "<a href=\"%s\">Release Notes</a>?"
@@ -565,17 +610,12 @@
msgid "Resolve conflict files"
msgstr "Lös konfliktfiler"
-#: engine\page.inc:261
+#: engine\page.inc:264
#, c-format
msgid "Downloads"
msgstr "Filer"
-#: translations\index.php:29
-#, c-format
-msgid "To change languages, select the desired language from the <span class=\"guimenu\">View</span>→ <span class=\"guimenuitem\">Languages</span> menu choice."
-msgstr "För att ändra språk, välj det önskade språket från <span class=\"guimenu\">Visa</span>→ <span class=\"guimenuitem\">Språk</span> menyvalet."
-
-#: engine\page.inc:263
+#: engine\page.inc:266
#: translations\index.php:8
#: translations\index.php:10
#, c-format
@@ -587,27 +627,37 @@
msgid "Since WinMerge is an <a href=\"%s\">Open Source</a> project, you may use it free of charge."
msgstr "Eftersom WinMerge är ett <a href=\"%s\">Open Source</a> projekt, kan du använda det gratis."
-#: engine\page.inc:282
+#: engine\page.inc:285
#, c-format
msgid "Project Page"
msgstr "Projektsida"
#: about\index.php:7
#: about\index.php:10
-#: engine\page.inc:259
-#: engine\page.inc:285
+#: engine\page.inc:262
+#: engine\page.inc:288
#, c-format
msgid "About WinMerge"
msgstr "Om WinMerge"
-#: engine\page.inc:263
-#: engine\page.inc:313
+#: engine\page.inc:266
+#: engine\page.inc:316
#, c-format
msgid "WinMerge Translations"
msgstr "WinMerge Översättningar"
-#: engine\page.inc:308
+#: downloads\pad-file.php:6
#, c-format
+msgid "WinMerge, PAD file, Portable Application Description"
+msgstr "WinMerge, PAD- filen, Portabla Applikation Deskriptionen"
+
+#: downloads\pad-file.php:40
+#, c-format
+msgid "Release Status"
+msgstr "Releasestatus"
+
+#: engine\page.inc:311
+#, c-format
msgid "WinMerge Tracker"
msgstr "WinMerge Tracker"
@@ -621,18 +671,23 @@
msgid "Download the current WinMerge version %1$s, which was released at %2$s. For detailed info on what is new, read the change log and the release notes."
msgstr "Ladda ner den aktuella WinMerge versionen %1$s, som släpptes %2$s. För detaljerad information om vad som är nytt, läs ändringsloggen och releasenoteringarna."
-#: engine\page.inc:294
+#: engine\page.inc:297
#, c-format
msgid "Known Issues"
msgstr "Kända problem"
+#: translations\index.php:29
+#, c-format
+msgid "To change language, select the desired language from the <span class=\"guimenu\">View</span>→ <span class=\"guimenuitem\">Language</span> menu choice."
+msgstr "För att ändra språk, välj det önskade språket från <span class=\"guimenu\">Visa</span>→ <span class=\"guimenuitem\">Språk</span> menyvalet."
+
#: translations\translations.inc:136
#: translations\translations_branch.inc:71
#, c-format
msgid "Last Update"
msgstr "Senaste uppdateringen"
-#: engine\page.inc:301
+#: engine\page.inc:304
#, c-format
msgid "Source Code"
msgstr "Källkod"
@@ -650,6 +705,11 @@
msgid "Zip-Format (%s MB)"
msgstr "Zip-Format (%s MB)"
+#: support\tracker-shortcuts.php:5
+#, c-format
+msgid "Tracker Shortcuts are shorter and nicer URLs to Tracker items from our SF.net project page. And you can use this page to create a shortcut."
+msgstr "Trackergenvägar är kortare och vackrare URLer till Trackerobjekt från vår SF.net projektsida. Och du kan använda denna sida för att skapa en genväg."
+
#: support\tracker-shortcuts.php:18
#, c-format
msgid "Tracker Item"
@@ -667,23 +727,18 @@
#: docs\index.php:7
#: docs\index.php:9
-#: engine\page.inc:260
+#: engine\page.inc:263
#, c-format
msgid "Documentation"
msgstr "Dokumentation"
#: about\history.php:19
#: docs\index.php:10
-#: engine\page.inc:292
+#: engine\page.inc:295
#, c-format
msgid "Manual"
msgstr "Manual"
-#: docs\index.php:17
-#, c-format
-msgid "The <a href=\"%s\">Development Wiki</a> contains many informations about the WinMerge development."
-msgstr "<a href=\"%s\">Utvecklings Wiki</a> innehåller mycket information om WinMerge-utveckling."
-
#: index.php:8
#: index.php:30
#, c-format
@@ -700,10 +755,10 @@
msgid "WinMerge, license, open source, GNU General Public License, GPL, free software"
msgstr "WinMerge, licens, Open Source, GNU General Public License, GPL, fri programvara"
-#: engine\page.inc:282
+#: downloads\pad-file.php:94
#, c-format
-msgid "WinMerge Project Page"
-msgstr "WinMerge Projektsida"
+msgid "Contact"
+msgstr "Kontakta"
#: downloads\index.php:40
#: downloads\source-code.php:24
@@ -711,7 +766,7 @@
msgid "SHA-1 Checksums"
msgstr "SHA-1 kontrollsummor"
-#: engine\page.inc:228
+#: engine\page.inc:231
#, c-format
msgid "Version %1$s; %2$s MB"
msgstr "Version %1$s; %2$s MB"
@@ -721,15 +776,10 @@
msgid "The release notes are currently not available..."
msgstr "Releasenoteringarna är nu inte tillgängliga..."
-#: translations\translations.inc:81
-#: translations\translations.inc:95
-#: translations\translations.inc:133
-#: translations\translations_branch.inc:49
-#: translations\translations_branch.inc:68
-#: translations\translations_branch.inc:118
+#: support\tracker-shortcuts.php:23
#, c-format
-msgid "Translated"
-msgstr "Översatt"
+msgid "Type:"
+msgstr "Typ:"
#: support\tracker-shortcuts.php:6
#, c-format
@@ -741,6 +791,11 @@
msgid "The Open Discussion forum is the fastest way to get help. A other way is a subscription to the support mailing list."
msgstr "Det Öppna diskussionsforumet är det snabbaste sättet att få hjälp. Ett annat sätt är att prenumera på supportmailinglistan"
+#: downloads\plugins.php:32
+#, c-format
+msgid "For more details and the download go to the <a href=\"%s\">xdocdiff plugin homepage</a>."
+msgstr "För mer detaljer och nerladdning gå till <a href=\"%s\">xdocdiff plugin hemsidan</a>."
+
#: translations\index.php:39
#, c-format
msgid "Stable Version (Branch)"
@@ -751,7 +806,7 @@
msgid "English (Template)"
msgstr "Engelsk (Förlaga)"
-#: engine\page.inc:281
+#: engine\page.inc:284
#, c-format
msgid "WinMerge Links"
msgstr "WinMerge Länkar"
@@ -761,40 +816,41 @@
msgid "Location pane is a handy side-pane showing a overall (difference) map of files compared."
msgstr "Skillnadsfältet är en användbar sidopanel som visar en översiktlig (skillnads) bild på jämförda filer"
-#: about\license.php:10
+#: docs\index.php:5
#, c-format
-msgid ""
-"This means everybody can download the <a href=\"%s\">source code</a> and improve and modify them.\n"
-"The only thing we ask is that people submit their improvements and modifications back to us so that all WinMerge users may benefit."
-msgstr ""
-"Detta betyder att alla kan ladda ner <a href=\"%s\">källkoden</a> och förbättra och ändra i den.\n"
-"Det enda vi begär är att människor skickar deras förbättringar och modifikationer till oss så att alla WinMerge användare kan få nytta av dem."
+msgid "Documentation from WinMerge like manual, release notes, change log and Development Wiki."
+msgstr "Documentation från WinMerge som manual, releasenoteringar, ändringslog och utvecklings-Wiki."
-#: engine\page.inc:302
-#, c-format
-msgid "PAD File"
-msgstr "PAD-fil"
-
#: docs\index.php:15
#, c-format
msgid "The <a href=\"%s\">change log</a> is a more complete list of changes in the last WinMerge releases."
msgstr "<a href=\"%s\">Ändringsloggen</a> är en mer komplett lista på ändringar i den senaste WinMerge releasen."
-#: engine\page.inc:316
+#: engine\page.inc:303
#, c-format
+msgid "Download WinMerge Plugins"
+msgstr "Ladda ner WinMerge Plugins"
+
+#: engine\page.inc:319
+#, c-format
msgid "WinMerge Translations Status (Unstable Trunk)"
msgstr "WinMerge Översättningsstatus (Instabil Trunk)"
-#: support\tracker-shortcuts.php:23
+#: docs\index.php:17
#, c-format
-msgid "Type:"
-msgstr "Typ:"
+msgid "The <a href=\"%s\">Development Wiki</a> contains much information about the WinMerge development."
+msgstr "<a href=\"%s\">Utvecklings-Wiki</a> innehåller mycket information om WinMerge-utveckling."
#: downloads\index.php:16
#, c-format
msgid "For detailed info on what is new, read the <a href=\"%1$s\">change log</a> and the <a href=\"%2$s\">release notes</a>."
msgstr "För detaljerad information om vad som är nytt, läs <a href=\"%1$s\">ändringsloggen</a> och <a href=\"%2$s\">releasenoteringarna</a>."
+#: support\mailing-lists.php:77
+#, c-format
+msgid "Subscribers to this list get notices of each and every code change commited to Subversion."
+msgstr "Prenumeranter av denna lista får noter om varje kodändring tillhandahållen till Subversion"
+
#: support\mailing-lists.php:14
#: support\mailing-lists.php:40
#, c-format
@@ -806,43 +862,51 @@
msgid "If you are interested in contributing work to the project, see our <a href=\"%s\">developer page</a> for further information on how you may contribute."
msgstr "Om du är intresserad att bidra med arbete i projektet, se vår <a href=\"%s\">utvecklingssida</a> för mer information om hur du kan bidra."
-#: translations\translations.inc:182
+#: downloads\plugins.php:7
+#: downloads\plugins.php:9
#, c-format
-msgid "Total: Unknown"
-msgstr "Totalt: Okänt"
+msgid "Download Plugins"
+msgstr "Ladda ner Plugins"
+#: downloads\pad-file.php:58
+#: downloads\pad-file.php:60
+#: downloads\pad-file.php:62
+#, c-format
+msgid "English Description (%d chars)"
+msgstr "Engelsk beskrivning (%d tecken)"
+
#: about\index.php:29
#, c-format
msgid "Visual differencing and merging of text files"
msgstr "Visuell urskillnad och ihopläggande av textfiler"
+#: engine\page.inc:285
+#, c-format
+msgid "WinMerge Project Page"
+msgstr "WinMerge Projektsida"
+
#: downloads\index.php:60
#, c-format
msgid "Admin rights for the installer"
msgstr "Administrationrättigheter för installationsprogrammet"
-#: support\mailing-lists.php:15
-#: support\mailing-lists.php:50
+#: downloads\plugins.php:28
#, c-format
-msgid "Translate List"
-msgstr "Översättningslista"
+msgid "You can also read the <a href=\"%1$s\">Release Notes</a> or search for <a href=\"%2$s\">other versions</a>."
+msgstr "Du kan också läsa <a href=\"%1$s\">Releasenoteringarna</a> eller leta efter <a href=\"%2$s\">andra versioner</a>."
-#: support\mailing-lists.php:25
-#: support\mailing-lists.php:35
-#: support\mailing-lists.php:45
-#: support\mailing-lists.php:55
-#: support\mailing-lists.php:65
-#: support\mailing-lists.php:75
+#: engine\page.inc:289
#, c-format
-msgid "Archive"
-msgstr "Arkiv"
+msgid "WinMerge Screenshots"
+msgstr "WinMerge skärmdumpar"
-#: support\index.php:18
+#: downloads\pad-file.php:42
#, c-format
-msgid "We rarely sent direct emails but you will get notifications when we ask questions in the bug item."
-msgstr "Vi skickar sällan direkta email men du får notifikationer när vi ställer frågor om fel."
+msgid "Download"
+msgstr "Ladda ner"
#: downloads\index.php:20
+#: downloads\plugins.php:15
#, c-format
msgid "Installer"
msgstr "Installationsprogram"
@@ -855,12 +919,12 @@
#: about\index.php:64
#: about\screenshots\index.php:7
#: about\screenshots\index.php:9
-#: engine\page.inc:286
+#: engine\page.inc:289
#, c-format
msgid "Screenshots"
msgstr "Skärmdumpar"
-#: engine\page.inc:287
+#: engine\page.inc:290
#, c-format
msgid "WinMerge History"
msgstr "WinMerge Historia"
@@ -870,6 +934,16 @@
msgid "Here is the current <a href=\"%s\">change log</a>."
msgstr "Här är den aktuella <a href=\"%s\">ändringsloggen</a>."
+#: support\tracker-shortcuts.php:11
+#, c-format
+msgid "You can use this page to create a shortcut:"
+msgstr "Du kan använda denna sida för att skapa en genväg:"
+
+#: downloads\pad-file.php:5
+#, c-format
+msgid "The easiest way to get informations about the latest stable version from WinMerge for your web site is the Portable Application Description file, which you find here."
+msgstr "Det enklaste sättet att få information om den senaste stabila versionen av WinMerge för din hemsida är den Portabla Applikation Deskriptions-filen, som du kan finna här:"
+
#: translations\translations.inc:41
#, c-format
msgid "File not found."
@@ -897,7 +971,8 @@
msgstr "I trädfönstret, är kataloger expanderbara och imploderbara, innehållande filer och underkataloger. Detta är användbart för enkel navigation i djupt liggande katalogstrukturer. <em>Trädfönstret är bara tillgändligt i rekursiva jämförelser."
#: index.php:42
-#: engine\page.inc:262
+#: downloads\pad-file.php:96
+#: engine\page.inc:265
#: support\index.php:8
#: support\index.php:10
#, c-format
@@ -919,6 +994,16 @@
msgid "Download the source code of WinMerge, which is released under the GNU General Public License."
msgstr "Ladda ner källkoden för WinMerge, som är släppt under GNU General Public licensen."
+#: translations\translations.inc:81
+#: translations\translations.inc:95
+#: translations\translations.inc:133
+#: translations\translations_branch.inc:49
+#: translations\translations_branch.inc:68
+#: translations\translations_branch.inc:118
+#, c-format
+msgid "Translated"
+msgstr "Översatt"
+
#: index.php:46
#, c-format
msgid "WinMerge is an open source project, which means that the program is maintained and developed by volunteers."
@@ -949,14 +1034,12 @@
msgid "Or you may simply unzip the <a href=\"%s\">binary zip package</a> into the desired location, and run <code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>)."
msgstr "Eller du kan enkelt packa upp <a href=\"%s\">det binära zip-paketet</a> till den önskade platsen, och köra <code>WinMergeU.exe</code> (utom för Windows 98/ME användare som ska använda <code>WinMerge.exe</code>)."
-#: engine\page.inc:309
-#: support\tracker-shortcuts.php:7
-#: support\tracker-shortcuts.php:9
+#: downloads\pad-file.php:56
#, c-format
-msgid "Tracker Shortcuts"
-msgstr "Trackergenvägar"
+msgid "English Descriptions"
+msgstr "Engelska besrivningar"
-#: engine\page.inc:310
+#: engine\page.inc:313
#: support\index.php:37
#, c-format
msgid "Donate"
@@ -984,10 +1067,10 @@
msgid "The Open Source Definition"
msgstr "Open Source definitionen"
-#: engine\page.inc:258
+#: downloads\pad-file.php:46
#, c-format
-msgid "Home"
-msgstr "Hem"
+msgid "Supported Languages"
+msgstr "Stödda språk"
#: index.php:6
#, c-format
@@ -999,16 +1082,32 @@
msgid "Beta Versions"
msgstr "Beta-versioner"
+#: downloads\pad-file.php:76
+#, c-format
+msgid "Screenshot"
+msgstr "Skärmdump"
+
#: about\index.php:6
#, c-format
msgid "WinMerge, about, features, file compare, folder compare, version control, screenshots, installation"
msgstr "WinMerge, om, funktioner, filjämförelse, katalogjämförelse, versionskontroll, skärmdumpar, installation"
-#: engine\page.inc:286
+#: support\mailing-lists.php:15
+#: support\mailing-lists.php:50
#, c-format
-msgid "WinMerge Screenshots"
-msgstr "WinMerge skärmdumpar"
+msgid "Translate List"
+msgstr "Översättningslista"
+#: downloads\index.php:58
+#, c-format
+msgid "Microsoft Windows 98/ME/2000/XP/2003/Vista/2008"
+msgstr "Microsoft Windows 98/ME/2000/XP/2003/Vista/2008"
+
+#: downloads\plugins.php:5
+#, c-format
+msgid "Download additional plugins for WinMerge, like the 7-Zip plugin or the xdocdiff Plugin."
+msgstr "Ladda ner ytterliggare plugins för WinMerge,som 7-Zip plugin eller xdocdiff plugin."
+
#: translations\index.php:7
#: translations\status_trunk.php:7
#: translations\status_trunk.php:9
@@ -1037,7 +1136,7 @@
msgid "If you need support, look at our <a href=\"%s\">support page</a> for more information how you can get it."
msgstr "Om du behöver support, titta på vår <a href=\"%s\">supportsida</a> för mer information om hur du kan få det."
-#: engine\page.inc:315
+#: engine\page.inc:318
#, c-format
msgid "Status (Stable Branch)"
msgstr "Status (Stabil gren)"
@@ -1057,6 +1156,11 @@
msgid "Bug"
msgstr "Fel"
+#: downloads\plugins.php:31
+#, c-format
+msgid "With this plugin you can compare Word, Excel, PowerPoint, PDF and some more files."
+msgstr "Med denna plugin kan du jäföra Word,Excel,Powerpoint och några fler filer."
+
#: downloads\source-code.php:6
#, c-format
msgid "WinMerge, free, download, source code, GPL, Subversion, SVN, TortoiseSVN"
@@ -1077,6 +1181,11 @@
msgid "WinMerge, release notes, summary, changes, enhancements, bug fixes, known issues, release"
msgstr "WinMerge, releasenoteringar, sammanfattning, ändringar, förbättringar, felfixar, kända problem, releaser"
+#: downloads\pad-file.php:14
+#, c-format
+msgid "If you can not work with the <a href=\"%s\">PAD file</a>, you can use the following informations:"
+msgstr "Om du inte kan arbeta med <a href=\"%s\">PAD-filen</a>, kan du använda följande information:"
+
#: about\index.php:57
#, c-format
msgid "Localizable interface"
@@ -1097,21 +1206,36 @@
msgid "Archive file support using 7-Zip"
msgstr "Arkivfilstöd med 7-Zip"
-#: support\index.php:11
+#: translations\index.php:6
+#: translations\status_branch.php:7
+#: translations\status_branch.php:10
#, c-format
-msgid "The <a href=\"%s\">Open Discussion forum</a> is the fastest way to get help. Please be patient, it may take some time for somebody to answer."
-msgstr "<a href=\"%s\">Det öppna diskussionsforumet</a> är snabbaste sättet att få hjälp. Var god och var tålmodig, det kan ta lite tid för någon att svara."
+msgid "Translations Status (Stable Branch)"
+msgstr "Översättningsstatus (Stabil gren)"
#: support\index.php:21
#, c-format
msgid "Tracker Statistics"
msgstr "Trackerstatistik"
-#: engine\page.inc:301
+#: downloads\pad-file.php:64
#, c-format
+msgid "English Keywords"
+msgstr "Engelska nyckelord"
+
+#: engine\page.inc:304
+#, c-format
msgid "Download WinMerge Source Code"
msgstr "Ladda ner WinMerges källkod"
+#: downloads\pad-file.php:7
+#: downloads\pad-file.php:9
+#: downloads\pad-file.php:80
+#: engine\page.inc:305
+#, c-format
+msgid "PAD File"
+msgstr "PAD-fil"
+
#: downloads\index.php:13
#: downloads\source-code.php:39
#, c-format
@@ -1134,20 +1258,29 @@
msgid "Fuzzy"
msgstr "Oklar"
-#: downloads\source-code.php:15
+#: docs\index.php:6
#, c-format
-msgid "WinMerge %s - Source Code"
-msgstr "WinMerge %s - källkod"
+msgid "WinMerge, documentation, manual, release notes, known issues, change log, Development Wiki"
+msgstr "WinMerge, dokumentation, manual, releasenoteringar, kända problem, ändringslog, utvecklings-Wiki"
+#: about\license.php:10
+#, c-format
+msgid ""
+"This means everybody can download the <a href=\"%s\">source code</a> and improve and modify it.\n"
+"The only thing we ask is that people submit their improvements and modifications back to us so that all WinMerge users may benefit."
+msgstr ""
+"Detta betyder att alla kan ladda ner <a href=\"%s\">källkoden</a> och förbättra och ändra i den.\n"
+"Det enda vi begär är att människor skickar sina förbättringar och modifikationer till oss så att alla WinMerge användare kan få nytta av dem."
+
#: about\history.php:5
#, c-format
msgid "History of WinMerge releases with version numbers, release dates and manuals."
-msgstr ""
+msgstr "Historia om WinMerge releaser med versionsnummer,releasedatum och manualer."
-#: engine\page.inc:292
+#: downloads\plugins.php:11
#, c-format
-msgid "WinMerge Manual"
-msgstr "WinMerge manual"
+msgid "This is the 7-Zip plugin for WinMerge and the current version <strong>%1$s</strong> was released at <strong>%2$s</strong>."
+msgstr "Detta är 7-Zip plugin för WinMergeoch den akuella versionen <strong>%1$s</strong> släpptes <strong>%2$s</strong>."
#: 404.php:23
#, c-format
@@ -1169,6 +1302,16 @@
msgid "Features"
msgstr "Funktioner"
+#: support\mailing-lists.php:25
+#: support\mailing-lists.php:35
+#: support\mailing-lists.php:45
+#: support\mailing-lists.php:55
+#: support\mailing-lists.php:65
+#: support\mailing-lists.php:75
+#, c-format
+msgid "Archive"
+msgstr "Arkiv"
+
#: engine\engine.inc:20
#, c-format
msgid "German"
@@ -1179,8 +1322,8 @@
msgid "Please attach as much information as you can: at a minimum, the version number of WinMerge that you are using. If you can, also attach a configuration log which, you can display by clicking <span class=\"guimenu\">Help</span> → <span class=\"guimenuitem\">Configuration</span> in the WinMerge window."
msgstr "Var god och lägg till så mycket information du kan: som ett minimum, versionsnumret på WinMerge som du använder. Om du kan, lägg också till en konfigurationslog ,som du kan visa genom att klicka på <span class=\"guimenu\">Hjälp</span> → <span class=\"guimenuitem\">Konfiguration</span> i WinMerges fönster."
-#: engine\page.inc:258
-#: engine\page.inc:280
+#: engine\page.inc:261
+#: engine\page.inc:283
#, c-format
msgid "WinMerge Home"
msgstr "WinMerges hemsida"
@@ -1195,11 +1338,16 @@
msgid "The <a href=\"%s\">manual</a> explains how to use WinMerge, and documents its capabilities and limitations."
msgstr "<a href=\"%s\">Manualen</a> förklarar hur man ska använda WinMerge, och dokument dess kapacitet och begränsningar."
-#: engine\page.inc:299
+#: engine\page.inc:302
#, c-format
msgid "WinMerge"
msgstr "WinMerge"
+#: downloads\plugins.php:30
+#, c-format
+msgid "xdocdiff Plugin"
+msgstr "xdocdiff Plugin"
+
#: support\tracker-shortcuts.php:17
#, c-format
msgid "Todo Item"
@@ -1210,12 +1358,13 @@
msgid "This is the list where participating developers of the WinMerge meet and discuss issues, code changes/additions, etc."
msgstr "Detta är listan där deltagande utvecklare av WinMerge möts och diskuterar problem, kodändringar/tillägg, osv."
-#: about\license.php:5
+#: downloads\index.php:22
+#: downloads\plugins.php:17
#, c-format
-msgid "WinMerge is Open Source software under the GNU General Public License. This means everybody can download the source code and improve and modify them."
-msgstr "WinMerge är ett Open Source program under GNU General Public License. Detta betyder att alla kan ladda ner källkoden och förbättra och ändra i den."
+msgid "Exe-Format (%s MB)"
+msgstr "Exe-format (%s MB)"
-#: engine\page.inc:300
+#: engine\page.inc:303
#, c-format
msgid "Plugins"
msgstr "Plugins"
@@ -1225,13 +1374,20 @@
msgid "WinMerge, mailing lists, announce, support, user, translate, development, SVN"
msgstr "WinMerge, mailinglistor, annonsera, support, användare, översätt, utveckling, SVN"
-#: about\index.php:67
-#: about\screenshots\index.php:18
-#: about\screenshots\index.php:19
+#: about\history.php:20
+#: docs\changelog.php:7
+#: docs\changelog.php:8
+#: docs\index.php:14
+#: engine\page.inc:298
#, c-format
-msgid "Folder Comparison Results"
-msgstr "Katalogjämförelseresultat"
+msgid "Change Log"
+msgstr "Versionshistoria"
+#: support\tracker-shortcuts.php:37
+#, c-format
+msgid "Generate"
+msgstr "Generera"
+
#: about\index.php:23
#, c-format
msgid "Unicode support"
@@ -1242,13 +1398,13 @@
msgid "But please consider making a <a href=\"%s\">donation</a> to support the continued development of WinMerge."
msgstr "Men snälla tänk på om du vill göra en <a href=\"%s\">donation</a> för att stödja den fortsatta utvecklingen av WinMerge."
-#: about\index.php:21
+#: downloads\pad-file.php:74
#, c-format
-msgid "Supports Microsoft Windows 98/2000/XP/2003/Vista/2008"
-msgstr "Stöder Microsoft Windows 98/2000/XP/2003/Vista/2008"
+msgid "Information"
+msgstr "Information"
-#: engine\page.inc:260
-#: engine\page.inc:291
+#: engine\page.inc:263
+#: engine\page.inc:294
#, c-format
msgid "WinMerge Documentation"
msgstr "WinMerge Dokumentation"
@@ -1302,6 +1458,11 @@
msgid "File Comparison"
msgstr "Filjänförelse"
+#: engine\page.inc:261
+#, c-format
+msgid "Home"
+msgstr "Hem"
+
#: support\mailing-lists.php:37
#, c-format
msgid "You should ask all your support questions on this list."
@@ -1317,10 +1478,10 @@
msgid "<a href=\"%s\">Support</a>?"
msgstr "<a href=\"%s\">Support</a>?"
-#: docs\index.php:6
+#: engine\engine.inc:22
#, c-format
-msgid "WinMerge, documentation, manual, release notes, known issues, change log, development wiki"
-msgstr "WinMerge, dokumentation, manual, releasenoteringar, kända problem, ändringslog, utvecklings-Wiki"
+msgid "Dutch"
+msgstr "Nederländsk"
#: support\index.php:7
#, c-format
@@ -1354,11 +1515,16 @@
msgstr "<a href=\"%s\">Skärmdumpar</a>?"
#: docs\index.php:16
-#: engine\page.inc:296
+#: engine\page.inc:299
#, c-format
msgid "Development Wiki"
msgstr "UtvecklingsWiki"
+#: translations\translations.inc:182
+#, c-format
+msgid "Total: Unknown"
+msgstr "Totalt: Okänt"
+
#: about\index.php:69
#, c-format
msgid "See the <a href=\"%s\">screenshots page</a> for more screenshots."
@@ -1376,7 +1542,7 @@
msgid "Translations instructions"
msgstr "Översättningsinstruktioner"
-#: engine\page.inc:307
+#: engine\page.inc:310
#, c-format
msgid "WinMerge Mailing Lists"
msgstr "WinMerge brevlistor"
@@ -1386,7 +1552,7 @@
msgid "Experimental Builds"
msgstr "Experimentella versioner"
-#: engine\page.inc:310
+#: engine\page.inc:313
#, c-format
msgid "Donate money to WinMerge"
msgstr "Donera pengar till WinMerge"
@@ -1396,14 +1562,19 @@
msgid "Stable Versions"
msgstr "Stabila versioner"
-#: engine\page.inc:259
+#: engine\page.inc:262
#, c-format
msgid "About"
msgstr "Om"
+#: downloads\pad-file.php:92
+#, c-format
+msgid "Name"
+msgstr "Namn"
+
#: about\license.php:7
#: about\license.php:9
-#: engine\page.inc:288
+#: engine\page.inc:291
#, c-format
msgid "License"
msgstr "Licens"
@@ -1413,20 +1584,15 @@
msgid "Other Versions"
msgstr "Andra versioner"
-#: engine\page.inc:314
+#: engine\page.inc:309
#, c-format
-msgid "Instructions"
-msgstr "Instruktioner"
-
-#: engine\page.inc:306
-#, c-format
msgid "Discussion Forums"
msgstr "Diskussionsforum"
-#: support\tracker-shortcuts.php:37
+#: downloads\pad-file.php:38
#, c-format
-msgid "Generate"
-msgstr "Generera"
+msgid "Release Date"
+msgstr "Releasedatum"
#: support\index.php:13
#, c-format
@@ -1443,7 +1609,7 @@
msgid "WinMerge, free, open source, Windows, windiff, diff, merge, compare, tool, utility, text, file, folder, directory, compare files, compare folders, merge files, merge folders, diff tool, merge tool, compare tool"
msgstr "WinMerge, fri, Open Source, Windows, windiff, skillnad, lägg samman, jämför, verktyg, nyttighet, text, fil, folder, katalog, jämför filer, jämför folder, lägg samman filer, lägg samman folder, skillnadsverktyg, lägg samman-verktyg, jämförverktyg"
-#: engine\page.inc:227
+#: engine\page.inc:230
#, c-format
msgid "Download Now!"
msgstr "Ladda ner nu!"
@@ -1461,17 +1627,17 @@
#: docs\index.php:12
#: docs\releasenotes.php:7
#: docs\releasenotes.php:10
-#: engine\page.inc:293
+#: engine\page.inc:296
#, c-format
msgid "Release Notes"
msgstr "Releasenoteringar"
-#: engine\page.inc:314
+#: engine\page.inc:317
#, c-format
msgid "WinMerge Translations Instructions"
msgstr "WinMerges översättningsinstruktioner"
-#: engine\page.inc:293
+#: engine\page.inc:296
#, c-format
msgid "WinMerge Release Notes"
msgstr "WinMerge releasenoteringar"
@@ -1484,7 +1650,7 @@
#: translations\index.php:32
#, c-format
msgid "If you would like to update any of these translations or add another translation, then please follow <a href=\"%s\">these instructions</a>."
-msgstr "Om du vill uppdatera någon av dessa översättningar eller lägga till en annan översättning, då snälla följ <a href=\"%s\">dessa instruktioner</a>."
+msgstr "Om du vill uppdatera någon av dessa översättningar eller lägga till en annan översättning, då snälla följ <a href=\"%s\">dessa instruktioner</a>."
#: translations\index.php:31
#, c-format
@@ -1545,7 +1711,7 @@
msgid "WinMerge is <a href=\"%1$s\">Open Source</a> software under the <a href=\"%2$s\">GNU General Public License</a>."
msgstr "WinMerge är <a href=\"%1$s\">Open Source</a> programvara under <a href=\"%2$s\">GNU General Public License</a>."
-#: engine\page.inc:288
+#: engine\page.inc:291
#, c-format
msgid "WinMerge License"
msgstr "WinMerge licens"
@@ -1557,16 +1723,21 @@
#: downloads\index.php:10
#: downloads\index.php:12
-#: engine\page.inc:299
+#: engine\page.inc:302
#, c-format
msgid "Download WinMerge"
msgstr "Ladda ner WinMerge"
-#: engine\page.inc:366
+#: engine\page.inc:369
#, c-format
msgid "Bookmark this on Delicious"
msgstr "Bokmärk detta på Delicious"
+#: downloads\pad-file.php:44
+#, c-format
+msgid "Operating Systems"
+msgstr "Operativsystem"
+
#: about\screenshots\index.php:14
#, c-format
msgid "File compare window is basically two files opened to editor into two horizontal panes. Editing allows user to easily do small changes without need to open files to other editor or development environment."
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2009-08-30 10:59:35
|
Revision: 6980
http://winmerge.svn.sourceforge.net/winmerge/?rev=6980&view=rev
Author: gerundt
Date: 2009-08-30 10:59:27 +0000 (Sun, 30 Aug 2009)
Log Message:
-----------
Fix syntax error in Swedish website PO file
Modified Paths:
--------------
trunk/Translations/Web/se.po
Modified: trunk/Translations/Web/se.po
===================================================================
--- trunk/Translations/Web/se.po 2009-08-29 15:54:38 UTC (rev 6979)
+++ trunk/Translations/Web/se.po 2009-08-30 10:59:27 UTC (rev 6980)
@@ -145,7 +145,7 @@
#: about\screenshots\index.php:26
#, c-format
msgid "Many times it is useful to see exact differences inside lines. WinMerge can highlight different area between lines."
-msgstr "Många gånger är det användbart att se exakta skillnader i rader. WinMerge" kan markera olika områden mellan rader."
+msgstr "Många gånger är det användbart att se exakta skillnader i rader. WinMerge kan markera olika områden mellan rader."
#: translations\instructions.php:15
#, c-format
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2009-08-29 15:54:54
|
Revision: 6979
http://winmerge.svn.sourceforge.net/winmerge/?rev=6979&view=rev
Author: gerundt
Date: 2009-08-29 15:54:38 +0000 (Sat, 29 Aug 2009)
Log Message:
-----------
Update web POT file
Modified Paths:
--------------
trunk/Translations/Web/en-US.pot
Modified: trunk/Translations/Web/en-US.pot
===================================================================
--- trunk/Translations/Web/en-US.pot 2009-08-29 15:40:17 UTC (rev 6978)
+++ trunk/Translations/Web/en-US.pot 2009-08-29 15:54:38 UTC (rev 6979)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org\n"
-"POT-Creation-Date: 2009-08-26 18:51+0000\n"
+"POT-Creation-Date: 2009-08-29 17:42+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <win...@li...>\n"
@@ -19,9 +19,9 @@
"X-Poedit-SourceCharset: utf-8\n"
"X-Poedit-Basepath: ../../Web/\n"
-#: downloads\index.php:22
+#: about\screenshots\index.php:26
#, c-format
-msgid "Exe-Format (%s MB)"
+msgid "Many times it is useful to see exact differences inside lines. WinMerge can highlight different areas between lines."
msgstr ""
#: 404.php:13
@@ -74,14 +74,14 @@
msgid "Handles Windows, Unix and Mac text file formats"
msgstr ""
-#: translations\index.php:6
-#: translations\status_branch.php:7
-#: translations\status_branch.php:10
+#: engine\page.inc:312
+#: support\tracker-shortcuts.php:7
+#: support\tracker-shortcuts.php:9
#, c-format
-msgid "Translations Status (Stable Branch)"
+msgid "Tracker Shortcuts"
msgstr ""
-#: engine\page.inc:295
+#: engine\page.inc:298
#, c-format
msgid "WinMerge Change Log"
msgstr ""
@@ -118,30 +118,40 @@
msgid "The translations status is currently not available..."
msgstr ""
-#: engine\page.inc:306
+#: engine\page.inc:295
#, c-format
+msgid "WinMerge Manual"
+msgstr ""
+
+#: engine\page.inc:309
+#, c-format
msgid "WinMerge Discussion Forums"
msgstr ""
-#: support\mailing-lists.php:77
+#: about\license.php:5
#, c-format
-msgid "Subscribers to this list get notices of each and every code change commited to Subversion."
+msgid "WinMerge is Open Source software under the GNU General Public License. This means everybody can download the source code and improve and modify it."
msgstr ""
+#: downloads\pad-file.php:90
+#, c-format
+msgid "Company"
+msgstr ""
+
#: support\mailing-lists.php:13
#: support\mailing-lists.php:30
#, c-format
msgid "Support List"
msgstr ""
-#: engine\page.inc:302
+#: engine\page.inc:305
#, c-format
msgid "WinMerge PAD File"
msgstr ""
-#: about\screenshots\index.php:26
+#: engine\engine.inc:21
#, c-format
-msgid "Many times it is useful to see exact differences inside lines. WinMerge can highlight different area between lines."
+msgid "French"
msgstr ""
#: translations\instructions.php:15
@@ -149,6 +159,11 @@
msgid "Source: %s"
msgstr ""
+#: downloads\plugins.php:6
+#, c-format
+msgid "WinMerge, free, download, plugins, plugin, plug-in, setup, installer, binaries, 7-Zip, xdocdiff, Word, Excel, PowerPoint, PDF"
+msgstr ""
+
#: translations\index.php:37
#, c-format
msgid "The following two pages inform you about the translations status of the stable and developer version of WinMerge:"
@@ -192,7 +207,7 @@
#: about\history.php:7
#: about\history.php:9
-#: engine\page.inc:287
+#: engine\page.inc:290
#, c-format
msgid "History"
msgstr ""
@@ -207,9 +222,9 @@
msgid "<a href=\"%s\">Documentation</a>?"
msgstr ""
-#: support\mailing-lists.php:57
+#: downloads\pad-file.php:78
#, c-format
-msgid "This list is used for coordinating the translations."
+msgid "Icon"
msgstr ""
#: support\mailing-lists.php:32
@@ -221,6 +236,7 @@
#: downloads\index.php:28
#: downloads\index.php:34
+#: downloads\plugins.php:22
#: downloads\source-code.php:18
#, c-format
msgid "7z-Format (%s MB)"
@@ -236,9 +252,9 @@
msgid "Installation"
msgstr ""
-#: support\index.php:19
+#: downloads\source-code.php:15
#, c-format
-msgid "Wish list items on the <a href=\"%s\">feature request list</a> will also be considered, but we make absolutely no promises."
+msgid "WinMerge %s - Source Code"
msgstr ""
#: about\index.php:58
@@ -246,7 +262,7 @@
msgid "<a href=\"%s\">Online manual</a> and installed HTML Help manual"
msgstr ""
-#: engine\page.inc:309
+#: engine\page.inc:312
#, c-format
msgid "WinMerge Tracker Shortcuts"
msgstr ""
@@ -256,6 +272,11 @@
msgid "<em>Tracker Shortcuts</em> are shorter and nicer URLs to <a href=\"%1$s\">Tracker</a> items from our <a href=\"%2$s\">SF.net project page</a>."
msgstr ""
+#: downloads\pad-file.php:10
+#, c-format
+msgid "The easiest way to get informations about the latest stable version from WinMerge for your web site is the <a href=\"%s\">Portable Application Description</a> file, which you find here:"
+msgstr ""
+
#: support\tracker-shortcuts.php:14
#, c-format
msgid "Patch"
@@ -271,8 +292,8 @@
msgid "Folder compare shows all files and subfolders found from compared folders as list. Folder compare allows synchronising folders by copying and deleting files and subfolders. Folder compare view can be versatile customised."
msgstr ""
-#: engine\page.inc:262
-#: engine\page.inc:305
+#: engine\page.inc:265
+#: engine\page.inc:308
#, c-format
msgid "WinMerge Support"
msgstr ""
@@ -282,9 +303,11 @@
msgid "We require registering because anonymous submissions caused a lot of spam and also because there were no possibility to contact people for asking more information."
msgstr ""
-#: docs\index.php:5
+#: engine\page.inc:310
+#: support\mailing-lists.php:7
+#: support\mailing-lists.php:9
#, c-format
-msgid "Documentation from WinMerge like manual, release notes, change log and development wiki."
+msgid "Mailing Lists"
msgstr ""
#: about\index.php:41
@@ -303,17 +326,18 @@
msgid "WinMerge is an <a href=\"%s\">Open Source</a> differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle."
msgstr ""
-#: support\tracker-shortcuts.php:5
+#: support\index.php:18
#, c-format
-msgid "Tracker Shortcuts are shorter and nicer URLs to Tracker items from our SF.net project page. And you can use this page to create a shortcut."
+msgid "We rarely sent direct emails but you will get notifications when we ask questions in the bug item."
msgstr ""
#: downloads\index.php:25
+#: downloads\plugins.php:20
#, c-format
msgid "Binaries"
msgstr ""
-#: engine\page.inc:294
+#: engine\page.inc:297
#, c-format
msgid "WinMerge Known Issues"
msgstr ""
@@ -328,8 +352,13 @@
msgid "You can also download additional <a href=\"%1$s\">plugins</a> and the whole <a href=\"%2$s\">source code</a> from WinMerge."
msgstr ""
+#: support\mailing-lists.php:57
+#, c-format
+msgid "This list is used for coordinating the translations."
+msgstr ""
+
#: about\license.php:30
-#: engine\page.inc:281
+#: engine\page.inc:284
#, c-format
msgid "Links"
msgstr ""
@@ -361,11 +390,9 @@
msgid "Feature Request"
msgstr ""
-#: engine\page.inc:307
-#: support\mailing-lists.php:7
-#: support\mailing-lists.php:9
+#: support\index.php:11
#, c-format
-msgid "Mailing Lists"
+msgid "The <a href=\"%s\">Open Discussion forum</a> is the fastest way to get help. Please be patient, it may take some time for somebody to answer."
msgstr ""
#: about\index.php:31
@@ -388,8 +415,13 @@
msgid "WinMerge, screenshots, file comparison, open-dialog, folder comparison results, highlight line diff, location pane, splash screen"
msgstr ""
-#: engine\page.inc:315
+#: downloads\pad-file.php:72
#, c-format
+msgid "Web Addresses"
+msgstr ""
+
+#: engine\page.inc:318
+#, c-format
msgid "WinMerge Translations Status (Stable Branch)"
msgstr ""
@@ -403,9 +435,9 @@
msgid "Difference pane shows current difference in two vertical panes"
msgstr ""
-#: downloads\index.php:58
+#: engine\page.inc:317
#, c-format
-msgid "Microsoft Windows 98/2000/XP/2003/Vista/2008"
+msgid "Instructions"
msgstr ""
#: index.php:27
@@ -424,23 +456,28 @@
msgid "English"
msgstr ""
-#: support\tracker-shortcuts.php:11
+#: support\index.php:19
#, c-format
-msgid "You can use this page to create a shortcut:"
+msgid "Wish list items on the <a href=\"%s\">feature request list</a> will also be considered, but we make absolutely no promises."
msgstr ""
-#: engine\page.inc:280
-#: engine\page.inc:285
-#: engine\page.inc:291
-#: engine\page.inc:305
-#: engine\page.inc:313
+#: engine\engine.inc:23
#, c-format
+msgid "Swedish"
+msgstr ""
+
+#: engine\page.inc:283
+#: engine\page.inc:288
+#: engine\page.inc:294
+#: engine\page.inc:308
+#: engine\page.inc:316
+#, c-format
msgid "Index"
msgstr ""
-#: engine\page.inc:300
+#: downloads\plugins.php:10
#, c-format
-msgid "Download WinMerge Plugins"
+msgid "7-Zip Plugin"
msgstr ""
#: index.php:20
@@ -472,12 +509,12 @@
msgid "Announce List"
msgstr ""
-#: engine\page.inc:316
+#: engine\page.inc:319
#, c-format
msgid "Status (Unstable Trunk)"
msgstr ""
-#: engine\page.inc:261
+#: engine\page.inc:264
#, c-format
msgid "WinMerge Downloads"
msgstr ""
@@ -487,18 +524,16 @@
msgid "Japanese WinMerge Version"
msgstr ""
-#: engine\page.inc:308
+#: engine\page.inc:311
#, c-format
msgid "Tracker"
msgstr ""
-#: about\history.php:20
-#: docs\changelog.php:7
-#: docs\changelog.php:8
-#: docs\index.php:14
-#: engine\page.inc:295
+#: about\index.php:67
+#: about\screenshots\index.php:18
+#: about\screenshots\index.php:19
#, c-format
-msgid "Change Log"
+msgid "Folder Comparison Results"
msgstr ""
#: downloads\index.php:69
@@ -527,8 +562,13 @@
msgid "WinMerge, free, download, Windows, setup, installer, binaries, runtimes, stable, beta, experimental, portable"
msgstr ""
-#: engine\page.inc:296
+#: downloads\pad-file.php:48
#, c-format
+msgid "Type"
+msgstr ""
+
+#: engine\page.inc:299
+#, c-format
msgid "WinMerge Development Wiki"
msgstr ""
@@ -537,6 +577,11 @@
msgid "The current WinMerge version is <strong>%1$s</strong> and was released at <strong>%2$s</strong>."
msgstr ""
+#: about\index.php:21
+#, c-format
+msgid "Supports Microsoft Windows 98/ME/2000/XP/2003/Vista/2008"
+msgstr ""
+
#: 404.php:22
#, c-format
msgid "<a href=\"%s\">Release Notes</a>?"
@@ -562,17 +607,12 @@
msgid "Resolve conflict files"
msgstr ""
-#: engine\page.inc:261
+#: engine\page.inc:264
#, c-format
msgid "Downloads"
msgstr ""
-#: translations\index.php:29
-#, c-format
-msgid "To change languages, select the desired language from the <span class=\"guimenu\">View</span>→ <span class=\"guimenuitem\">Languages</span> menu choice."
-msgstr ""
-
-#: engine\page.inc:263
+#: engine\page.inc:266
#: translations\index.php:8
#: translations\index.php:10
#, c-format
@@ -584,27 +624,37 @@
msgid "Since WinMerge is an <a href=\"%s\">Open Source</a> project, you may use it free of charge."
msgstr ""
-#: engine\page.inc:282
+#: engine\page.inc:285
#, c-format
msgid "Project Page"
msgstr ""
#: about\index.php:7
#: about\index.php:10
-#: engine\page.inc:259
-#: engine\page.inc:285
+#: engine\page.inc:262
+#: engine\page.inc:288
#, c-format
msgid "About WinMerge"
msgstr ""
-#: engine\page.inc:263
-#: engine\page.inc:313
+#: engine\page.inc:266
+#: engine\page.inc:316
#, c-format
msgid "WinMerge Translations"
msgstr ""
-#: engine\page.inc:308
+#: downloads\pad-file.php:6
#, c-format
+msgid "WinMerge, PAD file, Portable Application Description"
+msgstr ""
+
+#: downloads\pad-file.php:40
+#, c-format
+msgid "Release Status"
+msgstr ""
+
+#: engine\page.inc:311
+#, c-format
msgid "WinMerge Tracker"
msgstr ""
@@ -618,18 +668,23 @@
msgid "Download the current WinMerge version %1$s, which was released at %2$s. For detailed info on what is new, read the change log and the release notes."
msgstr ""
-#: engine\page.inc:294
+#: engine\page.inc:297
#, c-format
msgid "Known Issues"
msgstr ""
+#: translations\index.php:29
+#, c-format
+msgid "To change language, select the desired language from the <span class=\"guimenu\">View</span>→ <span class=\"guimenuitem\">Language</span> menu choice."
+msgstr ""
+
#: translations\translations.inc:136
#: translations\translations_branch.inc:71
#, c-format
msgid "Last Update"
msgstr ""
-#: engine\page.inc:301
+#: engine\page.inc:304
#, c-format
msgid "Source Code"
msgstr ""
@@ -647,6 +702,11 @@
msgid "Zip-Format (%s MB)"
msgstr ""
+#: support\tracker-shortcuts.php:5
+#, c-format
+msgid "Tracker Shortcuts are shorter and nicer URLs to Tracker items from our SF.net project page. And you can use this page to create a shortcut."
+msgstr ""
+
#: support\tracker-shortcuts.php:18
#, c-format
msgid "Tracker Item"
@@ -664,23 +724,18 @@
#: docs\index.php:7
#: docs\index.php:9
-#: engine\page.inc:260
+#: engine\page.inc:263
#, c-format
msgid "Documentation"
msgstr ""
#: about\history.php:19
#: docs\index.php:10
-#: engine\page.inc:292
+#: engine\page.inc:295
#, c-format
msgid "Manual"
msgstr ""
-#: docs\index.php:17
-#, c-format
-msgid "The <a href=\"%s\">Development Wiki</a> contains many informations about the WinMerge development."
-msgstr ""
-
#: index.php:8
#: index.php:30
#, c-format
@@ -697,9 +752,9 @@
msgid "WinMerge, license, open source, GNU General Public License, GPL, free software"
msgstr ""
-#: engine\page.inc:282
+#: downloads\pad-file.php:94
#, c-format
-msgid "WinMerge Project Page"
+msgid "Contact"
msgstr ""
#: downloads\index.php:40
@@ -708,7 +763,7 @@
msgid "SHA-1 Checksums"
msgstr ""
-#: engine\page.inc:228
+#: engine\page.inc:231
#, c-format
msgid "Version %1$s; %2$s MB"
msgstr ""
@@ -718,14 +773,9 @@
msgid "The release notes are currently not available..."
msgstr ""
-#: translations\translations.inc:81
-#: translations\translations.inc:95
-#: translations\translations.inc:133
-#: translations\translations_branch.inc:49
-#: translations\translations_branch.inc:68
-#: translations\translations_branch.inc:118
+#: support\tracker-shortcuts.php:23
#, c-format
-msgid "Translated"
+msgid "Type:"
msgstr ""
#: support\tracker-shortcuts.php:6
@@ -738,6 +788,11 @@
msgid "The Open Discussion forum is the fastest way to get help. A other way is a subscription to the support mailing list."
msgstr ""
+#: downloads\plugins.php:32
+#, c-format
+msgid "For more details and the download go to the <a href=\"%s\">xdocdiff plugin homepage</a>."
+msgstr ""
+
#: translations\index.php:39
#, c-format
msgid "Stable Version (Branch)"
@@ -748,7 +803,7 @@
msgid "English (Template)"
msgstr ""
-#: engine\page.inc:281
+#: engine\page.inc:284
#, c-format
msgid "WinMerge Links"
msgstr ""
@@ -758,29 +813,29 @@
msgid "Location pane is a handy side-pane showing a overall (difference) map of files compared."
msgstr ""
-#: about\license.php:10
+#: docs\index.php:5
#, c-format
-msgid "This means everybody can download the <a href=\"%s\">source code</a> and improve and modify them.\nThe only thing we ask is that people submit their improvements and modifications back to us so that all WinMerge users may benefit."
+msgid "Documentation from WinMerge like manual, release notes, change log and Development Wiki."
msgstr ""
-#: engine\page.inc:302
+#: docs\index.php:15
#, c-format
-msgid "PAD File"
+msgid "The <a href=\"%s\">change log</a> is a more complete list of changes in the last WinMerge releases."
msgstr ""
-#: docs\index.php:15
+#: engine\page.inc:303
#, c-format
-msgid "The <a href=\"%s\">change log</a> is a more complete list of changes in the last WinMerge releases."
+msgid "Download WinMerge Plugins"
msgstr ""
-#: engine\page.inc:316
+#: engine\page.inc:319
#, c-format
msgid "WinMerge Translations Status (Unstable Trunk)"
msgstr ""
-#: support\tracker-shortcuts.php:23
+#: docs\index.php:17
#, c-format
-msgid "Type:"
+msgid "The <a href=\"%s\">Development Wiki</a> contains much information about the WinMerge development."
msgstr ""
#: downloads\index.php:16
@@ -788,6 +843,11 @@
msgid "For detailed info on what is new, read the <a href=\"%1$s\">change log</a> and the <a href=\"%2$s\">release notes</a>."
msgstr ""
+#: support\mailing-lists.php:77
+#, c-format
+msgid "Subscribers to this list get notices of each and every code change commited to Subversion."
+msgstr ""
+
#: support\mailing-lists.php:14
#: support\mailing-lists.php:40
#, c-format
@@ -799,43 +859,51 @@
msgid "If you are interested in contributing work to the project, see our <a href=\"%s\">developer page</a> for further information on how you may contribute."
msgstr ""
-#: translations\translations.inc:182
+#: downloads\plugins.php:7
+#: downloads\plugins.php:9
#, c-format
-msgid "Total: Unknown"
+msgid "Download Plugins"
msgstr ""
+#: downloads\pad-file.php:58
+#: downloads\pad-file.php:60
+#: downloads\pad-file.php:62
+#, c-format
+msgid "English Description (%d chars)"
+msgstr ""
+
#: about\index.php:29
#, c-format
msgid "Visual differencing and merging of text files"
msgstr ""
+#: engine\page.inc:285
+#, c-format
+msgid "WinMerge Project Page"
+msgstr ""
+
#: downloads\index.php:60
#, c-format
msgid "Admin rights for the installer"
msgstr ""
-#: support\mailing-lists.php:15
-#: support\mailing-lists.php:50
+#: downloads\plugins.php:28
#, c-format
-msgid "Translate List"
+msgid "You can also read the <a href=\"%1$s\">Release Notes</a> or search for <a href=\"%2$s\">other versions</a>."
msgstr ""
-#: support\mailing-lists.php:25
-#: support\mailing-lists.php:35
-#: support\mailing-lists.php:45
-#: support\mailing-lists.php:55
-#: support\mailing-lists.php:65
-#: support\mailing-lists.php:75
+#: engine\page.inc:289
#, c-format
-msgid "Archive"
+msgid "WinMerge Screenshots"
msgstr ""
-#: support\index.php:18
+#: downloads\pad-file.php:42
#, c-format
-msgid "We rarely sent direct emails but you will get notifications when we ask questions in the bug item."
+msgid "Download"
msgstr ""
#: downloads\index.php:20
+#: downloads\plugins.php:15
#, c-format
msgid "Installer"
msgstr ""
@@ -848,12 +916,12 @@
#: about\index.php:64
#: about\screenshots\index.php:7
#: about\screenshots\index.php:9
-#: engine\page.inc:286
+#: engine\page.inc:289
#, c-format
msgid "Screenshots"
msgstr ""
-#: engine\page.inc:287
+#: engine\page.inc:290
#, c-format
msgid "WinMerge History"
msgstr ""
@@ -863,6 +931,16 @@
msgid "Here is the current <a href=\"%s\">change log</a>."
msgstr ""
+#: support\tracker-shortcuts.php:11
+#, c-format
+msgid "You can use this page to create a shortcut:"
+msgstr ""
+
+#: downloads\pad-file.php:5
+#, c-format
+msgid "The easiest way to get informations about the latest stable version from WinMerge for your web site is the Portable Application Description file, which you find here."
+msgstr ""
+
#: translations\translations.inc:41
#, c-format
msgid "File not found."
@@ -890,7 +968,8 @@
msgstr ""
#: index.php:42
-#: engine\page.inc:262
+#: downloads\pad-file.php:96
+#: engine\page.inc:265
#: support\index.php:8
#: support\index.php:10
#, c-format
@@ -912,6 +991,16 @@
msgid "Download the source code of WinMerge, which is released under the GNU General Public License."
msgstr ""
+#: translations\translations.inc:81
+#: translations\translations.inc:95
+#: translations\translations.inc:133
+#: translations\translations_branch.inc:49
+#: translations\translations_branch.inc:68
+#: translations\translations_branch.inc:118
+#, c-format
+msgid "Translated"
+msgstr ""
+
#: index.php:46
#, c-format
msgid "WinMerge is an open source project, which means that the program is maintained and developed by volunteers."
@@ -942,14 +1031,12 @@
msgid "Or you may simply unzip the <a href=\"%s\">binary zip package</a> into the desired location, and run <code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>)."
msgstr ""
-#: engine\page.inc:309
-#: support\tracker-shortcuts.php:7
-#: support\tracker-shortcuts.php:9
+#: downloads\pad-file.php:56
#, c-format
-msgid "Tracker Shortcuts"
+msgid "English Descriptions"
msgstr ""
-#: engine\page.inc:310
+#: engine\page.inc:313
#: support\index.php:37
#, c-format
msgid "Donate"
@@ -977,9 +1064,9 @@
msgid "The Open Source Definition"
msgstr ""
-#: engine\page.inc:258
+#: downloads\pad-file.php:46
#, c-format
-msgid "Home"
+msgid "Supported Languages"
msgstr ""
#: index.php:6
@@ -992,16 +1079,32 @@
msgid "Beta Versions"
msgstr ""
+#: downloads\pad-file.php:76
+#, c-format
+msgid "Screenshot"
+msgstr ""
+
#: about\index.php:6
#, c-format
msgid "WinMerge, about, features, file compare, folder compare, version control, screenshots, installation"
msgstr ""
-#: engine\page.inc:286
+#: support\mailing-lists.php:15
+#: support\mailing-lists.php:50
#, c-format
-msgid "WinMerge Screenshots"
+msgid "Translate List"
msgstr ""
+#: downloads\index.php:58
+#, c-format
+msgid "Microsoft Windows 98/ME/2000/XP/2003/Vista/2008"
+msgstr ""
+
+#: downloads\plugins.php:5
+#, c-format
+msgid "Download additional plugins for WinMerge, like the 7-Zip plugin or the xdocdiff Plugin."
+msgstr ""
+
#: translations\index.php:7
#: translations\status_trunk.php:7
#: translations\status_trunk.php:9
@@ -1030,7 +1133,7 @@
msgid "If you need support, look at our <a href=\"%s\">support page</a> for more information how you can get it."
msgstr ""
-#: engine\page.inc:315
+#: engine\page.inc:318
#, c-format
msgid "Status (Stable Branch)"
msgstr ""
@@ -1050,6 +1153,11 @@
msgid "Bug"
msgstr ""
+#: downloads\plugins.php:31
+#, c-format
+msgid "With this plugin you can compare Word, Excel, PowerPoint, PDF and some more files."
+msgstr ""
+
#: downloads\source-code.php:6
#, c-format
msgid "WinMerge, free, download, source code, GPL, Subversion, SVN, TortoiseSVN"
@@ -1070,6 +1178,11 @@
msgid "WinMerge, release notes, summary, changes, enhancements, bug fixes, known issues, release"
msgstr ""
+#: downloads\pad-file.php:14
+#, c-format
+msgid "If you can not work with the <a href=\"%s\">PAD file</a>, you can use the following informations:"
+msgstr ""
+
#: about\index.php:57
#, c-format
msgid "Localizable interface"
@@ -1090,9 +1203,11 @@
msgid "Archive file support using 7-Zip"
msgstr ""
-#: support\index.php:11
+#: translations\index.php:6
+#: translations\status_branch.php:7
+#: translations\status_branch.php:10
#, c-format
-msgid "The <a href=\"%s\">Open Discussion forum</a> is the fastest way to get help. Please be patient, it may take some time for somebody to answer."
+msgid "Translations Status (Stable Branch)"
msgstr ""
#: support\index.php:21
@@ -1100,11 +1215,24 @@
msgid "Tracker Statistics"
msgstr ""
-#: engine\page.inc:301
+#: downloads\pad-file.php:64
#, c-format
+msgid "English Keywords"
+msgstr ""
+
+#: engine\page.inc:304
+#, c-format
msgid "Download WinMerge Source Code"
msgstr ""
+#: downloads\pad-file.php:7
+#: downloads\pad-file.php:9
+#: downloads\pad-file.php:80
+#: engine\page.inc:305
+#, c-format
+msgid "PAD File"
+msgstr ""
+
#: downloads\index.php:13
#: downloads\source-code.php:39
#, c-format
@@ -1127,19 +1255,24 @@
msgid "Fuzzy"
msgstr ""
-#: downloads\source-code.php:15
+#: docs\index.php:6
#, c-format
-msgid "WinMerge %s - Source Code"
+msgid "WinMerge, documentation, manual, release notes, known issues, change log, Development Wiki"
msgstr ""
+#: about\license.php:10
+#, c-format
+msgid "This means everybody can download the <a href=\"%s\">source code</a> and improve and modify it.\nThe only thing we ask is that people submit their improvements and modifications back to us so that all WinMerge users may benefit."
+msgstr ""
+
#: about\history.php:5
#, c-format
msgid "History of WinMerge releases with version numbers, release dates and manuals."
msgstr ""
-#: engine\page.inc:292
+#: downloads\plugins.php:11
#, c-format
-msgid "WinMerge Manual"
+msgid "This is the 7-Zip plugin for WinMerge and the current version <strong>%1$s</strong> was released at <strong>%2$s</strong>."
msgstr ""
#: 404.php:23
@@ -1162,6 +1295,16 @@
msgid "Features"
msgstr ""
+#: support\mailing-lists.php:25
+#: support\mailing-lists.php:35
+#: support\mailing-lists.php:45
+#: support\mailing-lists.php:55
+#: support\mailing-lists.php:65
+#: support\mailing-lists.php:75
+#, c-format
+msgid "Archive"
+msgstr ""
+
#: engine\engine.inc:20
#, c-format
msgid "German"
@@ -1172,8 +1315,8 @@
msgid "Please attach as much information as you can: at a minimum, the version number of WinMerge that you are using. If you can, also attach a configuration log which, you can display by clicking <span class=\"guimenu\">Help</span> → <span class=\"guimenuitem\">Configuration</span> in the WinMerge window."
msgstr ""
-#: engine\page.inc:258
-#: engine\page.inc:280
+#: engine\page.inc:261
+#: engine\page.inc:283
#, c-format
msgid "WinMerge Home"
msgstr ""
@@ -1188,11 +1331,16 @@
msgid "The <a href=\"%s\">manual</a> explains how to use WinMerge, and documents its capabilities and limitations."
msgstr ""
-#: engine\page.inc:299
+#: engine\page.inc:302
#, c-format
msgid "WinMerge"
msgstr ""
+#: downloads\plugins.php:30
+#, c-format
+msgid "xdocdiff Plugin"
+msgstr ""
+
#: support\tracker-shortcuts.php:17
#, c-format
msgid "Todo Item"
@@ -1203,12 +1351,13 @@
msgid "This is the list where participating developers of the WinMerge meet and discuss issues, code changes/additions, etc."
msgstr ""
-#: about\license.php:5
+#: downloads\index.php:22
+#: downloads\plugins.php:17
#, c-format
-msgid "WinMerge is Open Source software under the GNU General Public License. This means everybody can download the source code and improve and modify them."
+msgid "Exe-Format (%s MB)"
msgstr ""
-#: engine\page.inc:300
+#: engine\page.inc:303
#, c-format
msgid "Plugins"
msgstr ""
@@ -1218,13 +1367,20 @@
msgid "WinMerge, mailing lists, announce, support, user, translate, development, SVN"
msgstr ""
-#: about\index.php:67
-#: about\screenshots\index.php:18
-#: about\screenshots\index.php:19
+#: about\history.php:20
+#: docs\changelog.php:7
+#: docs\changelog.php:8
+#: docs\index.php:14
+#: engine\page.inc:298
#, c-format
-msgid "Folder Comparison Results"
+msgid "Change Log"
msgstr ""
+#: support\tracker-shortcuts.php:37
+#, c-format
+msgid "Generate"
+msgstr ""
+
#: about\index.php:23
#, c-format
msgid "Unicode support"
@@ -1235,13 +1391,13 @@
msgid "But please consider making a <a href=\"%s\">donation</a> to support the continued development of WinMerge."
msgstr ""
-#: about\index.php:21
+#: downloads\pad-file.php:74
#, c-format
-msgid "Supports Microsoft Windows 98/2000/XP/2003/Vista/2008"
+msgid "Information"
msgstr ""
-#: engine\page.inc:260
-#: engine\page.inc:291
+#: engine\page.inc:263
+#: engine\page.inc:294
#, c-format
msgid "WinMerge Documentation"
msgstr ""
@@ -1295,6 +1451,11 @@
msgid "File Comparison"
msgstr ""
+#: engine\page.inc:261
+#, c-format
+msgid "Home"
+msgstr ""
+
#: support\mailing-lists.php:37
#, c-format
msgid "You should ask all your support questions on this list."
@@ -1310,9 +1471,9 @@
msgid "<a href=\"%s\">Support</a>?"
msgstr ""
-#: docs\index.php:6
+#: engine\engine.inc:22
#, c-format
-msgid "WinMerge, documentation, manual, release notes, known issues, change log, development wiki"
+msgid "Dutch"
msgstr ""
#: support\index.php:7
@@ -1347,11 +1508,16 @@
msgstr ""
#: docs\index.php:16
-#: engine\page.inc:296
+#: engine\page.inc:299
#, c-format
msgid "Development Wiki"
msgstr ""
+#: translations\translations.inc:182
+#, c-format
+msgid "Total: Unknown"
+msgstr ""
+
#: about\index.php:69
#, c-format
msgid "See the <a href=\"%s\">screenshots page</a> for more screenshots."
@@ -1369,7 +1535,7 @@
msgid "Translations instructions"
msgstr ""
-#: engine\page.inc:307
+#: engine\page.inc:310
#, c-format
msgid "WinMerge Mailing Lists"
msgstr ""
@@ -1379,7 +1545,7 @@
msgid "Experimental Builds"
msgstr ""
-#: engine\page.inc:310
+#: engine\page.inc:313
#, c-format
msgid "Donate money to WinMerge"
msgstr ""
@@ -1389,14 +1555,19 @@
msgid "Stable Versions"
msgstr ""
-#: engine\page.inc:259
+#: engine\page.inc:262
#, c-format
msgid "About"
msgstr ""
+#: downloads\pad-file.php:92
+#, c-format
+msgid "Name"
+msgstr ""
+
#: about\license.php:7
#: about\license.php:9
-#: engine\page.inc:288
+#: engine\page.inc:291
#, c-format
msgid "License"
msgstr ""
@@ -1406,19 +1577,14 @@
msgid "Other Versions"
msgstr ""
-#: engine\page.inc:314
+#: engine\page.inc:309
#, c-format
-msgid "Instructions"
-msgstr ""
-
-#: engine\page.inc:306
-#, c-format
msgid "Discussion Forums"
msgstr ""
-#: support\tracker-shortcuts.php:37
+#: downloads\pad-file.php:38
#, c-format
-msgid "Generate"
+msgid "Release Date"
msgstr ""
#: support\index.php:13
@@ -1436,7 +1602,7 @@
msgid "WinMerge, free, open source, Windows, windiff, diff, merge, compare, tool, utility, text, file, folder, directory, compare files, compare folders, merge files, merge folders, diff tool, merge tool, compare tool"
msgstr ""
-#: engine\page.inc:227
+#: engine\page.inc:230
#, c-format
msgid "Download Now!"
msgstr ""
@@ -1454,17 +1620,17 @@
#: docs\index.php:12
#: docs\releasenotes.php:7
#: docs\releasenotes.php:10
-#: engine\page.inc:293
+#: engine\page.inc:296
#, c-format
msgid "Release Notes"
msgstr ""
-#: engine\page.inc:314
+#: engine\page.inc:317
#, c-format
msgid "WinMerge Translations Instructions"
msgstr ""
-#: engine\page.inc:293
+#: engine\page.inc:296
#, c-format
msgid "WinMerge Release Notes"
msgstr ""
@@ -1538,7 +1704,7 @@
msgid "WinMerge is <a href=\"%1$s\">Open Source</a> software under the <a href=\"%2$s\">GNU General Public License</a>."
msgstr ""
-#: engine\page.inc:288
+#: engine\page.inc:291
#, c-format
msgid "WinMerge License"
msgstr ""
@@ -1550,16 +1716,21 @@
#: downloads\index.php:10
#: downloads\index.php:12
-#: engine\page.inc:299
+#: engine\page.inc:302
#, c-format
msgid "Download WinMerge"
msgstr ""
-#: engine\page.inc:366
+#: engine\page.inc:369
#, c-format
msgid "Bookmark this on Delicious"
msgstr ""
+#: downloads\pad-file.php:44
+#, c-format
+msgid "Operating Systems"
+msgstr ""
+
#: about\screenshots\index.php:14
#, c-format
msgid "File compare window is basically two files opened to editor into two horizontal panes. Editing allows user to easily do small changes without need to open files to other editor or development environment."
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2009-08-29 15:40:30
|
Revision: 6978
http://winmerge.svn.sourceforge.net/winmerge/?rev=6978&view=rev
Author: gerundt
Date: 2009-08-29 15:40:17 +0000 (Sat, 29 Aug 2009)
Log Message:
-----------
Web: Make PAD file and plugins pages translatable
Modified Paths:
--------------
trunk/Web/downloads/pad-file.php
trunk/Web/downloads/plugins.php
Modified: trunk/Web/downloads/pad-file.php
===================================================================
--- trunk/Web/downloads/pad-file.php 2009-08-29 15:08:25 UTC (rev 6977)
+++ trunk/Web/downloads/pad-file.php 2009-08-29 15:40:17 UTC (rev 6978)
@@ -2,15 +2,17 @@
include('../engine/engine.inc');
$page = new Page;
- $page->setDescription('The easiest way to get informations about the latest stable version from WinMerge for your web site is the Portable Application Description file, which you find here.');
- $page->setKeywords('WinMerge, PAD file, Portable Application Description');
- $page->printHead('PAD File', TAB_DOWNLOADS);
+ $page->setDescription(__('The easiest way to get informations about the latest stable version from WinMerge for your web site is the Portable Application Description file, which you find here.'));
+ $page->setKeywords(__('WinMerge, PAD file, Portable Application Description'));
+ $page->printHead(__('PAD File'), TAB_DOWNLOADS);
+
+ $page->printHeading(__('PAD File'));
+ $page->printPara(__('The easiest way to get informations about the latest stable version from WinMerge for your web site is the <a href="%s">Portable Application Description</a> file, which you find here:', 'http://www.asp-shareware.org/pad/'));
?>
-<h2>PAD File</h2>
-<p>The easiest way to get informations about the latest stable version from WinMerge for your web site is the <a href="http://www.asp-shareware.org/pad/">Portable Application Description</a> file, which you find here:</p>
<pre class="code"><a href="http://winmerge.org/WinMergePAD.xml">http://winmerge.org/WinMergePAD.xml</a></pre>
-<p>If you can't work with the <a href="/WinMergePAD.xml">PAD file</a>, you can use the following informations:</p>
<?php
+ $page->printPara(__('If you can not work with the <a href="%s">PAD file</a>, you can use the following informations:', '/WinMergePAD.xml'));
+
$padfile = @simplexml_load_file('../WinMergePAD.xml');
if ($padfile) { //if PAD file was valid...
$company_info = $padfile->Company_Info;
@@ -33,17 +35,17 @@
print("<div class=\"padfile\">\n");
print("<h2>" . $program_name . " " . $program_version . "</h2>\n");
print("<dl>\n");
- print(" <dt>Release Date</dt>\n");
+ print(" <dt>" . __('Release Date') . "</dt>\n");
print(" <dd>" . $release_date_month . "/" . $release_date_day . "/" . $release_date_year . "</dd>\n");
- print(" <dt>Release Status</dt>\n");
+ print(" <dt>" . __('Release Status') . "</dt>\n");
print(" <dd>" . $release_status . "</dd>\n");
- print(" <dt>Download</dt>\n");
+ print(" <dt>" . __('Download') . "</dt>\n");
print(" <dd><a href=\"" . $download . "\">" . $download . "</a> (" . $file_size_mb . " MB)</dd>\n");
- print(" <dt>Operating Systems</dt>\n");
+ print(" <dt>" . __('Operating Systems') . "</dt>\n");
print(" <dd>" . str_replace(',', ', ', $program_os_support) . "</dd>\n");
- print(" <dt>Supported Languages</dt>\n");
+ print(" <dt>" . __('Supported Languages') . "</dt>\n");
print(" <dd>" . str_replace(',', ', ', $program_language) . "</dd>\n");
- print(" <dt>Type</dt>\n");
+ print(" <dt>" . __('Type') . "</dt>\n");
print(" <dd>" . $program_type . "</dd>\n");
print("</dl>\n");
@@ -51,15 +53,15 @@
$description_250 = (string)$program_descriptions->Char_Desc_250;
$description_450 = (string)$program_descriptions->Char_Desc_450;
$keywords = (string)$program_descriptions->Keywords;
- print("<h3>Descriptions</h3>\n");
+ print("<h3>" . __('English Descriptions') . "</h3>\n");
print("<dl>\n");
- print(" <dt>Description (80 chars)</dt>\n");
+ print(" <dt>" . __('English Description (%d chars)', 80) . "</dt>\n");
print(" <dd>" . $description_80 . "</dd>\n");
- print(" <dt>Description (250 chars)</dt>\n");
+ print(" <dt>" . __('English Description (%d chars)', 250) . "</dt>\n");
print(" <dd>" . $description_250 . "</dd>\n");
- print(" <dt>Description (450 chars)</dt>\n");
+ print(" <dt>" . __('English Description (%d chars)', 450) . "</dt>\n");
print(" <dd>" . $description_450 . "</dd>\n");
- print(" <dt>Keywords</dt>\n");
+ print(" <dt>" . __('English Keywords') . "</dt>\n");
print(" <dd>" . str_replace(',', ', ', $keywords) . "</dd>\n");
print("</dl>\n");
@@ -67,15 +69,15 @@
$screenshot_url = (string)$web_info->Application_URLs->Application_Screenshot_URL;
$icon_url = (string)$web_info->Application_URLs->Application_Icon_URL;
$pad_url = (string)$web_info->Application_URLs->Application_XML_File_URL;
- print("<h3>Web Addresses</h3>\n");
+ print("<h3>" . __('Web Addresses') . "</h3>\n");
print("<dl>\n");
- print(" <dt>Information</dt>\n");
+ print(" <dt>" . __('Information') . "</dt>\n");
print(" <dd><a href=\"" . $info_url . "\">" . $info_url . "</a></dd>\n");
- print(" <dt>Screenshot</dt>\n");
+ print(" <dt>" . __('Screenshot') . "</dt>\n");
print(" <dd><a href=\"" . $screenshot_url . "\">" . $screenshot_url . "</a></dd>\n");
- print(" <dt>Icon</dt>\n");
+ print(" <dt>" . __('Icon') . "</dt>\n");
print(" <dd><a href=\"" . $icon_url . "\">" . $icon_url . "</a></dd>\n");
- print(" <dt>PAD file</dt>\n");
+ print(" <dt>" . __('PAD File') . "</dt>\n");
print(" <dd><a href=\"" . $pad_url . "\">" . $pad_url . "</a></dd>\n");
print("</dl>\n");
@@ -85,13 +87,13 @@
$contact_last_name = (string)$company_info->Contact_Info->Contact_Last_Name;
$contact_email = (string)$company_info->Contact_Info->Contact_Email;
$support_email = (string)$company_info->Support_Info->Support_Email;
- print("<h3>Company</h3>\n");
+ print("<h3>" . __('Company') . "</h3>\n");
print("<dl>\n");
- print(" <dt>Name</dt>\n");
+ print(" <dt>" . __('Name') . "</dt>\n");
print(" <dd><a href=\"" . $company_website_url . "\">" . $company_name . "</a></dd>\n");
- print(" <dt>Contact</dt>\n");
+ print(" <dt>" . __('Contact') . "</dt>\n");
print(" <dd><a href=\"mailto:" . $contact_email . "\">" . $contact_first_name . " " . $contact_last_name . "</a></dd>\n");
- print(" <dt>Support</dt>\n");
+ print(" <dt>" . __('Support') . "</dt>\n");
print(" <dd><a href=\"mailto:" . $support_email . "\">" . $support_email . "</a></dd>\n");
print("</dl>\n");
print("</div> <!-- .padfile -->\n");
Modified: trunk/Web/downloads/plugins.php
===================================================================
--- trunk/Web/downloads/plugins.php 2009-08-29 15:08:25 UTC (rev 6977)
+++ trunk/Web/downloads/plugins.php 2009-08-29 15:40:17 UTC (rev 6978)
@@ -2,31 +2,34 @@
include('../engine/engine.inc');
$page = new Page;
- $page->setDescription('Download additional plugins for WinMerge, like the 7-Zip plugin or the xdocdiff Plugin.');
- $page->setKeywords('WinMerge, free, download, plugins, plugin, plug-in, setup, installer, binaries, 7-Zip, xdocdiff, Word, Excel, PowerPoint, PDF');
- $page->printHead('Download Plugins', TAB_DOWNLOADS);
+ $page->setDescription(__('Download additional plugins for WinMerge, like the 7-Zip plugin or the xdocdiff Plugin.'));
+ $page->setKeywords(__('WinMerge, free, download, plugins, plugin, plug-in, setup, installer, binaries, 7-Zip, xdocdiff, Word, Excel, PowerPoint, PDF'));
+ $page->printHead(__('Download Plugins'), TAB_DOWNLOADS);
+
+ $page->printHeading(__('Download Plugins'));
+ $page->printSubHeading(__('7-Zip Plugin'));
+ $page->printPara(__('This is the 7-Zip plugin for WinMerge and the current version <strong>%1$s</strong> was released at <strong>%2$s</strong>.', 'DllBuild 0026', '2007-12-23'));
?>
-<h2>Download Plugins</h2>
-<h3>7-Zip Plugin</h3>
-<p>This is the 7-Zip plugin for WinMerge and the current version <strong>DllBuild 0026</strong> was released at <strong>2007-12-23</strong>.</p>
<div class="downloadmatrix">
<ul>
- <li><strong>Installer</strong>
+ <li><strong><?php __e('Installer');?></strong>
<ul>
- <li><a href="http://downloads.sourceforge.net/winmerge/Merge7zInstaller0026-432-457.exe">Exe-Format (1.05 MB)</a></li>
+ <li><a href="http://downloads.sourceforge.net/winmerge/Merge7zInstaller0026-432-457.exe"><?php __e('Exe-Format (%s MB)', '1.05');?></a></li>
</ul>
</li>
- <li><strong>Binaries</strong>
+ <li><strong><?php __e('Binaries');?></strong>
<ul>
- <li><a href="http://downloads.sourceforge.net/winmerge/Merge7z0026-432-457.7z">7z-Format (0.91 MB)</a></li>
+ <li><a href="http://downloads.sourceforge.net/winmerge/Merge7z0026-432-457.7z"><?php __e('7z-Format (%s MB)', '0.91');?></a></li>
</ul>
</li>
</ul>
</div>
-<p>You can also read the <a href="http://sourceforge.net/project/shownotes.php?release_id=563695&group_id=13216">Release Notes</a> or search for <a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=143957">other versions</a>.</p>
-<h3>xdocdiff Plugin</h3>
-<p>With this plugin you can compare Word, Excel, PowerPoint, PDF and some more files.</p>
-<p>For more details and the download go to the <a href="http://freemind.s57.xrea.com/xdocdiffPlugin/en/index.html">xdocdiff plugin homepage</a>.</p>
<?php
+ $page->printPara(__('You can also read the <a href="%1$s">Release Notes</a> or search for <a href="%2$s">other versions</a>.', 'http://sourceforge.net/project/shownotes.php?release_id=563695&group_id=13216', 'http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=143957'));
+
+ $page->printSubHeading(__('xdocdiff Plugin'));
+ $page->printPara(__('With this plugin you can compare Word, Excel, PowerPoint, PDF and some more files.'));
+ $page->printPara(__('For more details and the download go to the <a href="%s">xdocdiff plugin homepage</a>.', 'http://freemind.s57.xrea.com/xdocdiffPlugin/en/index.html'));
+
$page->printFoot();
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2009-08-29 15:08:34
|
Revision: 6977
http://winmerge.svn.sourceforge.net/winmerge/?rev=6977&view=rev
Author: gerundt
Date: 2009-08-29 15:08:25 +0000 (Sat, 29 Aug 2009)
Log Message:
-----------
Web: Fix some idioms reported by Hans Eriksson
Modified Paths:
--------------
trunk/Web/about/index.php
trunk/Web/about/license.php
trunk/Web/about/screenshots/index.php
trunk/Web/docs/index.php
trunk/Web/downloads/index.php
trunk/Web/translations/index.php
Modified: trunk/Web/about/index.php
===================================================================
--- trunk/Web/about/index.php 2009-08-29 14:41:49 UTC (rev 6976)
+++ trunk/Web/about/index.php 2009-08-29 15:08:25 UTC (rev 6977)
@@ -18,7 +18,7 @@
<ul>
<li><strong><?php __e('General');?></strong>
<ul>
- <li><?php __e('Supports Microsoft Windows 98/2000/XP/2003/Vista/2008');?></li>
+ <li><?php __e('Supports Microsoft Windows 98/ME/2000/XP/2003/Vista/2008');?></li>
<li><?php __e('Handles Windows, Unix and Mac text file formats');?></li>
<li><?php __e('Unicode support');?></li>
<li><?php __e('Tabbed interface');?></li>
Modified: trunk/Web/about/license.php
===================================================================
--- trunk/Web/about/license.php 2009-08-29 14:41:49 UTC (rev 6976)
+++ trunk/Web/about/license.php 2009-08-29 15:08:25 UTC (rev 6977)
@@ -2,13 +2,13 @@
include('../engine/engine.inc');
$page = new Page;
- $page->setDescription(__('WinMerge is Open Source software under the GNU General Public License. This means everybody can download the source code and improve and modify them.'));
+ $page->setDescription(__('WinMerge is Open Source software under the GNU General Public License. This means everybody can download the source code and improve and modify it.'));
$page->setKeywords(__('WinMerge, license, open source, GNU General Public License, GPL, free software'));
$page->printHead(__('License'), TAB_ABOUT);
$page->printHeading(__('License'));
$page->printPara(__('WinMerge is <a href="%1$s">Open Source</a> software under the <a href="%2$s">GNU General Public License</a>.', 'http://www.opensource.org/', 'http://www.gnu.org/licenses/gpl-2.0.html'));
- $page->printPara(__('This means everybody can download the <a href="%s">source code</a> and improve and modify them.
+ $page->printPara(__('This means everybody can download the <a href="%s">source code</a> and improve and modify it.
The only thing we ask is that people submit their improvements and modifications back to us so that all WinMerge users may benefit.', '/downloads/source-code.php'));
$page->printSubHeading(__('GNU General Public License'));
Modified: trunk/Web/about/screenshots/index.php
===================================================================
--- trunk/Web/about/screenshots/index.php 2009-08-29 14:41:49 UTC (rev 6976)
+++ trunk/Web/about/screenshots/index.php 2009-08-29 15:08:25 UTC (rev 6977)
@@ -23,7 +23,7 @@
<p><?php __e('In the tree view, folders are expandable and collapsible, containing files and subfolders. This is useful for an easier navigation in deeply nested directory structures. <em>The tree view is available only in recursive compares.');?></em></p>
<h3><?php __e('Highlight Line Diff');?></h3>
<a href="filecmp_inlinediff.png" target="_blank"><img src="filecmp_inlinediff_small.png" alt="<?php __e('Highlight Line Diff');?>" width="294" height="200" border="0"></a>
- <p><?php __e('Many times it is useful to see exact differences inside lines. WinMerge can highlight different area between lines.');?></p>
+ <p><?php __e('Many times it is useful to see exact differences inside lines. WinMerge can highlight different areas between lines.');?></p>
<h3><?php __e('Location Pane');?></h3>
<a href="screenshot.png" target="_blank"><img src="screenshot_small.png" alt="<?php __e('Location Pane');?>" width="300" height="200" border="0"></a>
<p><?php __e('Location pane is a handy side-pane showing a overall (difference) map of files compared.');?></p>
Modified: trunk/Web/docs/index.php
===================================================================
--- trunk/Web/docs/index.php 2009-08-29 14:41:49 UTC (rev 6976)
+++ trunk/Web/docs/index.php 2009-08-29 15:08:25 UTC (rev 6977)
@@ -2,8 +2,8 @@
include('../engine/engine.inc');
$page = new Page;
- $page->setDescription(__('Documentation from WinMerge like manual, release notes, change log and development wiki.'));
- $page->setKeywords(__('WinMerge, documentation, manual, release notes, known issues, change log, development wiki'));
+ $page->setDescription(__('Documentation from WinMerge like manual, release notes, change log and Development Wiki.'));
+ $page->setKeywords(__('WinMerge, documentation, manual, release notes, known issues, change log, Development Wiki'));
$page->printHead(__('Documentation'), TAB_DOCS);
$page->printHeading(__('Documentation'));
@@ -14,7 +14,7 @@
$page->printLinkedSubHeading(__('Change Log'), 'changelog.php');
$page->printPara(__('The <a href="%s">change log</a> is a more complete list of changes in the last WinMerge releases.', 'changelog.php'));
$page->printLinkedSubHeading(__('Development Wiki'), '/Wiki/');
- $page->printPara(__('The <a href="%s">Development Wiki</a> contains many informations about the WinMerge development.', '/Wiki/'));
+ $page->printPara(__('The <a href="%s">Development Wiki</a> contains much information about the WinMerge development.', '/Wiki/'));
$page->printFoot();
?>
\ No newline at end of file
Modified: trunk/Web/downloads/index.php
===================================================================
--- trunk/Web/downloads/index.php 2009-08-29 14:41:49 UTC (rev 6976)
+++ trunk/Web/downloads/index.php 2009-08-29 15:08:25 UTC (rev 6977)
@@ -55,7 +55,7 @@
$page->printSubSubHeading(__('Requirements'));
?>
<ul>
- <li><?php __e('Microsoft Windows 98/2000/XP/2003/Vista/2008');?></li>
+ <li><?php __e('Microsoft Windows 98/ME/2000/XP/2003/Vista/2008');?></li>
<li><?php __e('Microsoft Visual C++ 2003 Runtime Components (included in the installer)');?></li>
<li><?php __e('Admin rights for the installer');?></li>
</ul>
Modified: trunk/Web/translations/index.php
===================================================================
--- trunk/Web/translations/index.php 2009-08-29 14:41:49 UTC (rev 6976)
+++ trunk/Web/translations/index.php 2009-08-29 15:08:25 UTC (rev 6977)
@@ -26,7 +26,7 @@
?>
</ul>
<?php
- $page->printPara(__('To change languages, select the desired language from the <span class="guimenu">View</span>→ <span class="guimenuitem">Languages</span> menu choice.'));
+ $page->printPara(__('To change language, select the desired language from the <span class="guimenu">View</span>→ <span class="guimenuitem">Language</span> menu choice.'));
$page->printSubHeading(__('Translating'));
$page->printPara(__('If you would like to update any of these translations or add another translation, then please follow <a href="%s">these instructions</a>.', 'instructions.php'),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2009-08-29 14:41:57
|
Revision: 6976
http://winmerge.svn.sourceforge.net/winmerge/?rev=6976&view=rev
Author: gerundt
Date: 2009-08-29 14:41:49 +0000 (Sat, 29 Aug 2009)
Log Message:
-----------
Web: Force URL parameter in language list
Modified Paths:
--------------
trunk/Web/engine/engine.inc
trunk/Web/engine/page.inc
trunk/Web/engine/simpletranslate.inc
Modified: trunk/Web/engine/engine.inc
===================================================================
--- trunk/Web/engine/engine.inc 2009-08-29 12:15:49 UTC (rev 6975)
+++ trunk/Web/engine/engine.inc 2009-08-29 14:41:49 UTC (rev 6976)
@@ -21,7 +21,7 @@
$translations->addLanguage('fr', __('French'), $languagesdir . 'fr.po');
$translations->addLanguage('nl', __('Dutch'), $languagesdir . 'nl.po');
$translations->addLanguage('se', __('Swedish'), $languagesdir . 'se.po');
- if (!$translations->detectLanguageFromUrl()) {
+ if (!$translations->detectLanguageFromUrl()) { //if NOT detect language from URL...
$translations->detectLanguageFromBrowser();
}
Modified: trunk/Web/engine/page.inc
===================================================================
--- trunk/Web/engine/page.inc 2009-08-29 12:15:49 UTC (rev 6975)
+++ trunk/Web/engine/page.inc 2009-08-29 14:41:49 UTC (rev 6976)
@@ -384,10 +384,10 @@
$languages = $translations->getLanguages();
foreach ($languages as $language) { //for all languages...
if ($translations->isActiveLanguage($language)) { //if current language...
- $temp .= " <li><strong><a href=\"" . $translations->getLink($language) . "\">" . __($language->getName()) . "</a></strong></li>\n";
+ $temp .= " <li><strong><a href=\"" . $translations->getLink($language, true) . "\">" . __($language->getName()) . "</a></strong></li>\n";
}
else { //if NOT current language...
- $temp .= " <li><a href=\"" . $translations->getLink($language) . "\">" . __($language->getName()) . "</a></li>\n";
+ $temp .= " <li><a href=\"" . $translations->getLink($language, true) . "\">" . __($language->getName()) . "</a></li>\n";
}
}
$temp .= "</ul>\n";
Modified: trunk/Web/engine/simpletranslate.inc
===================================================================
--- trunk/Web/engine/simpletranslate.inc 2009-08-29 12:15:49 UTC (rev 6975)
+++ trunk/Web/engine/simpletranslate.inc 2009-08-29 14:41:49 UTC (rev 6976)
@@ -285,10 +285,14 @@
/**
* get the language link...
*/
- function getLink($language = null) {
+ function getLink($language = null, $forceurlparameter = null) {
$phpself = str_replace('index.php', '', $_SERVER['PHP_SELF']);
if (isset($language)) { //if language committed...
- if ((strtolower(get_class($language)) == 'simpletranslatelanguage') || ($this->_forceurlparameter == true)) { //if normal language OR forcing URL parameter...
+ $forceing = $this->_forceurlparameter;
+ if (isset($forceurlparameter)) { //if force URL parameter committed...
+ $forceing = $forceurlparameter;
+ }
+ if ((strtolower(get_class($language)) == 'simpletranslatelanguage') || ($forceing == true)) { //if normal language OR forcing URL parameter...
return $phpself . '?' . $this->_urlparameter . '=' . $language->getId();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2009-08-29 12:53:20
|
Revision: 6975
http://winmerge.svn.sourceforge.net/winmerge/?rev=6975&view=rev
Author: gerundt
Date: 2009-08-29 12:15:49 +0000 (Sat, 29 Aug 2009)
Log Message:
-----------
PATCH: [ 2845755 ] Swedish translation update (Unstable Trunk)
Modified Paths:
--------------
trunk/Docs/Users/ChangeLog.txt
trunk/Translations/WinMerge/Swedish.po
Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt 2009-08-29 11:50:22 UTC (rev 6974)
+++ trunk/Docs/Users/ChangeLog.txt 2009-08-29 12:15:49 UTC (rev 6975)
@@ -22,7 +22,7 @@
Translation updates:
- Dutch (#2801690, #2804979, #2828310)
- German (r6942)
- - Swedish (#2805726)
+ - Swedish (#2805726, #2845755)
- Turkish (#2825130, #2825132, #2827820)
- Ukrainian (#2817835)
Modified: trunk/Translations/WinMerge/Swedish.po
===================================================================
--- trunk/Translations/WinMerge/Swedish.po 2009-08-29 11:50:22 UTC (rev 6974)
+++ trunk/Translations/WinMerge/Swedish.po 2009-08-29 12:15:49 UTC (rev 6975)
@@ -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: 2009-06-13 00:34+0100\n"
+"PO-Revision-Date: 2009-08-27 20:47+0100\n"
"Last-Translator: Hans Eriksson <hans.ericson at bredband.net>\n"
"Language-Team: Swedish <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -399,7 +399,7 @@
#: Merge.rc:178
#: Merge.rc:299
#: Merge.rc:487
-#: Merge.rc:1947
+#: Merge.rc:1948
#, c-format
msgid "&Help"
msgstr "&Hj\xE4lp"
@@ -730,7 +730,7 @@
msgstr "&Script"
#: Merge.rc:373
-#: Merge.rc:2803
+#: Merge.rc:2807
#, c-format
msgid "< Empty >"
msgstr "< Inga >"
@@ -933,14 +933,14 @@
#: Merge.rc:526
#: Merge.rc:1147
-#: Merge.rc:1531
+#: Merge.rc:1514
#, c-format
msgid "&Left"
msgstr "&V\xE4nster"
#: Merge.rc:527
#: Merge.rc:1149
-#: Merge.rc:1534
+#: Merge.rc:1517
#, c-format
msgid "&Right"
msgstr "&H\xF6ger"
@@ -1097,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 "OK"
@@ -1118,7 +1118,7 @@
msgstr "V\xE4lj filer eller kataloger..."
#: Merge.rc:690
-#: Merge.rc:1608
+#: Merge.rc:1591
#, c-format
msgid "&Left:"
msgstr "&V\xE4nster:"
@@ -1132,7 +1132,7 @@
msgstr "&Bl\xE4ddra..."
#: Merge.rc:695
-#: Merge.rc:1612
+#: Merge.rc:1595
#, c-format
msgid "&Right:"
msgstr "&H\xF6ger:"
@@ -1144,13 +1144,13 @@
msgstr "B&l\xE4ddra..."
#: 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 "V\xE4lj..."
@@ -1166,7 +1166,7 @@
msgstr "V\xE4lj..."
#: Merge.rc:708
-#: Merge.rc:1619
+#: Merge.rc:1602
#, c-format
msgid "&Include Subfolders"
msgstr "&Inkludera Underkataloger"
@@ -1186,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 "Avbryt"
#: Merge.rc:713
-#: Merge.rc:1352
+#: Merge.rc:1335
#, c-format
msgid "Help"
msgstr "Hj\xE4lp"
@@ -1264,13 +1264,14 @@
msgstr "&Versionsstyrningssystem:"
#: Merge.rc:753
-#: Merge.rc:2079
+#: Merge.rc:2083
#, c-format
msgid "&Path to cleartool.exe:"
msgstr "&S\xF6kv\xE4g till Cleartool.exe:"
#: Merge.rc:760
-#: Merge.rc:1955
+#: Merge.rc:1956
+#: Merge.rc:1969
#, c-format
msgid "General"
msgstr "Generellt"
@@ -1326,13 +1327,13 @@
msgstr "Starta flera j\xE4mf\xF6rf\xF6nster f\xF6r"
#: Merge.rc:787
-#: Merge.rc:1631
+#: Merge.rc:1614
#, c-format
msgid "&Folder compare"
msgstr "&J\xE4mf\xF6r kataloger"
#: Merge.rc:789
-#: Merge.rc:1633
+#: Merge.rc:1616
#, c-format
msgid "Fil&e compare"
msgstr "J\xE4m&f\xF6r filer"
@@ -1453,7 +1454,7 @@
msgstr "Ers\xE4tt &alla"
#: Merge.rc:872
-#: Merge.rc:2201
+#: Merge.rc:2205
#, c-format
msgid "Rational ClearCase"
msgstr "Rational ClearCase"
@@ -1464,7 +1465,7 @@
msgstr "Checka ut"
#: Merge.rc:880
-#: Merge.rc:1191
+#: Merge.rc:1175
#, c-format
msgid "Comments"
msgstr "Kommentarer"
@@ -1510,7 +1511,7 @@
msgstr "Ta bort"
#: Merge.rc:910
-#: Merge.rc:1958
+#: Merge.rc:1959
#, c-format
msgid "Colors"
msgstr "Kul\xF6rer"
@@ -1526,7 +1527,7 @@
msgstr "Markerade skillnader:"
#: Merge.rc:921
-#: Merge.rc:1583
+#: Merge.rc:1566
#, c-format
msgid "Background"
msgstr "Bakgrund"
@@ -1537,8 +1538,9 @@
msgstr "Borttaget"
#: Merge.rc:935
-#: Merge.rc:1378
-#: Merge.rc:1584
+#: Merge.rc:1361
+#: Merge.rc:1567
+#: Merge.rc:1960
#, c-format
msgid "Text"
msgstr "Text"
@@ -1571,21 +1573,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 "Standard"
#: 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 "System"
@@ -1762,7 +1765,7 @@
msgstr "Katalogj\xE4mf\xF6relsens fortskridande"
#: Merge.rc:1128
-#: Merge.rc:1908
+#: Merge.rc:1909
#, c-format
msgid "Stop"
msgstr "Stopp"
@@ -1818,7 +1821,7 @@
msgstr "&G\xE5 till"
#: Merge.rc:1162
-#: Merge.rc:1956
+#: Merge.rc:1957
#, c-format
msgid "Compare"
msgstr "J\xE4mf\xF6r"
@@ -1833,960 +1836,1048 @@
msgid "&Compare"
msgstr "J\xE4mf\xF6r &mellanslag"
-#: Merge.rc:1168
+#: Merge.rc:1167
#, c-format
msgid "&Ignore change"
msgstr "&Ignorera mellanslagsskillnader "
-#: Merge.rc:1170
+#: Merge.rc:1168
#, c-format
msgid "I&gnore all"
msgstr "Ignorera &alla mellanslag"
-#: Merge.rc:1172
+#: Merge.rc:1169
#, c-format
msgid "Ignore blan&k lines"
msgstr "Ignorera blan&ka rader"
-#: Merge.rc:1174
+#: Merge.rc:1170
#, c-format
msgid "Ignore &case"
msgstr "&Ignorera VERSAL/gemen-skillnader"
-#: Merge.rc:1176
+#: Merge.rc:1171
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
msgstr "Igno&rera skillnader i radslut (Windows/Unix/Mac)"
-#: Merge.rc:1179
+#: Merge.rc:1173
#, c-format
msgid "E&nable moved block detection"
msgstr "M&\xF6jligg\xF6r detektion av flyttade textblock"
-#: Merge.rc:1181
+#: Merge.rc:1174
#, c-format
msgid "&Match similar lines"
msgstr "&Matcha liknande rader"
-#: Merge.rc:1183
+#: Merge.rc:1176
#, c-format
-msgid "Ign&ore time differences less than 3 seconds"
-msgstr "Ign&orera tidsskillnad mindre \xE4n 3 sekunder"
-
-#: Merge.rc:1186
-#, c-format
-msgid "&File Compare method:"
-msgstr "&Filj\xE4mf\xF6relsemetod:"
-
-#: Merge.rc:1189
-#, c-format
-msgid "S&top after first difference"
-msgstr "S&toppa efter f\xF6rsta skillnaden"
-
-#: Merge.rc:1192
-#, c-format
msgid "Filter Comments"
msgstr "Filterkommentarer"
-#: 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 "&Markera syntaxen"
-#: Merge.rc:1204
+#: Merge.rc:1187
#, c-format
msgid "&Automatic rescan"
msgstr "Automatisk &uppdatering"
-#: Merge.rc:1206
+#: Merge.rc:1189
#, c-format
msgid "&Preserve original EOL chars"
msgstr "Bevara ursprungliga radslutstecken"
-#: Merge.rc:1208
+#: Merge.rc:1191
#, c-format
msgid "Tabs"
msgstr "Tabbar"
-#: Merge.rc:1209
+#: Merge.rc:1192
#, c-format
msgid "&Tab size:"
msgstr "&Tabbsteg:"
-#: Merge.rc:1212
+#: Merge.rc:1195
#, c-format
msgid "&Insert Tabs"
msgstr "Infoga tabbar"
-#: Merge.rc:1214
+#: Merge.rc:1197
#, c-format
msgid "Insert &Spaces"
msgstr "Infoga mellanslag"
-#: Merge.rc:1216
+#: Merge.rc:1199
#, c-format
msgid "Line Difference Coloring"
msgstr "Radskillnadskul\xF6rer"
-#: Merge.rc:1218
+#: Merge.rc:1201
#, c-format
msgid "View line differences"
msgstr "Visa radskillnader"
-#: Merge.rc:1220
+#: Merge.rc:1203
#, c-format
msgid "&Character level"
msgstr "&Teckenniv\xE5"
-#: Merge.rc:1222
+#: Merge.rc:1205
#, c-format
msgid "&Word-level:"
msgstr "&Ordniv\xE5:"
-#: Merge.rc:1226
+#: Merge.rc:1209
#, c-format
msgid "W&ord break characters:"
msgstr "O&rdbrytningstecken:"
-#: Merge.rc:1239
+#: Merge.rc:1222
#, c-format
msgid "Filefilters"
msgstr "Filfilter"
-#: Merge.rc:1245
+#: Merge.rc:1228
#, c-format
msgid "Test"
msgstr "Testa"
-#: Merge.rc:1246
+#: Merge.rc:1229
#, c-format
msgid "Install..."
msgstr "Installera..."
-#: Merge.rc:1247
+#: Merge.rc:1230
#, c-format
msgid "New..."
msgstr "Ny..."
-#: Merge.rc:1248
+#: Merge.rc:1231
#, c-format
msgid "Edit..."
msgstr "Redigera..."
-#: Merge.rc:1249
+#: Merge.rc:1232
#, c-format
msgid "Delete..."
msgstr "Ta bort..."
-#: Merge.rc:1255
+#: Merge.rc:1238
#, c-format
msgid "Save modified files?"
msgstr "Spara \xE4ndrade filer?"
-#: Merge.rc:1258
+#: Merge.rc:1241
#, c-format
msgid "Left side file"
msgstr "V\xE4nster fil"
-#: Merge.rc:1261
+#: Merge.rc:1244
#, c-format
msgid "&Save changes"
msgstr "&Spara \xE4ndringar"
-#: Merge.rc:1263
+#: Merge.rc:1246
#, c-format
msgid "&Discard changes"
msgstr "&Ignorera \xE4ndringar"
-#: Merge.rc:1265
+#: Merge.rc:1248
#, c-format
msgid "Right side file"
msgstr "H\xF6ger fil"
-#: Merge.rc:1268
+#: Merge.rc:1251
#, c-format
msgid "S&ave changes"
msgstr "S¶ \xE4ndringar"
-#: Merge.rc:1270
+#: Merge.rc:1253
#, c-format
msgid "Dis&card changes"
msgstr "Ign&orera \xE4ndringar"
-#: Merge.rc:1272
+#: Merge.rc:1255
#, c-format
msgid "Disca&rd All"
msgstr "Ign&orera allt"
-#: Merge.rc:1279
-#: Merge.rc:1527
-#: Merge.rc:1963
+#: Merge.rc:1262
+#: Merge.rc:1510
+#: Merge.rc:1964
#, c-format
msgid "Codepage"
msgstr "Codepage"
-#: Merge.rc:1282
+#: Merge.rc:1265
#, c-format
msgid "Default Codepage"
msgstr "Standard Codepage"
-#: Merge.rc:1283
+#: Merge.rc:1266
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr "V\xE4lj den Codepage som anv\xE4nds som standard n\xE4r icke-Unicodefiler \xF6ppnas:"
-#: Merge.rc:1285
+#: Merge.rc:1268
#, c-format
-msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session"
-msgstr "Detektera Codepage-info f\xF6r dessa filer: .html, .rc, .xml \nbeh\xF6ver omstarta sessionen"
+msgid ""
+"Detect codepage info for these files: .html, .rc, .xml \n"
+"need to restart session"
+msgstr ""
+"Detektera Codepage-info f\xF6r dessa filer: .html, .rc, .xml \n"
+"beh\xF6ver omstarta sessionen"
-#: Merge.rc:1288
+#: Merge.rc:1271
#, c-format
msgid "System codepage"
msgstr "System Codepage"
-#: Merge.rc:1290
+#: Merge.rc:1273
#, c-format
msgid "According to WinMerge User Interface"
msgstr "Enligt WinMerges anv\xE4ndargr\xE4nssnitt"
-#: Merge.rc:1292
+#: Merge.rc:1275
#, c-format
msgid "Custom codepage:"
msgstr "Anpassad Codepage:"
-#: Merge.rc:1300
+#: Merge.rc:1283
#, c-format
msgid "WinMerge - Archive support disabled"
msgstr "WinMerge - Arkivst\xF6d \xE4r avst\xE4ngt"
-#: Merge.rc:1303
+#: Merge.rc:1286
#, c-format
msgid "Unable to detect 7-Zip version (not installed?)"
msgstr "Kan inte detektera 7-Zip-version (\xE4r 7-Zip inte installerat?)"
-#: 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\nessential components to be copied to the program directory for standalone operation."
-msgstr "Arkivst\xF6d kr\xE4ver antingen att version 3.11 eller h\xF6gre av 7-Zip \xE4r installerat p\xE5 din dator, eller att dess\nn\xF6dv\xE4ndiga komponenter kopieras till WinMerges programkatalog f\xF6r frist\xE5ende anv\xE4ndning."
+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 ""
+"Arkivst\xF6d kr\xE4ver antingen att version 3.11 eller h\xF6gre av 7-Zip \xE4r installerat p\xE5 din dator, eller att dess\n"
+"n\xF6dv\xE4ndiga komponenter kopieras till WinMerges programkatalog f\xF6r frist\xE5ende anv\xE4ndning."
-#: Merge.rc:1308
+#: Merge.rc:1291
#, c-format
msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path."
msgstr "Det m\xE5ste ocks\xE5 finnas ett l\xE4mpligt gr\xE4nssnittsplugin (Merge7z*.dll) i s\xF6kv\xE4gen."
-#: Merge.rc:1310
+#: Merge.rc:1293
#, c-format
-msgid "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available."
-msgstr "Var god och anv\xE4nd den version av 7-Zip som rekommenderas nedanf\xF6r tills gr\xE4nssnittsplugins f\xF6r senare\nversioner blir tillg\xE4ngliga."
+msgid ""
+"Please use the version of 7-Zip recommended below until interface plugins for later\n"
+"versions become available."
+msgstr ""
+"Var god och anv\xE4nd den version av 7-Zip som rekommenderas nedanf\xF6r tills gr\xE4nssnittsplugins f\xF6r senare\n"
+"versioner blir tillg\xE4ngliga."
-#: Merge.rc:1312
+#: Merge.rc:1295
#, c-format
msgid "Version"
msgstr "Version"
-#: Merge.rc:1314
+#: Merge.rc:1297
#, c-format
-msgid "Plugin required\n(dllbuild %04u)"
-msgstr "Plugin kr\xE4vd\n(dllbuild %04u)"
+msgid ""
+"Plugin required\n"
+"(dllbuild %04u)"
+msgstr ""
+"Plugin kr\xE4vd\n"
+"(dllbuild %04u)"
-#: Merge.rc:1316
+#: Merge.rc:1299
#, c-format
msgid "Recommended version of 7-Zip:"
msgstr "Rekommenderad version av 7-Zip:"
-#: Merge.rc:1319
-#: Merge.rc:1322
+#: Merge.rc:1302
+#: Merge.rc:1305
#, c-format
msgid "present"
msgstr "finns"
-#: 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 "7-Zip program installerat p\xE5 din dator:"
-#: Merge.rc:1325
-#: Merge.rc:1330
+#: Merge.rc:1308
+#: Merge.rc:1313
#, c-format
msgid "none"
msgstr "inget"
-#: Merge.rc:1327
+#: Merge.rc:1310
#, c-format
msgid "missing"
msgstr "saknas"
-#: Merge.rc:1328
+#: Merge.rc:1311
#, c-format
msgid "7-Zip components for standalone operation:"
msgstr "7-Zip komponenter f\xF6r frist\xE5ende anv\xE4ndning:"
-#: Merge.rc:1332
+#: Merge.rc:1315
#, c-format
msgid "outdated"
msgstr "utdaterad"
-#: Merge.rc:1333
+#: Merge.rc:1316
#, c-format
msgid "Plugins on path:"
msgstr "Plugins i s\xF6kv\xE4g:"
-#: 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 "Visa inte detta &meddelande igen.\n(Du kan alltid f\xE5 tillbaka detta meddelande fr\xE5n Hj\xE4lp-menyn.)"
+msgid ""
+"Don't display this &message again.\n"
+"(You can always recall this message from the Help menu.)"
+msgstr ""
+"Visa inte detta &meddelande igen.\n"
+"(Du kan alltid f\xE5 tillbaka detta meddelande fr\xE5n Hj\xE4lp-menyn.)"
-#: Merge.rc:1338
+#: Merge.rc:1321
#, c-format
msgid "Plugin Download"
msgstr "Ladda ner Plugin"
-#: Merge.rc:1347
+#: Merge.rc:1330
#, c-format
msgid "Options"
msgstr "Inst\xE4llningar"
-#: Merge.rc:1358
+#: Merge.rc:1341
#, c-format
msgid " Categories"
msgstr " Kategorier"
-#: Merge.rc:1360
+#: Merge.rc:1343
#, c-format
msgid "Import..."
msgstr "Importera..."
-#: Merge.rc:1361
+#: Merge.rc:1344
#, c-format
msgid "Export..."
msgstr "Exportera..."
-#: Merge.rc:1369
+#: Merge.rc:1352
#, c-format
msgid "Keywords:"
msgstr "Nyckelord:"
-#: Merge.rc:1370
+#: Merge.rc:1353
#, c-format
msgid "Function names:"
msgstr "Funktionsnamn:"
-#: Merge.rc:1371
+#: Merge.rc:1354
#, c-format
msgid "Comments:"
msgstr "Kommentarer:"
-#: Merge.rc:1372
+#: Merge.rc:1355
#, c-format
msgid "Numbers:"
msgstr "Nummer:"
-#: Merge.rc:1373
+#: Merge.rc:1356
#, c-format
msgid "Operators:"
msgstr "Operatorer:"
-#: Merge.rc:1374
+#: Merge.rc:1357
#, c-format
msgid "Strings:"
msgstr "Str\xE4ngar:"
-#: Merge.rc:1375
+#: Merge.rc:1358
#, c-format
msgid "Preprocessor:"
msgstr "Preprocessor:"
-#: Merge.rc:1376
+#: Merge.rc:1359
#, c-format
msgid "User 1:"
msgstr "Anv\xE4ndare 1:"
-#: Merge.rc:1377
+#: Merge.rc:1360
#, c-format
msgid "User 2:"
msgstr "Anv\xE4ndare 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 "Fet"
-#: Merge.rc:1430
+#: Merge.rc:1413
#, c-format
msgid "Folder Compare Report"
msgstr "Rapport f\xF6r Katalogj\xE4mf\xF6relse"
-#: Merge.rc:1433
+#: Merge.rc:1416
#, c-format
msgid "Report &File:"
msgstr "Rapport&fil:"
-#: 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 "Bl\xE4ddra..."
-#: 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 "&Kopiera till klippbordet"
-#: Merge.rc:1448
+#: Merge.rc:1431
#, c-format
msgid "Shared or Private Filter"
msgstr "Delat eller privat filter?"
-#: Merge.rc:1451
+#: Merge.rc:1434
#, c-format
msgid "Which type of filter do you want to create?"
msgstr "Vilken typ av filter vill du skapa?"
-#: Merge.rc:1453
+#: Merge.rc:1436
#, c-format
msgid "Shared Filter (for all users on this machine)"
msgstr "Delat filter (f\xF6r alla anv\xE4ndare p\xE5 denna dator)"
-#: Merge.rc:1455
+#: Merge.rc:1438
#, c-format
msgid "Private Filter (only for current user)"
msgstr "Privat filter (bara f\xF6r den aktuella anv\xE4ndaren)"
-#: Merge.rc:1463
-#: Merge.rc:1964
+#: Merge.rc:1446
+#: Merge.rc:1965
#, c-format
msgid "Archive Support"
msgstr "Arkivst\xF6d"
-#: Merge.rc:1466
+#: Merge.rc:1449
#, c-format
msgid "Archive support requires 7-Zip plugin installed:"
msgstr "Arkivst\xF6det kr\xE4ver att 7-Zip-plugin \xE4r installerad:"
-#: Merge.rc:1468
+#: Merge.rc:1451
#, c-format
msgid "Download 7-zip Plugin"
msgstr "Ladda ner 7-zip-plugin"
-#: Merge.rc:1469
+#: Merge.rc:1452
#, c-format
msgid "&Enable archive file support"
msgstr "&Aktivera arkivfilst\xF6d"
-#: Merge.rc:1471
+#: Merge.rc:1454
#, c-format
msgid "&Use stand-alone 7-Zip if available"
msgstr "&Anv\xE4nd frist\xE5ende 7-Zip om det finns"
-#: Merge.rc:1474
+#: Merge.rc:1457
#, c-format
msgid "U&se local 7-Zip from WinMerge folder"
msgstr "A&nv\xE4nd lokal 7-Zip fr\xE5n WinMerges katalog"
-#: Merge.rc:1476
+#: Merge.rc:1459
#, c-format
msgid "&Detect archive type from file signature"
msgstr "&Detektera arkivtyp fr\xE5n filsignatur"
-#: Merge.rc:1484
+#: Merge.rc:1467
#, c-format
msgid "Compare Statistics"
msgstr "J\xE4mf\xF6relsestatistik"
-#: Merge.rc:1487
+#: Merge.rc:1470
#, c-format
msgid "Folders:"
msgstr "Kataloger:"
-#: Merge.rc:1488
+#: Merge.rc:1471
#, c-format
msgid "Files:"
msgstr "Filer:"
-#: Merge.rc:1489
-#: Merge.rc:2355
+#: Merge.rc:1472
+#: Merge.rc:2359
#, c-format
msgid "Different"
msgstr "Olika"
-#: Merge.rc:1490
+#: Merge.rc:1473
#, c-format
msgid "Text:"
msgstr "Text:"
-#: Merge.rc:1493
-#: Merge.rc:1512
+#: Merge.rc:1476
+#: Merge.rc:1495
#, c-format
msgid "Binary:"
msgstr "Bin\xE4r:"
-#: Merge.rc:1496
+#: Merge.rc:1479
#, c-format
msgid "Unique"
msgstr "Unik"
-#: Merge.rc:1497
+#: Merge.rc:1480
#, c-format
msgid "Left:"
msgstr "V\xE4nster:"
-#: Merge.rc:1502
+#: Merge.rc:1485
#, c-format
msgid "Right:"
msgstr "H\xF6ger:"
-#: Merge.rc:1507
-#: Merge.rc:2349
+#: Merge.rc:1490
+#: Merge.rc:2353
#, c-format
msgid "Identical"
msgstr "Identisk"
-#: Merge.rc:1516
+#: Merge.rc:1499
#, c-format
msgid "Total:"
msgstr "Totalt:"
-#: Merge.rc:1521
+#: Merge.rc:1504
#, c-format
msgid "Close"
msgstr "St\xE4ng"
-#: Merge.rc:1530
+#: Merge.rc:1513
#, c-format
msgid "Affects"
msgstr "P\xE5verkar"
-#: Merge.rc:1533
-#: Merge.rc:1536
+#: Merge.rc:1516
+#: Merge.rc:1519
#, c-format
msgid "(Affects)"
msgstr "(P\xE5verkar)"
-#: Merge.rc:1537
+#: Merge.rc:1520
#, c-format
msgid "Select Codepage for"
msgstr "V\xE4lj Codepage f\xF6r"
-#: Merge.rc:1538
+#: Merge.rc:1521
#, c-format
msgid "&File Loading:"
msgstr "&Fil\xF6ppnande:"
-#: 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 "Filsparande:"
-#: Merge.rc:1544
+#: Merge.rc:1527
#, c-format
msgid "&Use same codepage for both"
msgstr "&Anv\xE4nd samma Codepage f\xF6r b\xE5da"
-#: Merge.rc:1547
+#: Merge.rc:1530
#, c-format
msgid "&Apply"
msgstr "&Verkst\xE4ll"
-#: Merge.rc:1548
-#: Merge.rc:1930
+#: Merge.rc:1531
+#: Merge.rc:1931
#, c-format
msgid "&Cancel"
msgstr "&Avbryt"
-#: Merge.rc:1553
+#: Merge.rc:1536
#, c-format
msgid "Test Filter"
msgstr "Testa Filter"
-#: Merge.rc:1556
+#: Merge.rc:1539
#, c-format
msgid "Testing filter ..."
msgstr "Testar filter ..."
-#: Merge.rc:1558
+#: Merge.rc:1541
#, c-format
msgid "&Enter text to test:"
msgstr "&Skriv in text att testa:"
-#: Merge.rc:1560
+#: Merge.rc:1543
#, c-format
msgid "&Folder Name"
msgstr "&Katalognamn"
-#: Merge.rc:1562
+#: Merge.rc:1545
#, c-format
msgid "Result:"
msgstr "Resultat:"
-#: Merge.rc:1566
+#: Merge.rc:1549
#, c-format
msgid "&Test"
msgstr "&Testa"
-#: Merge.rc:1567
+#: Merge.rc:1550
#, c-format
msgid "&Close"
msgstr "&St\xE4ng"
-#: Merge.rc:1575
+#: Merge.rc:1558
#, c-format
msgid "&Use customized text colors"
msgstr "&Anv\xE4nd anpassade textkul\xF6rer"
-#: Merge.rc:1578
+#: Merge.rc:1561
#, c-format
msgid "Custom text colors"
msgstr "Anpassade textkul\xF6rer"
-#: Merge.rc:1580
+#: Merge.rc:1563
#, c-format
msgid "Whitespace:"
msgstr "Mellanslag:"
-#: Merge.rc:1581
+#: Merge.rc:1564
#, c-format
msgid "Regular text:"
msgstr "Vanlig text:"
-#: Merge.rc:1582
+#: Merge.rc:1565
#, c-format
msgid "Selection:"
msgstr "Markering:"
-#: Merge.rc:1605
+#: Merge.rc:1588
#, c-format
msgid "Paths"
msgstr "S\xF6kv\xE4gar"
-#: Merge.rc:1611
+#: Merge.rc:1594
#, c-format
msgid "R&ead-only"
msgstr "Bara& l\xE4sbar"
-#: Merge.rc:1615
+#: Merge.rc:1598
#, c-format
msgid "Re&ad-only"
msgstr "Bara& l\xE4sbar"
-#: Merge.rc:1621
+#: Merge.rc:1604
#, c-format
msgid "Open..."
msgstr "\xD6ppna..."
-#: Merge.rc:1622
+#: Merge.rc:1605
#, c-format
msgid "Save..."
msgstr "Spara..."
-#: Merge.rc:1627
-#: Merge.rc:1965
+#: Merge.rc:1610
+#: Merge.rc:1966
#, c-format
msgid "Backup Files"
msgstr "Backup p\xE5 filer"
-#: Merge.rc:1630
+#: Merge.rc:1613
#, c-format
msgid "Create backup files in:"
msgstr "Skapa backupfiler i:"
-#: Merge.rc:1635
+#: Merge.rc:1618
#, c-format
msgid "Create backup files into:"
msgstr "Skapa backupfiler i:"
-#: Merge.rc:1636
+#: Merge.rc:1619
#, c-format
msgid "&Original file's folder"
msgstr "&Originalfilens katalog"
-#: Merge.rc:1638
+#: Merge.rc:1621
#, c-format
msgid "&Global backup folder:"
msgstr "&Global backupkatalog:"
-#: Merge.rc:1642
+#: Merge.rc:1625
#, c-format
msgid "Backup filename:"
msgstr "Backupfilnamn:"
-#: Merge.rc:1643
+#: Merge.rc:1626
#, c-format
msgid "&Append .bak -extension"
msgstr "&L\xE4gg till filsuffixet .bak"
-#: Merge.rc:1645
+#: Merge.rc:1628
#, c-format
msgid "A&ppend timestamp"
msgstr "L&\xE4gg till tidsmarkering"
-#: Merge.rc:1652
-#: Merge.rc:2257
+#: Merge.rc:1635
+#: Merge.rc:2261
#, c-format
msgid "Confirm Copy"
msgstr "Bekr\xE4fta kopiering"
-#: Merge.rc:1656
+#: Merge.rc:1639
#, c-format
msgid "Are you sure you want to copy XXX items?"
msgstr "\xC4r du s\xE4ker p\xE5 att du vill kopiera XXX objekt?"
-#: Merge.rc:1658
+#: Merge.rc:1641
#, c-format
msgid "From left"
msgstr "Fr\xE5n v\xE4nster"
-#: Merge.rc:1661
+#: Merge.rc:1644
#, c-format
msgid "To right"
msgstr "Till h\xF6ger"
-#: Merge.rc:1664
+#: Merge.rc:1647
#, c-format
msgid "Yes"
msgstr "Ja"
-#: Merge.rc:1665
+#: Merge.rc:1648
#, c-format
msgid "No"
msgstr "Nej"
-#: Merge.rc:1671
+#: Merge.rc:1654
#, c-format
msgid "Plugins"
msgstr "Plugins"
-#: Merge.rc:1674
+#: Merge.rc:1657
#, c-format
msgid "&Enable plugins"
msgstr "&Starta Plugins"
-#: Merge.rc:1685
-#: Merge.rc:1966
+#: Merge.rc:1668
+#: Merge.rc:1967
#, c-format
msgid "Shell Integration"
msgstr "Gr\xE4nssnittsintegration"
-#: Merge.rc:1688
+#: Merge.rc:1671
#, c-format
msgid "Explorer"
msgstr "Explorer"
-#: Merge.rc:1689
+#: Merge.rc:1672
#, c-format
msgid "E&nable advanced menu"
msgstr "A&nv\xE4nd avancerad meny"
-#: Merge.rc:1691
+#: Merge.rc:1674
#, c-format
msgid "In&clude subfolders by default"
msgstr "In&kludera underkataloger som standard"
-#: Merge.rc:1693
+#: Merge.rc:1676
#, c-format
msgid "&Add to context menu"
msgstr "&L\xE4gg till i kontextmeny"
-#: Merge.rc:1695
+#: Merge.rc:1678
#, c-format
msgid "Folder compare"
msgstr "Katalogj\xE4mf\xF6relse"
-#: Merge.rc:1696
+#: Merge.rc:1679
#, c-format
msgid "Add &Shell menu to context menu"
msgstr "L\xE4gg till &gr\xE4nssnittsmeny i kontextmeny"
+#: Merge.rc:1686
+#: Merge.rc:1970
+#: Merge.rc:2307
+#, c-format
+msgid "Folder"
+msgstr "Katalog"
+
+#: Merge.rc:1689
+#, c-format
+msgid "&Compare method:"
+msgstr "&J\xE4mf\xF6relsemetod:"
+
+#: Merge.rc:1691
+#, c-format
+msgid "S&top after first difference"
+msgstr "S&toppa efter f\xF6rsta skillnaden"
+
+#: Merge.rc:1693
+#, c-format
+msgid "Ign&ore time differences less than 3 seconds"
+msgstr "Ign&orera tidsskillnad mindre \xE4n 3 sekunder"
+
+#: Merge.rc:1695
+#, c-format
+msgid "&Include unique subfolders contents"
+msgstr "&Inkludera unikt underkataloginneh\xE5ll"
+
+#: Merge.rc:1697
+#, c-format
+msgid "&Quick compare limit (MB):"
+msgstr "&Snabb maximal j\xE4mf\xF6relsestorlek (MB):"
+
#. StringFileInfo.Block
-#: Merge.rc:1722
+#: Merge.rc:1723
#, c-format
msgid "040904e4"
msgstr "041d04e4"
#. VarFileInfo.Translation
-#: Merge.rc:1738
+#: Merge.rc:1739
#, c-format
msgid "0x409, 1252"
msgstr "0x41d, 1252"
-#: Merge.rc:1753
+#: Merge.rc:1754
#, c-format
msgid "Ready"
msgstr "Klar"
-#: 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
-#, c-format
-msgid "Create empty documents\nNew Documents (Ctrl+N)"
-msgstr "Skapar nya dokument\nNya Dokument (Ctrl+N)"
-
#: Merge.rc:1771
#, c-format
-msgid "Open an existing document\nOpen (Ctrl+O)"
-msgstr "\xD6ppnar ett befintligt dokument\n\xD6ppna (Ctrl+O)"
+msgid ""
+"Create empty documents\n"
+"New Documents (Ctrl+N)"
+msgstr ""
+"Skapar nya dokument\n"
+"Nya Dokument (Ctrl+N)"
#: Merge.rc:1772
#, c-format
-msgid "Close the active document\nClose"
-msgstr "St\xE4nger det aktiva dokumentet\nSt\xE4ng"
+msgid ""
+"Open an existing document\n"
+"Open (Ctrl+O)"
+msgstr ""
+"\xD6ppnar ett befintligt dokument\n"
+"\xD6ppna (Ctrl+O)"
#: Merge.rc:1773
#, c-format
-msgid "Save the active document\nSave (Ctrl+S)"
-msgstr "Sparar det aktiva dokumentet\nSpara (Ctrl+S)"
+msgid ""
+"Close the active document\n"
+"Close"
+msgstr ""
+"St\xE4nger det aktiva dokumentet\n"
+"St\xE4ng"
#: Merge.rc:1774
#, c-format
-msgid "Save the active document with a new name\nSave As"
-msgstr "Sparar det aktiva dokumentet med ett nytt namn\nSpara som"
+msgid ""
+"Save the active document\n"
+"Save (Ctrl+S)"
+msgstr ""
+"Sparar det aktiva dokumentet\n"
+"Spara (Ctrl+S)"
#: Merge.rc:1775
#, c-format
-msgid "Change the printing options\nPage Setup"
-msgstr "\xC4ndrar Utskriftsinst\xE4llningar\nSidinst\xE4llningar"
+msgid ""
+"Save the active document with a new name\n"
+"Save As"
+msgstr ""
+"Sparar det aktiva dokumentet med ett nytt namn\n"
+"Spara som"
#: Merge.rc:1776
#, c-format
-msgid "Change the printer and printing options\nPrint Setup"
-msgstr "\xC4ndrar skrivare och skrivarinst\xE4llningar\nSkrivarinst\xE4llningar"
+msgid ""
+"Change the printing options\n"
+"Page Setup"
+msgstr ""
+"\xC4ndrar Utskriftsinst\xE4llningar\n"
+"Sidinst\xE4llningar"
#: Merge.rc:1777
#, c-format
-msgid "Print the active document\nPrint"
-msgstr "Skriver ut det aktiva dokumentet\nSkriv ut"
+msgid ""
+"Change the printer and printing options\n"
+"Print Setup"
+msgstr ""
+"\xC4ndrar skrivare och skrivarinst\xE4llningar\n"
+"Skrivarinst\xE4llningar"
#: Merge.rc:1778
#, c-format
-msgid "Display full pages\nPrint Preview"
-msgstr "Visar helsidor\nF\xF6rhandsgranska"
+msgid ""
+"Print the active document\n"
+"Print"
+msgstr ""
+"Skriver ut det aktiva dokumentet\n"
+"Skriv ut"
-#: Merge.rc:1783
+#: Merge.rc:1779
#, c-format
+msgid ""
+"Display full pages\n"
+"Print Preview"
+msgstr ""
+"Visar helsidor\n"
+"F\xF6rhandsgranska"
+
+#: Merge.rc:1784
+#, c-format
msgid "Make all hidden items visible again"
msgstr "G\xF6r alla dolda objekt synliga igen"
-#: Merge.rc:1784
+#: Merge.rc:1785
#, c-format
msgid "Toggle tree mode"
msgstr "V\xE4xla tr\xE4dmod"
-#: Merge.rc:1785
+#: Merge.rc:1786
#, c-format
msgid "Expand all subfolders"
msgstr "Expandera alla underkataloger"
-#: Merge.rc:1786
+#: Merge.rc:1787
#, c-format
msgid "Collapse all subfolders"
msgstr "Minimera alla underkataloger"
-#: Merge.rc:1792
+#: Merge.rc:1793
#, c-format
-msgid "Open project file\nProject file (Ctrl+J)"
-msgstr "\xD6ppna projektfil\nProjektfil (Ctrl+J)"
+msgid ""
+"Open project file\n"
+"Project file (Ctrl+J)"
+msgstr ""
+"\xD6ppna projektfil\n"
+"Projektfil (Ctrl+J)"
-#: Merge.rc:1793
+#: Merge.rc:1794
#, c-format
msgid "Unknown error attempting to open project file"
msgstr "Ok\xE4nt fel vid f\xF6rs\xF6k att \xF6ppna Projektfil"
-#: Merge.rc:1794
+#: Merge.rc:1795
#, c-format
msgid "Unknown error attempting to save project file"
msgstr "Ok\xE4nt fel vid f\xF6rs\xF6k att spara Projektfil"
-#: Merge.rc:1795
+#: Merge.rc:1796
#, c-format
msgid "Project File"
msgstr "Projektfil"
-#: Merge.rc:1796
+#: Merge.rc:1797
#, c-format
msgid "Project file successfully loaded."
msgstr "Projektfilen \xE4r framg\xE5ngsrikt \xF6ppnad."
-#: Merge.rc:1797
+#: Merge.rc:1798
#, c-format
msgid "Project file successfully saved."
msgstr "Projektfilen \xE4r framg\xE5ngsrikt sparad."
-#: Merge.rc:1798
+#: Merge.rc:1799
#, c-format
-msgid "Save current paths and options to project file\nSave Project File"
-msgstr "Sparar aktuella s\xF6kv\xE4gar och inst\xE4llningar till Projektfil\nSpara Projektfil"
+msgid ""
+"Save current paths and options to project file\n"
+"Save Project File"
+msgstr ""
+"Sparar aktuella s\xF6kv\xE4gar och inst\xE4llningar till Projektfil\n"
+"Spara Projektfil"
-#: Merge.rc:1803
+#: Merge.rc:1804
#, c-format
-msgid "Display program information, version number and copyright\nAbout"
-msgstr "Visar Programinformation, Versionsnummer och Copyright\nOm"
+msgid ""
+"Display program information, version number and copyright\n"
+"About"
+msgstr ""
+"Visar Programinformation, Versionsnummer och Copyright\n"
+"Om"
-#: Merge.rc:1804
+#: Merge.rc:1805
#, c-format
-msgid "Quit the application; prompts to save documents\nExit"
-msgstr "Avslutar WinMerge och fr\xE5gar om du vill spara dokument\nAvsluta"
+msgid ""
+"Quit the application; prompts to save documents\n"
+"Exit"
+msgstr ""
+"Avslutar WinMerge och fr\xE5gar om du vill spara dokument\n"
+"Avsluta"
-#: Merge.rc:1810
#: Merge.rc:1811
#: Merge.rc:1812
#: Merge.rc:1813
@@ -2802,2859 +2893,3328 @@
#: Merge.rc:1823
#: Merge.rc:1824
#: Merge.rc:1825
+#: Merge.rc:1826
#, c-format
msgid "Open this document"
msgstr "\xD6ppna detta dokument"
-#: Merge.rc:1830
-#, c-format
-msgid "Switch to the next window pane\nNext Pane"
-msgstr "V\xE4xlar till n\xE4sta f\xF6nster\nN\xE4sta f\xF6nster"
-
#: Merge.rc:1831
#, c-format
-msgid "Switch back to the previous window pane\nPrevious Pane"
-msgstr "V\xE4xlar till f\xF6rra f\xF6nstret\nF\xF6rra f\xF6nstret"
+msgid ""
+"Switch to the next window pane\n"
+"Next Pane"
+msgstr ""
+"V\xE4xlar till n\xE4sta f\xF6nster\n"
+"N\xE4sta f\xF6nster"
-#: Merge.rc:1837
+#: Merge.rc:1832
#, c-format
-msgid "Arrange windows so they overlap\nCascade Windows"
-msgstr "Arrangerar f\xF6nstren s\xE5 att de \xF6verlappar varandra\n\xD6verlappande f\xF6nster"
+msgid ""
+"Switch back to the previous window pane\n"
+"Previous Pane"
+msgstr ""
+"V\xE4xlar till f\xF6rra f\xF6nstret\n"
+"F\xF6rra f\xF6nstret"
#: Merge.rc:1838
#, c-format
-msgid "Arrange windows as non-overlapping tiles horizontally\nTile Windows Horizontally"
-msgstr "Ordnar f\xF6nstren icke-\xF6verlappande horisontellt\nOrdna horisontellt"
+msgid ""
+"Arrange windows so they overlap\n"
+"Cascade Windows"
+msgstr ""
+"Arrangerar f\xF6nstren s\xE5 att de \xF6verlappar varandra\n"
+"\xD6verlappande f\xF6nster"
#: Merge.rc:1839
#, c-format
-msgid "Arrange windows as non-overlapping tiles vertically\nTile Windows Vertically"
-msgstr "Ordnar f\xF6nstren icke-\xF6verlappande vertikalt\nOrdna vertikalt"
+msgid ""
+"Arrange windows as non-overlapping tiles horizontally\n"
+"Tile Windows Horizontally"
+msgstr ""
+"Ordnar f\xF6nstren icke-\xF6verlappande horisontellt\n"
+"Ordna horisontellt"
-#: Merge.rc:1845
+#: Merge.rc:1840
#, c-format
-msgid "Copy the selection and put it on the Clipboard\nCopy"
-msgstr "Kopierar den markerade texten och l\xE4gger det i klippbordet\nKopiera"
+msgid ""
+"Arrange windows as non-overlapping tiles vertically\n"
+"Tile Windows Vertically"
+msgstr ""
+"Ordnar f\xF6nstren icke-\xF6verlappande vertikalt\n"
+"Ordna vertikalt"
#: Merge.rc:1846
#, c-format
-msgid "Cut the selection and put it on the Clipboard\nCut"
-msgstr "Klipper ut den markerade texten och l\xE4gger det i klippbordet\nKlipp ut"
+msgid ""
+"Copy the selection and put it on the Clipboard\n"
+"Copy"
+msgstr ""
+"Kopierar den markerade texten och l\xE4gger det i klippbordet\n"
+"Kopiera"
#: Merge.rc:1847
#, c-format
-msgid "Find the specified text\nFind"
-msgstr "S\xF6ker den angivna texten\nS\xF6k"
+msgid ""
+"Cut the selection and put it on the Clipboard\n"
+"Cut"
+msgstr ""
+"Klipper ut den markerade texten och l\xE4gger det i klippbordet\n"
+"Klipp ut"
#: Merge.rc:1848
#, c-format
-msgid "Insert Clipboard contents\nPaste"
-msgstr "Klistrar in inneh\xE5llet i klippbordet\nKlistra in"
+msgid ""
+"Find the specified text\n"
+"Find"
+msgstr ""
+"S\xF6ker den angivna texten\n"
+"S\xF6k"
#: Merge.rc:1849
#, c-format
-msgid "Repeat the last action\nRepeat"
-msgstr "Upprepar den senaste \xE5tg\xE4rden\nUpprepa"
+msgid ""
+"Insert Clipboard contents\n"
+"Paste"
+msgstr ""
+"Klistrar in inneh\xE5llet i klippbordet\n"
+"Klistra in"
#: Merge.rc:1850
#, c-format
-msgid "Replace specific text with different text\nReplace"
-msgstr "Ers\xE4tter den markerade texten med annan text\nErs\xE4tt"
+msgid ""
+"Repeat the last action\n"
+"Repeat"
+msgstr ""
+"Upprepar den senaste \xE5tg\xE4rden\n"
+"Upprepa"
#: Merge.rc:1851
#, c-format
-msgid "Select the entire document\nSelect All"
-msgstr "V\xE4ljer hela dokumentet\nV\xE4lj allt"
+msgid ""
+"Replace specific text with different text\n"
+"Replace"
+msgstr ""
+"Ers\xE4tter den markerade texten med annan text\n"
+"Ers\xE4tt"
#: Merge.rc:1852
#, c-format
-msgid "Undo the last action\nUndo (Ctrl+Z)"
-msgstr "\xC5ngrar den senaste \xE5tg\xE4rden\n\xC5ngra"
+msgid ""
+"Select the entire document\n"
+"Select All"
+msgstr ""
+"V\xE4ljer hela dokumentet\n"
+"V\xE4lj allt"
#: Merge.rc:1853
#, c-format
-msgid "Redo the previously undone action\nRedo (Ctrl+Y)"
-msgstr "G\xF6r om den tidigare \xE5ngrade \xE5tg\xE4rden\nG\xF6r om (Ctrl+Y)"
+msgid ""
+"Undo the last action\n"
+"Undo (Ctrl+Z)"
+msgstr ""
+"\xC5ngrar den senaste \xE5tg\xE4rden\n"
+"\xC5ngra"
-#: Merge.rc:1859
+#: Merge.rc:1854
#, c-format
-msgid "Show or hide the toolbar\nToggle ToolBar"
-msgstr "Visar eller g\xF6mmer verktygsf\xE4ltet\nV\xE4xla verktygsf\xE4lt"
+msgid ""
+"Redo the previously undone action\n"
+"Redo (Ctrl+Y)"
+msgstr ""
+"G\xF6r om den tidigare \xE5ngrade \xE5tg\xE4rden\n"
+"G\xF6r om (Ctrl+Y)"
#: Merge.rc:1860
#, c-format
-msgid "Show or hide the status bar\nToggle StatusBar"
-msgstr "Visar eller g\xF6mmer statusf\xE4ltet\nV\xE4xla statusf\xE4ltet"
+msgid ""
+"Show or hide the toolbar\n"
+"Toggle ToolBar"
+msgstr ""
+"Visar eller g\xF6mmer verktygsf\xE4ltet\n"
+"V\xE4xla verktygsf\xE4lt"
#: Merge.rc:1861
#, c-format
-msgid "Show or hide the tab bar\nToggle TabBar"
-msgstr "Visar eller g\xF6mmer filraden\nV\xE4xla filraden"
+msgid ""
+"Show or hide the status bar\n"
+"Toggle StatusBar"
+msgstr ""
+"Visar eller g\xF6mmer statusf\xE4ltet\n"
+"V\xE4xla statusf\xE4ltet"
#: Merge.rc:1862
#, c-format
-msgid "Automatically resize panes\nLock Panes"
-msgstr "Automatisk storleks\xE4ndring av placering\nL\xE5s Placering"
+msgid ""
+"Show or hide the tab bar\n"
+"Toggle TabBar"
+msgstr ""
+"Visar eller g\xF6mmer filraden\n"
+"V\xE4xla filraden"
-#: Merge.rc:1868
+#: Merge.rc:1863
#, c-format
+msgid ""
+"Automatically resize panes\n"
+"Lock Panes"
+msgstr ""
+"Automatisk storleks\xE4ndring av placering\n"
+"L\xE5s Placering"
+
+#: Merge.rc:1869
+#, c-format
msgid "Change the window size"
msgstr "\xC4ndra f\xF6nsterstorlek"
-#: Merge.rc:1869
+#: Merge.rc:1870
#, c-format
msgid "Change the window position"
msgstr "Flytta f\xF6nster"
-#: Merge.rc:1870
+#: Merge.rc:1871
#, c-format
msgid "Reduce the window to an icon"
msgstr "Minimera f\xF6nstret till en ikon"
-#: Merge.rc:1871
+#: Merge.rc:1872
#, c-format
msgid "Enlarge the window to full size"
msgstr "Maximera f\xF6nstret till full storlek"
-#: Merge.rc:1872
+#: Merge.rc:1873
#, c-format
msgid "Switch to the next document window"
msgstr "V\xE4xla till n\xE4sta dokumentf\xF6nster"
-#: Merge.rc:1873
+#: Merge.rc:1874
#, c-format
msgid "Switch to the previous document window"
msgstr "V\xE4xla till f\xF6rra dokumentf\xF6nstret"
-#: Merge.rc:1874
+#: Merge.rc:1875
#, c-format
msgid "Close the active window and prompts to save the documents"
msgstr "St\xE4ng det aktiva f\xF6nstret och fr\xE5ga om dokumenten skall sparas"
-#: Merge.rc:1879
+#: Merge.rc:1880
#, c-format
msgid "Restore the window to normal size"
msgstr "\xC5terst\xE4ll f\xF6nstret till normal storlek"
-#: Merge.rc:1880
+#: Merge.rc:1881
#, c-format
msgid "Activate Task List"
msgstr "Lista med aktiva f\xF6nster"
-#: Merge.rc:1881
+#: Merge.rc:1882
#, c-format
msgid "Activate this window"
msgstr "Aktiverar det h\xE4r f\xF6nstret"
-#: Merge.rc:1887
+#: Merge.rc:1888
#, c-format
-msgid "Close print preview mode\nCancel Preview"
-msgstr "St\xE4nger F\xF6rhandsgranskning\nSt\xE4ng F\xF6rhandsgranskning"
+msgid ""
+"Close print preview mode\n"
+"Cancel Preview"
+msgstr ""
+"St\xE4nger F\xF6rhandsgranskning\n"
+"St\xE4ng F\xF6rhandsgranskning"
-#: Merge.rc:1894
+#: Merge.rc:1895
#, c-format
-msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare"
-msgstr "\nFilj\xE4mf\xF6relse\n\n\n\nWinMerge.Filj\xE4mf\xF6relse\nWinMerge Filj\xE4mf\xF6relse"
+msgid ""
+"\n"
+"FileCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FileCompare\n"
+"WinMerge File Compare"
+msgstr ""
+"\n"
+"Filj\xE4mf\xF6relse\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.Filj\xE4mf\xF6relse\n"
+"WinMerge Filj\xE4mf\xF6relse"
-#: Merge.rc:1895
+#: Merge.rc:1896
#, c-format
-msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
-msgstr "\nKatalogj\xE4mf\xF6relse\n\n\n\nWinMerge.Katalogj\xE4mf\xF6relse\nWinMerge Katalogj\xE4mf\xF6relse"
+msgid ""
+"\n"
+"FolderCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FolderCompare\n"
+"WinMerge Folder Compare"
+msgstr ""
+"\n"
+"Katalogj\xE4mf\xF6relse\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.Katalogj\xE4mf\xF6relse\n"
+"WinMerge Katalogj\xE4mf\xF6relse"
-#: Merge.rc:1902
+#: Merge.rc:1903
#, c-format
msgid "Preserve original EOL chars"
msgstr "Bevara ursprungliga radslutstecken"
-#: Merge.rc:1909
+#: Merge.rc:1910
#, c-format
msgid "Press any key"
msgstr "Tryck p\xE5 en valfri tangent"
-#: Merge.rc:1915
#: Merge.rc:1916
+#: Merge.rc:1917
#, c-format
msgid "Right click on the path to copy"
msgstr "H\xF6gerklicka p\xE5 s\xF6kv\xE4gen f\xF6r att kopiera"
-#: 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 "Utvecklare:\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 ""
+"Utvecklare:\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 kommer med ABSOLUT INGA GARANTIER. Detta \xE4r fri programvara och du \xE4r v\xE4lkommen att vidaredistribuera den under vissa omst\xE4ndigheter; se GNU General Public License i Hj\xE4lpmenyn f\xF6r detaljer."
-#: Merge.rc:1929
+#: Merge.rc:1930
#, c-format
msgid "&Ok"
msgstr "&OK"
-#: Merge.rc:1931
+#: Merge.rc:1932
#, c-format
msgid "&Abort"
msgstr "&Avbryt"
-#: Merge.rc:1932
+#: Merge.rc:1933
#, c-format
msgid "&Retry"
msgstr "&F\xF6rs\xF6k igen"
-#: Merge.rc:1933
+#: Merge.rc:1934
#, c-format
msgid "&Ignore"
msgstr "&Ignorera"
-#: Merge.rc:1934
+#: Merge.rc:1935
#, c-format
msgid "Ignore &all"
msgstr "Ignorera &allt"
-#: Merge.rc:1935
+#: Merge.rc:1936
#, c-format
msgid "&Yes"
msgstr "&Ja"
-#: Merge.rc:1941
+#: Merge.rc:1942
#, c-format
msgid "Yes to &all"
msgstr "Ja till &allt"
-#: Merge.rc:1942
+#: Merge.rc:1943
#, c-format
msgid "&No"
msgstr "&Nej"
-#: Merge.rc:1943
+#: Merge.rc:1944
#, c-format
msgid "No to a&ll"
msgstr "Nej till a&llt"
-#: Merge.rc:1944
+#: Merge.rc:1945
#, c-format
msgid "&Continue"
msgstr "&Forts\xE4tt"
-#: Merge.rc:1945
+#: Merge.rc:1946
#, c-format
msgid "&Skip"
msgstr "&Skippa"
-#: Merge.rc:1946
+#: Merge.rc:1947
#, c-format
msgid "Skip &all"
msgstr "Skippa &allt"
-#: Merge.rc:1948
+#: Merge.rc:1949
#, c-format
msgid "Don't display this &message again."
msgstr "Visa inte detta &meddelande igen."
-#: Merge.rc:1949
+#: Merge.rc:1950
#, c-format
msgid "Don't ask this &question again."
msgstr "Fr\xE5ga inte denna &fr\xE5ga igen."
-#: Merge.rc:1959
+#: Merge.rc:1961
#, c-format
-msgid "Syntax colors"
-msgstr "Syntaxkul\xF6rer"
+msgid "Syntax"
+msgstr "Syntax"
-#: Merge.rc:1960
+#: Merge.rc:1963
#, c-format
-msgid "Text Colors"
-msgstr "Textkul\xF6rer"
-
-#: Merge.rc:1962
-#, c-format
msgid "Version Control"
msgstr "Versionskontroll"
-#: Merge.rc:1973
+#: Merge.rc:1968
+#: Merge.rc:2339
#, c-format
+msgid "Differences"
+msgstr "Skillnader"
+
+#: Merge.rc:1977
+#, c-format
msgid "To:"
msgstr "Till:"
-#: Merge.rc:1974
+#: Merge.rc:1978
#, c-format
msgid "From left:"
msgstr "Fr\xE5n v\xE4nster:"
-#: Merge.rc:1975
+#: Merge.rc:1979
#, c-format
msgid "To left:"
msgstr "Till v\xE4nster:"
-#: Merge.rc:1976
+#: Merge.rc:1980
#, c-format
msgid "From right:"
msgstr "Fr\xE5n h\xF6ger:"
-#: Merge.rc:1977
+#: Merge.rc:1981
#, c-format
msgid "To right:"
msgstr "Till h\xF6ger:"
-#: Merge.rc:1983
+#: Merge.rc:1987
#, c-format
msgid "Version %1"
msgstr "Version %1"
-#: Merge.rc:1984
+#: Merge.rc:1988
#, c-format
msgid "Unicode"
msgstr "Unicode"
-#: Merge.rc:1985
+#: Merge.rc:1989
#, c-format
msgid "X64"
msgstr "X64"
-#: Merge.rc:1991
+#: Merge.rc:1995
#, c-format
msgid "Options (%1)"
msgstr "Egenskaper (%1)"
-#: Merge.rc:1992
+#: Merge.rc:1996
#, c-format
msgid "All message boxes are now displayed again."
msgstr "Alla meddelanderutor visas nu igen."
-#: 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 "\xC4ndringar har gjorts i den aktuella filj\xE4mf\xF6relsesessionen. Vissa inst\xE4llningar kanske inte syns f\xF6rr\xE4n den aktuella filj\xE4mf\xF6relsen startas om."
-#: Merge.rc:1994
+#: Merge.rc:1998
#, c-format
msgid "The selected font change will not be applied to any currently visible difference windows."
msgstr "\xC4ndringen av typsnitt kommer inte att synas i redan \xF6ppna f\xF6nster."
-#: Merge.rc:1996
+#: Merge.rc:2000
#, c-format
-msgid "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1."
-msgstr "V\xE4rdet i Tabbstorleks-f\xE4ltet \xE4r inte inom vad WinMerge accepterar.\n\nVar god och anv\xE4nd v\xE4rden fr\xE5n 1 - %1."
+msgid ""
+"Value in Tab size -field is not in range WinMerge accepts.\n"
+"\n"
+"Please use values 1 - %1."
+msgstr ""
+"V\xE4rdet i Tabbstorleks-f\xE4ltet \xE4r inte inom vad WinMerge accepterar.\n"
+"\n"
+"Var god och anv\xE4nd v\xE4rden fr\xE5n 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\nPlease re-start WinMerge after the reset."
-msgstr "\xC4r du s\xE4ker att du vill \xE5terst\xE4lla alla WinMerges inst\xE4llningar till standardv\xE4rden?\n\nVar god och \xE5terstarta WinMerge efter \xE5terst\xE4llningen."
+msgid ""
+"Are you sure you want to reset all WinMerge options to default values?\n"
+"\n"
+"Please re-start WinMerge after the reset."
+msgstr ""
+"\xC4r du s\xE4ker att du vill \xE5terst\xE4lla alla WinMerges inst\xE4llningar till standardv\xE4rden?\n"
+"\n"
+"Var god och \xE5terstarta WinMerge efter \xE5terst\xE4llningen."
-#: Merge.rc:2004
+#: Merge.rc:2008
#, c-format
msgid "Open"
msgstr "\xD6ppna"
-#: Merge.rc:2005
+#: Merge.rc:2009
#, c-format
msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
msgstr "Programfiler|*.exe;*.bat;*.cmd|Alla Filer (*.*)|*.*||"
-#: Merge.rc:2006
+#: Merge.rc:2010
#, c-format
msgid "All Files (*.*)|*.*||"
msgstr "Alla filer (*.*)|*.*||"
-#: Merge.rc:2007
+#: Merge.rc:2011
#, c-format
msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
msgstr "WinMerge Projektfiler (*.WinMerge)|*.WinMerge||"
-#: Merge.rc:2009
+#: Merge.rc:2013
#, c-format
msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
msgstr "Inst\xE4llningsfiler (*.ini)|*.ini|Alla Filer (*.*)|*.*||"
-#: Merge.rc:2015
+#: Merge.rc:2019
#, c-format
msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
msgstr "Text-filer (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Alla filer (*.*)|*.*||"
-#: Merge.rc:2016
+#: Merge.rc:2020
#, c-format
msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
msgstr "HTML-filer (*.htm,*.html)|*.htm;*.html|Alla filer (*.*)|*.*||"
-#: Merge.rc:2017
+#: Merge.rc:2021
#, c-format
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "XML-filer (*.xml)|*.xml|Alla filer (*.*)|*.*||"
-#: 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 "Total j\xE4mf\xF6relse"
-#: Merge.rc:2033
+#: Merge.rc:2037
#, c-format
msgid "Quick Contents"
msgstr "Snabb j\xE4mf\xF6relse"
-#: Merge.rc:2034
+#: Merge.rc:2038
#, c-format
msgid "Modified Date"
msgstr "Datum f\xF6r f\xF6r\xE4ndring"
-#: Merge.rc:2035
+#: Merge.rc:2039
#, c-format
msgid "Modified Date and Size"
msgstr "\xC4ndrat Datum och Storlek"
-#: Merge.rc:2036
+#: Merge.rc:2040
#, c-format
msgid "Size"
msgstr "Filstorlek"
-#: Merge.rc:2042
-#: Merge.rc:2667
+#: Merge.rc:2046
+#: Merge.rc:2671
#, c-format
msgid "Name"
msgstr "Namn"
-#: Merge.rc:2043
+#: Merge.rc:2047
#, c-format
msgid "Location"
msgstr "S\xF6kv\xE4g"
-#: Merge.rc:2044
+#: Merge.rc:2048
#, c-format
msgid "Filters"
msgstr "Filter"
-#: Merge.rc:2045
+#: Merge.rc:2049
#, c-format
msgid "[F] "
msgstr "[F] "
-#: Merge.rc:2046
-#: Merge.rc:2669
+#: Merge.rc:2050
+#: Merge.rc:2673
#, c-format
msgid "Description"
msgstr "Beskrivning"
-#: Merge.rc:2047
+#: Merge.rc:2051
#, c-format
msgid "Select filename for new filter"
msgstr "V\xE4lj filnamn f\xF6r nytt filter"
-#: Merge.rc:2048
+#: Merge.rc:2052
#, c-format
msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
msgstr "Filfilter (*.flt)|*.flt|Alla Filer (*.*)|*.*||"
-#: Merge.rc:2050
+#: Merge.rc:2054
#, c-format
-msgid "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder:\n%2."
-msgstr "Kan inte hitta filfilterfilen!\n\nVar god och kopiera filen %1 till WinMerges Filterkatalog:\n%2."
+msgid ""
+"Cannot find file filter template file!\n"
+"\n"
+"Please copy file %1 to WinMerge/Filters -folder:\n"
+"%2."
+msgstr ""
+"Kan inte hitta filfilterfilen!\n"
+"\n"
+"Var god och kopiera filen %1 till WinMerges Filterkatalog:\n"
+"%2."
-#: Merge.rc:2052
+#: Merge.rc:2056
#, c-format
-msgid "Cannot copy filter template file to filter folder:\n%1\n\nPlease make sure the folder exists and is writable."
-msgstr "Kan inte kopiera filterfilen till filterkatalogen:\n%1\n\nVar god och verifiera att katalogen finns och att den \xE4r skrivbar."
+msgid ""
+"Cannot copy filter template file to filter folder:\n"
+"%1\n"
+"\n"
+"Please make sure the folder exists and is writable."
+msgstr ""
+"Kan inte kopiera filterfilen till filterkatalogen:\n"
+"%1\n"
+"\n"
+"Var god och verifiera att katalogen finns och att den \xE4r skrivbar."
-#: Merge.rc:2054
+#: Merge.rc:2058
#, c-format
-msgid "User's filter file folder is not defined!\n\nPlease select filter folder in Options/System."
-msgstr "Anv\xE4ndarens filterfilkatalog \xE4r inte definierad!\n\nVar god och v\xE4lj filterkatalog i Inst\xE4llningar/System."
+msgid ""
+"User's filter file folder is not defined!\n"
+"\n"
+"Please select filter folder in Options/System."
+msgstr ""
+"Anv\xE4ndarens filterfilkatalog \xE4r inte definierad!\n"
+"\n"
+"Var god och v\xE4lj filterkatalog i Inst\xE4llningar/System."
-#: Merge.rc:2056
+#: Merge.rc:2060
#, c-format
-msgid "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?"
-msgstr "Kan inte ta bort filterfilen:\n%1\n\nKanske \xE4r filen bara l\xE4sbar?"
+msgid ""
+"Failed to delete the filter file:\n"
+"%1\n"
+"\n"
+"Maybe the file is read-only?"
+msgstr ""
+"Kan inte ta bort filterfilen:\n"
+"%1\n"
+"\n"
+"Kanske \xE4r filen bara l\xE4sbar?"
-#: Merge.rc:2057
+#: Merge.rc:2061
#, c-format
msgid "Locate filter file to install"
msgstr "Ange s\xF6kv\xE4g f\xF6r filterfil att installera"
-#: Merge.rc:2059
+#: Merge.rc:2063
#, c-format
-msgid "Installing filter file failed.\n\nCould not copy new filter file to filter folder."
-msgstr "Installation av filterfilen misslyckades.\n\nKunde inte kopiera ny filterfil till filterkatalogen."
+msgid ""
+"Installing filter file failed.\n"
+"\n"
+"Could not copy new filter file to filter folder."
+msgstr ""
+"Installation av filterfilen misslyckades.\n"
+"\n"
+"Kunde inte kopiera ny filterfil till filterkatalogen."
-#: Merge.rc:2061
+#: Merge.rc:2065
#, c-format
msgid "Filter file already exists. Overwrite existing filter?"
msgstr "Filterfilen \xE4r redan installerad. Vill du skriva \xF6ver existerande filterfil?"
-#: Merge.rc:2067
+#: Merge.rc:2071
#, c-format
msgid "Regular expression"
msgstr "Regulj\xE4rt uttryck"
-#: 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 "Filtren \xE4r uppdaterade Vill du uppdatera alla \xF6ppna katalogj\xE4mf\xF6relser?\n\nOm du inte vill uppdatera alla j\xE4mf\xF6relser nu kan du v\xE4lja Nej och uppdatera j\xE4mf\xF6relser senare."
+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 ""
+"Filtren \xE4r uppdaterade Vill du uppdatera alla \xF6ppna katalogj\xE4mf\xF6relser?\n"
+"\n"
+"Om du inte vill uppdatera alla j\xE4mf\xF6relser nu kan du v\xE4lja Nej och uppdatera j\xE4mf\xF6relser senare."
-#: Merge.rc:2080
+#: Merge.rc:2084
#, c-format
msgid "&Path to SS.EXE:"
msgstr "&S\xF6kv\xE4g till SS.EXE"
-#: Merge.rc:2086
+#: Merge.rc:2090
#, c-format
msgid "Folder Comparison Results"
msgstr "Resultat f\xF6r j\xE4mf\xF6rda kataloger"
-#: Merge.rc:2087
+#: Merge.rc:2091
#, c-format
msgid "File Comparison"
msgstr "Filj\xE4mf\xF6relse"
-#: Merge.rc:2088
+#: Merge.rc:2092
#, c-format
msgid "Untitled left"
msgstr "Namnl\xF6s v\xE4nster"
-#: Merge.rc:2089
+#: Merge.rc:2093
#, c-format
msgid "Untitled right"
msgstr "Namnl\xF6s h\xF6ger"
-#: Merge.rc:2090
+#: Merge.rc:2094
#, c-format
msgid "Theirs File"
msgstr "Deras fil"
-#: Merge.rc:2091
+#: Merge.rc:2095
#, c-format
msgid "Mine File"
msgstr "Min fil"
-#: Merge.rc:2097
+#: Merge.rc:2101
#, c-format
msgid "Scanning files..."
msgstr "S\xF6ker filer..."
-#: Merge.rc:2098
+#: Merge.rc:2102
#, c-format
msgid "Opening selection"
msgstr "\xD6ppnar val"
-#: Merge.rc:2099
+#: Merge.rc:2103
#, c-format
msgid "Copying Left to Right"
msgstr "Kopiera v\xE4nster till h\xF6ger"
-#: Merge.rc:2100
+#: Merge.rc:2104
#, c-format
msgid "Copying Right to Left"
msgstr "Kopiera h\xF6ger till v\xE4nster"
-#: Merge.rc:2101
+#: Merge.rc:2105
#, c-format
msgid "Copying All to Left"
msgstr "Kopiera allt till v\xE4nster"
-#: Merge.rc:2102
+#: Merge.rc:2106
#, c-format
msgid "Copying All to Right"
msgstr "Kopiera allt till h\xF6ger"
-#: Merge.rc:2103
+#: Merge.rc:2107
#, c-format
msgid "Copying files..."
msgstr "Kopierar filer..."
-#: Merge.rc:2104
+#: Merge.rc:2108
#, c-format
msgid "Deleting files..."
msgstr "Tar bort filer..."
-#: Merge.rc:2105
+#: Merge.rc:2109
#, c-format
msgid "Moving files..."
msgstr "Flyttar filer..."
-#: Merge.rc:2106
+#: Merge.rc:2110
#, c-format
msgid "Creating the report..."
msgstr "Skapar rapport..."
-#: Merge.rc:2107
+#: Merge.rc:2111
#, c-format
msgid "Undoing the last operation..."
msgstr "\xC5ngrar den sista \xE5tg\xE4rden..."
-#: Merge.rc:2108
+#: Merge.rc:2112
#, c-format
msgid "Redoing the previous operation..."
msgstr "G\xF6r om den tidigare \xE5tg\xE4rden..."
-#: Merge.rc:2114
+#: Merge.rc:2118
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr "Rad: %s Kolumn: %d/%d Tecken: %d/%d Radslut: %s"
-#: Merge.rc:2115
+#: Merge.rc:2119
#, c-format
msgid "Line: %s"
msgstr "Rad: %s"
-#: Merge.rc:2116
+#: Merge.rc:2120
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr "Rad: %s Kolumn: %d/%d Tecken: %d/%d"
-#: Merge.rc:2117
+#: Merge.rc:2121
#, c-format
msgid "Merge"
msgstr "Mergemod"
-#: Merge.rc:2118
+#: Merge.rc:2122
#, c-format
msgid "Difference %1 of %2"
msgstr "Skillnad %1 av %2"
-#: Merge.rc:2119
+#: Merge.rc:2123
#, c-format
msgid "%1 Differences Found"
msgstr "%1 skillnader funna"
-#: Merge.rc:2120
+#: Merge.rc:2124
#, c-format
msgid "1 Difference Found"
msgstr "1 skillnad funnen"
#. 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 "Objekt %1 av %2"
-#: Merge.rc:2128
+#: Merge.rc:2132
#, c-format
msgid "Items: %1"
msgstr "Objekt: %1"
-#: Merge.rc:2134
+#: Merge.rc:2138
#, c-format
msgid "Select two existing folders or files to compare"
msgstr "V\xE4lj tv\xE5 existerande kataloger eller filer att j\xE4mf\xF6ra"
-#: Merge.rc:2135
+#: Merge.rc:2139
#, c-format
msgid "Folder Selection"
msgstr "Val av katalog"
-#: Merge.rc:2136
+#: Merge.rc:2140
#, c-format
msgid "Select two folders or two files to compare."
msgstr "V\xE4lj tv\xE5 kataloger eller tv\xE5 filer att j\xE4mf\xF6ra."
-#: Merge.rc:2137
+#: Merge.rc:2141
#, c-format
msgid "Left path is invalid!"
msgstr "V\xE4nster s\xF6kv\xE4g \xE4r felaktig!"
-#: Merge.rc:2138
+#: Merge.rc:2142
#, c-format
msgid "Right path is invalid!"
msgstr "H\xF6ger s\xF6kv\xE4g \xE4r felaktig!"
-#: Merge.rc:2139
+#: Merge.rc:2143
#, c-format
msgid "Both paths are invalid!"
msgstr "B\xE5da s\xF6kv\xE4garna \xE4r felaktiga!"
-#: Merge.rc:2140
+#: Merge.rc:2144
#, c-format
msgid "Choose two files to enable unpacker selection."
msgstr "V\xE4lj tv\xE5 filer f\xF6r att starta valet av uppackare."
-#: Merge.rc:2141
+#: Merge.rc:2145
#, c-format
msgid "Cannot compare file and folder!"
msgstr "Kan inte j\xE4mf\xF6ra en fil med en katalog!"
-#: Merge.rc:2147
+#: Merge.rc:2151
#, c-format
msgid "File not found: %1"
msgstr "Kan inte hitta: %1"
-#: Merge.rc:2148
+#: Merge.rc:2152
#, c-format
msgid "File not unpacked: %1"
msgstr "Filen \xE4r inte uppackad: %1"
-#: Merge.rc:2149
+#: Merge.rc:2153
#, c-format
-msgid "Cannot open file\n%1\n\n%2"
-msgstr "Kan inte \xF6ppna fil\n%1\n\n%2"
+msgid ""
+"Cannot open file\n"
+"%1\n"
+"\n"
+"%2"
+msgstr ""
+"Kan inte \xF6ppna fil\n"
+"%1\n"
+"\n"
+"%2"
-#: Merge.rc:2150
+#: Merge.rc:2154
#, c-format
msgid "Failed to parse conflict file."
msgstr "Kunde inte tolka Konfliktfilen."
-#: Merge.rc:2151
+#: Merge.rc:2155
#, c-format
-msgid "The file\n%1\nis not a conflict file."
-msgstr "Filen\n%1\n\xE4r inte en Konfliktfil."
+msgid ""
+"The file\n"
+"%1\n"
+"is not a conflict file."
+msgstr ""
+"Filen\n"
+"%1\n"
+"\xE4r inte en Konfliktfil."
-#: Merge.rc:2157
+#: Merge.rc:2161
#, c-format
msgid "Save As"
msgstr "Spara som"
-#: Merge.rc:2158
+#: Merge.rc:2162
#, c-format
msgid "Save changes to %1?"
msgstr "Spara \xE4ndringar i %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 \xE4r skrivskyddad. Vill du skriva \xF6ver filen (v\xE4lj Nej f\xF6r att spara filen med ett annat namn)?"
-#: Merge.rc:2160
+#: Merge.rc:2164
#, c-format
msgid "Error checking destination writeability"
msgstr "Fel vid kontroll av skrivbarhet p\xE5 destinationen!"
-#: Merge.rc:2161
+#: Merge.rc:2165
#, c-format
msgid "Error backing up file"
msgstr "Fel vid backup av filen"
-#: Merge.rc:2163
+#: Merge.rc:2167
#, c-format
-msgid "Unable to backup original file:\n%1\n\nContinue anyway?"
-msgstr "Kan inte ta backup p\xE5 originalfilen:\n%1\n\nVill du forts\xE4tta i alla fall?"
+msgid ""
+"Unable to backup original file:\n"
+"%1\n"
+"\n"
+"Continue anyway?"
+msgstr ""
+"Kan inte ta backup p\xE5 originalfilen:\n"
+"%1\n"
+"\n"
+"Vill du forts\xE4tta i alla fall?"
-#: Merge.rc:2164
+#: Merge.rc:2168
#, c-format
-msgid "Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?"
-msgstr "Det gick inte att spara filen.\n%1\n%2\nVill du:\n\t-anv\xE4nda ett annat filnamn (Tryck Ok)\n\t-avbryta sparande av fil (Tryck Avbryt)?"
+msgid ""
+"Saving file failed.\n"
+"%1\n"
+"%2\n"
+"Do you want to:\n"
+"\t-use a different filename (Press Ok)\n"
+"\t-abort the current operation (Press Cancel)?"
+msgstr ""
+"Det gick inte att spara filen.\n"
+"%1\n"
+"%2\n"
+"Vill du:\n"
+"\t-anv\xE4nd...
[truncated message content] |
|
From: <ge...@us...> - 2009-08-29 11:50:30
|
Revision: 6974
http://winmerge.svn.sourceforge.net/winmerge/?rev=6974&view=rev
Author: gerundt
Date: 2009-08-29 11:50:22 +0000 (Sat, 29 Aug 2009)
Log Message:
-----------
Update Swedish website translation
Modified Paths:
--------------
trunk/Translations/Web/se.po
Modified: trunk/Translations/Web/se.po
===================================================================
--- trunk/Translations/Web/se.po 2009-08-28 13:01:53 UTC (rev 6973)
+++ trunk/Translations/Web/se.po 2009-08-29 11:50:22 UTC (rev 6974)
@@ -304,7 +304,7 @@
#: about\index.php:11
#, c-format
msgid "WinMerge is an <a href=\"%s\">Open Source</a> differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle."
-msgstr "WinMerge är en <a href=\"%s\">Open Source</a> skillnads och hopläggningsverktyg för Windows. WinMerge kan jämföra både kataloger och filer, presentera skillnader i ett visuellt textformat som är enkelt att förstå och hantera."
+msgstr "WinMerge är ett <a href=\"%s\">Open Source</a> skillnads och hopläggningsverktyg för Windows. WinMerge kan jämföra både kataloger och filer, presentera skillnader i ett visuellt textformat som är enkelt att förstå och hantera."
#: support\tracker-shortcuts.php:5
#, c-format
@@ -340,7 +340,7 @@
#: index.php:49
#, c-format
msgid "The WinMerge Development Team"
-msgstr "WinMerges utveckligsteam"
+msgstr "WinMerges utvecklingsteam"
#: support\tracker-shortcuts.php:15
#, c-format
@@ -404,7 +404,7 @@
#: about\index.php:32
#, c-format
msgid "Difference pane shows current difference in two vertical panes"
-msgstr "Skillnadsfältet visar aktuell skillnader i två vertikala fält"
+msgstr "Skillnadsfältet visar aktuella skillnader i två vertikala fält"
#: downloads\index.php:58
#, c-format
@@ -419,7 +419,7 @@
#: index.php:48
#, c-format
msgid "In addition, WinMerge is translated into a number of different languages. See our <a href=\"%s\">information on translating WinMerge</a> into your own language."
-msgstr "Utöver detta är, WinMerge översatt till ett antal olika språk. Se vårr <a href=\"%s\">information om översättning av WinMerge</a> till ditt eget språk."
+msgstr "Utöver detta är, WinMerge översatt till ett antal olika språk. Se vår <a href=\"%s\">information om översättning av WinMerge</a> till ditt eget språk."
#: engine\engine.inc:19
#: translations\index.php:24
@@ -449,7 +449,7 @@
#: index.php:20
#, c-format
msgid "<a href=\"%1$s\">Learn More</a> or <a href=\"%2$s\">Download Now!</a>"
-msgstr "<a href=\"%1$s\">Lär dig mer</a> or <a href=\"%2$s\">Ladda ner nu!</a>"
+msgstr "<a href=\"%1$s\">Lär dig mer</a> eller <a href=\"%2$s\">Ladda ner nu!</a>"
#: translations\index.php:11
#, c-format
@@ -1506,7 +1506,7 @@
#: about\index.php:12
#, c-format
msgid "WinMerge is highly useful for determining what has changed between project versions, and then merging changes between versions. WinMerge can be used as an external differencing/merging tool or as a standalone application."
-msgstr "WinMerge är mycket användbart för att se vad som har ändrats mellan projektversioner, och sedan lägga samman ändringar mellan versioner. WinMerge kan användas som en extern skillnads/lägga ihop-verktyg eller som en självständig applikation."
+msgstr "WinMerge är mycket användbart för att se vad som har ändrats mellan projektversioner, och sedan lägga samman ändringar mellan versioner. WinMerge kan användas som ett extern skillnads/lägga ihop-verktyg eller som en självständig applikation."
#: downloads\source-code.php:7
#: downloads\source-code.php:10
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2009-08-28 13:01:59
|
Revision: 6973
http://winmerge.svn.sourceforge.net/winmerge/?rev=6973&view=rev
Author: gerundt
Date: 2009-08-28 13:01:53 +0000 (Fri, 28 Aug 2009)
Log Message:
-----------
Web: Add "canonical" URL to English pages - Fix invalid HTML 4 syntax
Modified Paths:
--------------
trunk/Web/engine/page.inc
Modified: trunk/Web/engine/page.inc
===================================================================
--- trunk/Web/engine/page.inc 2009-08-28 12:52:59 UTC (rev 6972)
+++ trunk/Web/engine/page.inc 2009-08-28 13:01:53 UTC (rev 6973)
@@ -129,7 +129,7 @@
$temp .= " <link rel=\"alternate\" type=\"application/rss+xml\" title=\"" . $rsstitle . "\" href=\"" . $rssurl . "\">\n";
}
if ($translations->isBaseLanguage()) { //if base language...
- $temp .= " <link rel=\"canonical\" href=\"" . $translations->getLink() . "\"/>\n";
+ $temp .= " <link rel=\"canonical\" href=\"" . $translations->getLink() . "\">\n";
}
$temp .= "</head>\n\n";
if ($onload != '')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2009-08-28 12:53:06
|
Revision: 6972
http://winmerge.svn.sourceforge.net/winmerge/?rev=6972&view=rev
Author: gerundt
Date: 2009-08-28 12:52:59 +0000 (Fri, 28 Aug 2009)
Log Message:
-----------
Web: Add "canonical" URL to English pages
Modified Paths:
--------------
trunk/Web/engine/page.inc
trunk/Web/engine/simpletranslate.inc
Modified: trunk/Web/engine/page.inc
===================================================================
--- trunk/Web/engine/page.inc 2009-08-28 12:33:47 UTC (rev 6971)
+++ trunk/Web/engine/page.inc 2009-08-28 12:52:59 UTC (rev 6972)
@@ -128,6 +128,9 @@
foreach ($this->_rssfeeds as $rssurl => $rsstitle) { //for all RSS feeds...
$temp .= " <link rel=\"alternate\" type=\"application/rss+xml\" title=\"" . $rsstitle . "\" href=\"" . $rssurl . "\">\n";
}
+ if ($translations->isBaseLanguage()) { //if base language...
+ $temp .= " <link rel=\"canonical\" href=\"" . $translations->getLink() . "\"/>\n";
+ }
$temp .= "</head>\n\n";
if ($onload != '')
$temp .= "<body onload=\"".$onload."\">\n";
Modified: trunk/Web/engine/simpletranslate.inc
===================================================================
--- trunk/Web/engine/simpletranslate.inc 2009-08-28 12:33:47 UTC (rev 6971)
+++ trunk/Web/engine/simpletranslate.inc 2009-08-28 12:52:59 UTC (rev 6972)
@@ -180,14 +180,20 @@
/**
* check if the language is the base language...
*/
- function isBaseLanguage($language) {
- if ($language == $this->getBaseLanguage()) { //if base language...
- return true;
+ function isBaseLanguage($language = null) {
+ if (isset($language)) { //if language committed...
+ if ($language == $this->getBaseLanguage()) { //if base language...
+ return true;
+ }
}
+ else { //if language NOT committed...
+ if ($this->_baselanguageid == $this->_activelanguageid) { //if base language is active...
+ return true;
+ }
+ }
return false;
}
-
/**
* get the active language ID...
*/
@@ -279,14 +285,14 @@
/**
* get the language link...
*/
- function getLink($language) {
+ function getLink($language = null) {
$phpself = str_replace('index.php', '', $_SERVER['PHP_SELF']);
- if ((strtolower(get_class($language)) == 'simpletranslatelanguage') || ($this->_forceurlparameter == true)) { //if normal language OR forcing URL parameter...
- return $phpself . '?' . $this->_urlparameter . '=' . $language->getId();
+ if (isset($language)) { //if language committed...
+ if ((strtolower(get_class($language)) == 'simpletranslatelanguage') || ($this->_forceurlparameter == true)) { //if normal language OR forcing URL parameter...
+ return $phpself . '?' . $this->_urlparameter . '=' . $language->getId();
+ }
}
- else { //if base language...
- return $phpself;
- }
+ return $phpself;
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2009-08-28 12:33:56
|
Revision: 6971
http://winmerge.svn.sourceforge.net/winmerge/?rev=6971&view=rev
Author: gerundt
Date: 2009-08-28 12:33:47 +0000 (Fri, 28 Aug 2009)
Log Message:
-----------
Web: Add "ForceUrlParameter" to "SimpleTranslate" class
Modified Paths:
--------------
trunk/Web/engine/simpletranslate.inc
Modified: trunk/Web/engine/simpletranslate.inc
===================================================================
--- trunk/Web/engine/simpletranslate.inc 2009-08-27 14:39:47 UTC (rev 6970)
+++ trunk/Web/engine/simpletranslate.inc 2009-08-28 12:33:47 UTC (rev 6971)
@@ -14,6 +14,7 @@
*/
class SimpleTranslate {
var $_urlparameter;
+ var $_forceurlparameter;
var $_languages;
var $_baselanguageid;
var $_activelanguageid;
@@ -24,6 +25,7 @@
*/
function SimpleTranslate() {
$this->_urlparameter = 'lang';
+ $this->_forceurlparameter = false;
$this->_languages = array();
$this->_baselanguageid = '';
$this->_activelanguageid = '';
@@ -107,6 +109,20 @@
}
/**
+ * get forcing of the URL parameter...
+ */
+ function getForceUrlParameter() {
+ return $this->_forceurlparameter;
+ }
+
+ /**
+ * set forcing of the URL parameter...
+ */
+ function setForceUrlParameter($force) {
+ $this->_forceurlparameter = $force;
+ }
+
+ /**
* add a language...
*/
function addLanguage($id, $name, $pofile = '') {
@@ -252,7 +268,7 @@
*/
function prepareLink($link) {
$activelanguage = $this->getActiveLanguage();
- if (strtolower(get_class($activelanguage)) == 'simpletranslatelanguage') { //if normal language...
+ if ((strtolower(get_class($activelanguage)) == 'simpletranslatelanguage') || ($this->_forceurlparameter == true)) { //if normal language OR forcing URL parameter...
return $this->appendUrlParameter($link, $this->_urlparameter, $activelanguage->getId());
}
else { //if base language...
@@ -265,7 +281,7 @@
*/
function getLink($language) {
$phpself = str_replace('index.php', '', $_SERVER['PHP_SELF']);
- if (strtolower(get_class($language)) == 'simpletranslatelanguage') { //if normal language...
+ if ((strtolower(get_class($language)) == 'simpletranslatelanguage') || ($this->_forceurlparameter == true)) { //if normal language OR forcing URL parameter...
return $phpself . '?' . $this->_urlparameter . '=' . $language->getId();
}
else { //if base language...
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2009-08-27 14:39:55
|
Revision: 6970
http://winmerge.svn.sourceforge.net/winmerge/?rev=6970&view=rev
Author: gerundt
Date: 2009-08-27 14:39:47 +0000 (Thu, 27 Aug 2009)
Log Message:
-----------
Add Swedish website translation
Modified Paths:
--------------
trunk/Translations/Web/de.po
trunk/Web/engine/engine.inc
Added Paths:
-----------
trunk/Translations/Web/se.po
Modified: trunk/Translations/Web/de.po
===================================================================
--- trunk/Translations/Web/de.po 2009-08-26 16:53:15 UTC (rev 6969)
+++ trunk/Translations/Web/de.po 2009-08-27 14:39:47 UTC (rev 6970)
@@ -12,7 +12,7 @@
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2009-08-26 18:51+0100\n"
+"PO-Revision-Date: 2009-08-26 19:57+0100\n"
"Last-Translator: Tim Gerundt <tim at gerundt.de>\n"
"Language-Team: German <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -55,7 +55,7 @@
#: about\license.php:35
#, c-format
msgid "Open Source Software"
-msgstr ""
+msgstr "Open-Source-Software"
#: index.php:13
#, c-format
@@ -82,7 +82,7 @@
#: translations\status_branch.php:10
#, c-format
msgid "Translations Status (Stable Branch)"
-msgstr ""
+msgstr "Übersetzungs-Status (Stabiler „Branch“)"
#: engine\page.inc:295
#, c-format
@@ -93,7 +93,7 @@
#: about\screenshots\index.php:28
#, c-format
msgid "Location Pane"
-msgstr ""
+msgstr "Positionsleiste"
#: translations\translations.inc:177
#, c-format
@@ -170,7 +170,7 @@
#: translations\index.php:40
#, c-format
msgid "Unstable Version (Trunk)"
-msgstr ""
+msgstr "Unstabile Version (Trunk)"
#: about\screenshots\index.php:32
#, c-format
@@ -191,7 +191,7 @@
#: support\mailing-lists.php:52
#, c-format
msgid "Low Traffic"
-msgstr ""
+msgstr "Wenig Verkehr"
#: about\history.php:7
#: about\history.php:9
@@ -208,7 +208,7 @@
#: 404.php:19
#, c-format
msgid "<a href=\"%s\">Documentation</a>?"
-msgstr ""
+msgstr "<a href=\"%s\">Dokumentation</a>?"
#: support\mailing-lists.php:57
#, c-format
@@ -220,7 +220,7 @@
#: support\mailing-lists.php:62
#, c-format
msgid "Normal Traffic"
-msgstr ""
+msgstr "Normaler Verkehr"
#: downloads\index.php:28
#: downloads\index.php:34
@@ -232,7 +232,7 @@
#: about\license.php:34
#, c-format
msgid "GNU General Public License v2.0"
-msgstr ""
+msgstr "GNU General Public License v2.0"
#: about\index.php:71
#, c-format
@@ -379,7 +379,7 @@
#: 404.php:28
#, c-format
msgid "<a href=\"%s\">Translations</a>?"
-msgstr ""
+msgstr "<a href=\"%s\">Übersetzungen</a>?"
#: translations\translations.inc:38
#, c-format
@@ -414,7 +414,7 @@
#: index.php:27
#, c-format
msgid "<a href=\"%1$s\">WinMerge %2$s</a> is the latest stable version, and is recommended for most users."
-msgstr ""
+msgstr "<a href=\"%1$s\">WinMerge %2$s</a> ist die aktuelle stabile Version und ist für die meisten Benutzer empfohlen."
#: index.php:48
#, c-format
@@ -449,7 +449,7 @@
#: index.php:20
#, c-format
msgid "<a href=\"%1$s\">Learn More</a> or <a href=\"%2$s\">Download Now!</a>"
-msgstr ""
+msgstr "<a href=\"%1$s\">Mehr erfahren</a> oder <a href=\"%2$s\">jetzt herunterfahren!</a>"
#: translations\index.php:11
#, c-format
@@ -473,12 +473,12 @@
#: support\mailing-lists.php:20
#, c-format
msgid "Announce List"
-msgstr ""
+msgstr "Ankündigungsliste"
#: engine\page.inc:316
#, c-format
msgid "Status (Unstable Trunk)"
-msgstr ""
+msgstr "Status (Unstabiler „Trunk“)"
#: engine\page.inc:261
#, c-format
@@ -523,7 +523,7 @@
#: 404.php:15
#, c-format
msgid "Were you looking for..."
-msgstr ""
+msgstr "Suchten Sie..."
#: downloads\index.php:8
#, c-format
@@ -543,7 +543,7 @@
#: 404.php:22
#, c-format
msgid "<a href=\"%s\">Release Notes</a>?"
-msgstr ""
+msgstr "<a href=\"%s\">Versionshinweise</a>?"
#: 404.php:11
#, c-format
@@ -563,7 +563,7 @@
#: about\index.php:48
#, c-format
msgid "Resolve conflict files"
-msgstr ""
+msgstr "Konflikt-Dateien lösen"
#: engine\page.inc:261
#, c-format
@@ -663,7 +663,7 @@
#: 404.php:21
#, c-format
msgid "<a href=\"%s\">Manual</a>?"
-msgstr ""
+msgstr "<a href=\"%s\">Handbuch</a>?"
#: docs\index.php:7
#: docs\index.php:9
@@ -744,7 +744,7 @@
#: translations\index.php:39
#, c-format
msgid "Stable Version (Branch)"
-msgstr ""
+msgstr "Stabile Version (Branch)"
#: translations\translations_branch.inc:104
#, c-format
@@ -823,7 +823,7 @@
#: support\mailing-lists.php:50
#, c-format
msgid "Translate List"
-msgstr "Übersetzungs-Liste"
+msgstr "Übersetzungsliste"
#: support\mailing-lists.php:25
#: support\mailing-lists.php:35
@@ -848,7 +848,7 @@
#: 404.php:26
#, c-format
msgid "<a href=\"%s\">Downloads</a>?"
-msgstr ""
+msgstr "<a href=\"%s\">Downloads</a>?"
#: about\index.php:64
#: about\screenshots\index.php:7
@@ -980,12 +980,12 @@
#: about\license.php:33
#, c-format
msgid "The Open Source Definition"
-msgstr ""
+msgstr "Die Open-Source-Definition"
#: engine\page.inc:258
#, c-format
msgid "Home"
-msgstr ""
+msgstr "Home"
#: index.php:6
#, c-format
@@ -1012,7 +1012,7 @@
#: translations\status_trunk.php:9
#, c-format
msgid "Translations Status (Unstable Trunk)"
-msgstr ""
+msgstr "Übersetzungs-Status (Unstabiler „Trunk“)"
#: support\index.php:12
#, c-format
@@ -1038,7 +1038,7 @@
#: engine\page.inc:315
#, c-format
msgid "Status (Stable Branch)"
-msgstr ""
+msgstr "Status (Stabiler „Branch“)"
#: about\index.php:47
#, c-format
@@ -1150,7 +1150,7 @@
#: 404.php:23
#, c-format
msgid "<a href=\"%s\">Change Log</a>?"
-msgstr ""
+msgstr "<a href=\"%s\">Versionshistorie</a>?"
#: about\index.php:27
#, c-format
@@ -1181,7 +1181,7 @@
#: engine\page.inc:280
#, c-format
msgid "WinMerge Home"
-msgstr ""
+msgstr "WinMerge Home"
#: about\index.php:19
#, c-format
@@ -1201,7 +1201,7 @@
#: support\tracker-shortcuts.php:17
#, c-format
msgid "Todo Item"
-msgstr ""
+msgstr "Todo-Eintrag"
#: support\mailing-lists.php:67
#, c-format
@@ -1269,12 +1269,12 @@
#: support\mailing-lists.php:74
#, c-format
msgid "Unsubscribe"
-msgstr ""
+msgstr "Abbestellen"
#: about\license.php:14
#, c-format
msgid "GNU General Public License"
-msgstr ""
+msgstr "GNU General Public License"
#: translations\translations.inc:85
#: translations\translations.inc:97
@@ -1308,12 +1308,12 @@
#: about\index.php:52
#, c-format
msgid "Other"
-msgstr ""
+msgstr "Weitere"
#: 404.php:27
#, c-format
msgid "<a href=\"%s\">Support</a>?"
-msgstr ""
+msgstr "<a href=\"%s\">Support</a>?"
#: docs\index.php:6
#, c-format
@@ -1344,12 +1344,12 @@
#: support\mailing-lists.php:72
#, c-format
msgid "High Traffic"
-msgstr ""
+msgstr "Viel Verkehr"
#: 404.php:18
#, c-format
msgid "<a href=\"%s\">Screenshots</a>?"
-msgstr ""
+msgstr "<a href=\"%s\">Screenshots</a>?"
#: docs\index.php:16
#: engine\page.inc:296
@@ -1372,7 +1372,7 @@
#: translations\instructions.php:8
#, c-format
msgid "Translations instructions"
-msgstr ""
+msgstr "Übersetzungsanleitung"
#: engine\page.inc:307
#, c-format
@@ -1414,7 +1414,7 @@
#: engine\page.inc:314
#, c-format
msgid "Instructions"
-msgstr ""
+msgstr "Anleitung"
#: engine\page.inc:306
#, c-format
@@ -1462,17 +1462,17 @@
#: engine\page.inc:293
#, c-format
msgid "Release Notes"
-msgstr ""
+msgstr "Versionshinweise"
#: engine\page.inc:314
#, c-format
msgid "WinMerge Translations Instructions"
-msgstr ""
+msgstr "WinMerge Übersetzungsanleitung"
#: engine\page.inc:293
#, c-format
msgid "WinMerge Release Notes"
-msgstr ""
+msgstr "WinMerge Versionshinweise"
#: index.php:26
#, c-format
@@ -1493,7 +1493,7 @@
#: about\screenshots\index.php:16
#, c-format
msgid "Open-dialog"
-msgstr ""
+msgstr "Öffnen-Dialog"
#: downloads\index.php:90
#, c-format
@@ -1520,13 +1520,13 @@
#: support\mailing-lists.php:73
#, c-format
msgid "Subscribe"
-msgstr ""
+msgstr "Abonnieren"
#: support\mailing-lists.php:16
#: support\mailing-lists.php:60
#, c-format
msgid "Development List"
-msgstr ""
+msgstr "Entwickler-Liste"
#: about\index.php:34
#, c-format
Added: trunk/Translations/Web/se.po
===================================================================
--- trunk/Translations/Web/se.po (rev 0)
+++ trunk/Translations/Web/se.po 2009-08-27 14:39:47 UTC (rev 6970)
@@ -0,0 +1,1577 @@
+# This file is part from WinMerge <http://winmerge.org/>
+# Released under the "GNU General Public License"
+#
+# Maintainer:
+# * Hans Eriksson <hans.ericson at bredband.net>
+#
+# ID line follows -- this is updated by SVN
+# $Id$
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: WinMerge\n"
+"Report-Msgid-Bugs-To: http://bugs.winmerge.org\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2009-08-27 02:23+0100\n"
+"Last-Translator: Hans Eriksson <hans.ericson at bredband.net>\n"
+"Language-Team: Swedish <win...@li...>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Swedish\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-Basepath: ../../Web/\n"
+
+#: downloads\index.php:22
+#, c-format
+msgid "Exe-Format (%s MB)"
+msgstr "Exe-format (%s MB)"
+
+#: 404.php:13
+#, c-format
+msgid "This site has recently undergone a major re-working, so that might explain why you got this page instead."
+msgstr "Denna hemsida har nyligen genomgått en stor omarbetning, så det kan förklara varför du får denna sida istället"
+
+#: translations\index.php:36
+#, c-format
+msgid "Status"
+msgstr "Status"
+
+#: docs\changelog.php:11
+#, c-format
+msgid "The change log is currently not available..."
+msgstr "Ändringsloggen är inte nu tillgänglig..."
+
+#: downloads\index.php:55
+#, c-format
+msgid "Requirements"
+msgstr "Systemkrav"
+
+#: downloads\source-code.php:33
+#, c-format
+msgid "The source code is hosted on <a href=\"%1$s\">SourceForge.net</a> in a <a href=\"%2$s\">Subversion</a> repository."
+msgstr "Källkoden finns hos <a href=\"%1$s\">SourceForge.net</a> i ett <a href=\"%2$s\">Subversion</a> arkiv."
+
+#: about\license.php:35
+#, c-format
+msgid "Open Source Software"
+msgstr "Open Source programvara"
+
+#: index.php:13
+#, c-format
+msgid "What is WinMerge?"
+msgstr "Vad är WinMerge?"
+
+#: support\index.php:15
+#, c-format
+msgid "Good information in a bug report makes it more likely that your bug will be fixed quickly."
+msgstr "Bra information i en felrapport gör det mer sannorlikt att ditt fel fixas snabbt."
+
+#: about\index.php:30
+#, c-format
+msgid "Flexible editor with syntax highlighting, line numbers and word-wrap"
+msgstr "Flexibel editor med syntaxmarkering, radnummer och ordbrytning"
+
+#: about\index.php:22
+#, c-format
+msgid "Handles Windows, Unix and Mac text file formats"
+msgstr "Hanterar Windows, Unix och Mac textfilformat"
+
+#: translations\index.php:6
+#: translations\status_branch.php:7
+#: translations\status_branch.php:10
+#, c-format
+msgid "Translations Status (Stable Branch)"
+msgstr "Översättningsstatus (Stabil gren)"
+
+#: engine\page.inc:295
+#, c-format
+msgid "WinMerge Change Log"
+msgstr "WinMerges versionshistoria"
+
+#: about\screenshots\index.php:27
+#: about\screenshots\index.php:28
+#, c-format
+msgid "Location Pane"
+msgstr "Skillnadsfält"
+
+#: translations\translations.inc:177
+#, c-format
+msgid "Template"
+msgstr "Förlaga"
+
+#: index.php:45
+#, c-format
+msgid "Developers"
+msgstr "Utvecklare"
+
+#: about\index.php:39
+#, c-format
+msgid "Regular Expression based file filters allow excluding and including items"
+msgstr "Reguljärt uttryck baserade filfilter tillåter exkluderade och inkluderade objekt"
+
+#: downloads\index.php:59
+#, c-format
+msgid "Microsoft Visual C++ 2003 Runtime Components (included in the installer)"
+msgstr "Microsoft Visual C++ 2003 Körkomponenter (inkluderade i installationsprogrammet)"
+
+#: translations\status_branch.php:18
+#: translations\status_trunk.php:18
+#, c-format
+msgid "The translations status is currently not available..."
+msgstr "Översättningsstatusen är nu inte tillgänglig..."
+
+#: engine\page.inc:306
+#, c-format
+msgid "WinMerge Discussion Forums"
+msgstr "WinMerges Diskussionsforum"
+
+#: support\mailing-lists.php:77
+#, c-format
+msgid "Subscribers to this list get notices of each and every code change commited to Subversion."
+msgstr "Prenumeranter av denna lista får noter om varje kodändring tillhandahållen till Subversion"
+
+#: support\mailing-lists.php:13
+#: support\mailing-lists.php:30
+#, c-format
+msgid "Support List"
+msgstr "Supportlista"
+
+#: engine\page.inc:302
+#, c-format
+msgid "WinMerge PAD File"
+msgstr "WinMerge PAD-fil"
+
+#: about\screenshots\index.php:26
+#, c-format
+msgid "Many times it is useful to see exact differences inside lines. WinMerge can highlight different area between lines."
+msgstr "Många gånger är det användbart att se exakta skillnader i rader. WinMerge" kan markera olika områden mellan rader."
+
+#: translations\instructions.php:15
+#, c-format
+msgid "Source: %s"
+msgstr "Källa: %s"
+
+#: translations\index.php:37
+#, c-format
+msgid "The following two pages inform you about the translations status of the stable and developer version of WinMerge:"
+msgstr "Följande två sidor informerar dig om översättningstatus på den stabila och utvecklingsversionen av WinMerge:"
+
+#: support\tracker-shortcuts.php:55
+#, c-format
+msgid "Subdomains"
+msgstr "Subdomäner"
+
+#: about\history.php:45
+#, c-format
+msgid "Withdrawn due to installer bug!"
+msgstr "Indragen pga installationsprogramfel!"
+
+#: translations\index.php:40
+#, c-format
+msgid "Unstable Version (Trunk)"
+msgstr "Instabil version (Trunk)"
+
+#: about\screenshots\index.php:32
+#, c-format
+msgid "WinMerge 2.8 has a new professional looking splash screen."
+msgstr "WinMerge 2.8 har en ny, professionell startbild."
+
+#: about\index.php:42
+#, c-format
+msgid "Can show folder compare results in a tree-style view"
+msgstr "Kan visa katalogjämförelseresultat i ett trädfönster"
+
+#: about\index.php:16
+#, c-format
+msgid "In addition, WinMerge has many helpful supporting features that make comparing, synchronising, and merging as easy and useful as possible:"
+msgstr "Utöver detta, har WinMerge många hjälpsamma funktioner som gör jämförande, synkronisering, och ihopläggning så enkel och användbar som möjligt:"
+
+#: support\mailing-lists.php:22
+#: support\mailing-lists.php:52
+#, c-format
+msgid "Low Traffic"
+msgstr "Låg trafik"
+
+#: about\history.php:7
+#: about\history.php:9
+#: engine\page.inc:287
+#, c-format
+msgid "History"
+msgstr "Historia"
+
+#: support\mailing-lists.php:27
+#, c-format
+msgid "This list is only for announcing new releases of WinMerge."
+msgstr "Denna lista är bara för att annonsera nya releaser av WinMerge."
+
+#: 404.php:19
+#, c-format
+msgid "<a href=\"%s\">Documentation</a>?"
+msgstr "<a href=\"%s\">Dokumentation</a>?"
+
+#: support\mailing-lists.php:57
+#, c-format
+msgid "This list is used for coordinating the translations."
+msgstr "Denna lista används för att koordinera översättningarna."
+
+#: support\mailing-lists.php:32
+#: support\mailing-lists.php:42
+#: support\mailing-lists.php:62
+#, c-format
+msgid "Normal Traffic"
+msgstr "Normal trafik"
+
+#: downloads\index.php:28
+#: downloads\index.php:34
+#: downloads\source-code.php:18
+#, c-format
+msgid "7z-Format (%s MB)"
+msgstr "7z-Format (%s MB)"
+
+#: about\license.php:34
+#, c-format
+msgid "GNU General Public License v2.0"
+msgstr "GNU General Public Licens v2.0"
+
+#: about\index.php:71
+#, c-format
+msgid "Installation"
+msgstr "Installation"
+
+#: support\index.php:19
+#, c-format
+msgid "Wish list items on the <a href=\"%s\">feature request list</a> will also be considered, but we make absolutely no promises."
+msgstr "Önskningar i <a href=\"%s\">funktionsäskandelistan</a> kommer också i åtanke, men vi ger absolut inga löften."
+
+#: about\index.php:58
+#, c-format
+msgid "<a href=\"%s\">Online manual</a> and installed HTML Help manual"
+msgstr "<a href=\"%s\">Onlinemanual</a> och installerad HTML-hjälpmanual"
+
+#: engine\page.inc:309
+#, c-format
+msgid "WinMerge Tracker Shortcuts"
+msgstr "WinMerge Trackergenvägar"
+
+#: support\tracker-shortcuts.php:10
+#, c-format
+msgid "<em>Tracker Shortcuts</em> are shorter and nicer URLs to <a href=\"%1$s\">Tracker</a> items from our <a href=\"%2$s\">SF.net project page</a>."
+msgstr "<em>Trackergenvägar</em> är kortare och vackrare URLer till <a href=\"%1$s\">Tracker</a> objekt från vår <a href=\"%2$s\">SF.net projektsida</a>."
+
+#: support\tracker-shortcuts.php:14
+#, c-format
+msgid "Patch"
+msgstr "Patch"
+
+#: support\mailing-lists.php:5
+#, c-format
+msgid "Subscribe or unsubscribe to one of the following mailing lists: Announce, Support, User, Translate, Development and SVN"
+msgstr "Prenumerera eller avbryt prenumeration på en av följande mailinglistor: Annonsering, Support, Användare, Översätt, Utveckling och SVN"
+
+#: about\screenshots\index.php:20
+#, c-format
+msgid "Folder compare shows all files and subfolders found from compared folders as list. Folder compare allows synchronising folders by copying and deleting files and subfolders. Folder compare view can be versatile customised."
+msgstr "Katalogjämförelse visar alla filer och underkataloger funna från jämförda kataloger som en lista. Katalogjämförelse tillåter synkronisering av kataloger genom att kopiera och ta bort filer och underkataloger. Katalogjämförelseutseendet kan bli versantilt anpassat."
+
+#: engine\page.inc:262
+#: engine\page.inc:305
+#, c-format
+msgid "WinMerge Support"
+msgstr "WinMerge-support"
+
+#: support\index.php:17
+#, c-format
+msgid "We require registering because anonymous submissions caused a lot of spam and also because there were no possibility to contact people for asking more information."
+msgstr "Vi kräver registrering eftersom anonyma bidrag skapade mycket spam men även eftersom det inte fanns någon möjlighet att kontakta människor och fråga efter mer information."
+
+#: docs\index.php:5
+#, c-format
+msgid "Documentation from WinMerge like manual, release notes, change log and development wiki."
+msgstr "Documentation från WinMerge som manual, releasenoteringar, ändringslog och utvecklings Wiki."
+
+#: about\index.php:41
+#, c-format
+msgid "Compares one folder or includes all subfolders"
+msgstr "Jämför en katalog eller inkluderar alla underkataloger"
+
+#: 404.php:12
+#, c-format
+msgid "For some reason (mis-typed URL, faulty referral from another site, out-of-date search engine listing or we simply deleted a file) the page you were looking for could not be found."
+msgstr "Av någon anledning (felstavad URL, felaktig referens från en annan hemsida, för gammal sökmotorlistning eller vi har bara tait bort en fil) kunde sidan du letade efter inte hittas."
+
+#: index.php:19
+#: about\index.php:11
+#, c-format
+msgid "WinMerge is an <a href=\"%s\">Open Source</a> differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle."
+msgstr "WinMerge är en <a href=\"%s\">Open Source</a> skillnads och hopläggningsverktyg för Windows. WinMerge kan jämföra både kataloger och filer, presentera skillnader i ett visuellt textformat som är enkelt att förstå och hantera."
+
+#: support\tracker-shortcuts.php:5
+#, c-format
+msgid "Tracker Shortcuts are shorter and nicer URLs to Tracker items from our SF.net project page. And you can use this page to create a shortcut."
+msgstr "Trackergenvägar är kortare och vackrare URLer till Trackerobjekt från vår SF.net projektsida. Och du kan använda denna sida för att skapa en genväg."
+
+#: downloads\index.php:25
+#, c-format
+msgid "Binaries"
+msgstr "Binärfiler"
+
+#: engine\page.inc:294
+#, c-format
+msgid "WinMerge Known Issues"
+msgstr "Kända WinMerge problem"
+
+#: about\index.php:76
+#, c-format
+msgid "Using WinMerge"
+msgstr "Använda WinMerge"
+
+#: downloads\index.php:53
+#, c-format
+msgid "You can also download additional <a href=\"%1$s\">plugins</a> and the whole <a href=\"%2$s\">source code</a> from WinMerge."
+msgstr "Du kan även ladda ner ytterliggare <a href=\"%1$s\">plugins</a> och hela <a href=\"%2$s\">källkoden</a> från WinMerge."
+
+#: about\license.php:30
+#: engine\page.inc:281
+#, c-format
+msgid "Links"
+msgstr "Länkar"
+
+#: index.php:49
+#, c-format
+msgid "The WinMerge Development Team"
+msgstr "WinMerges utveckligsteam"
+
+#: support\tracker-shortcuts.php:15
+#, c-format
+msgid "Support Request"
+msgstr "Supportäskande"
+
+#: support\mailing-lists.php:17
+#: support\mailing-lists.php:70
+#, c-format
+msgid "SVN List"
+msgstr "SVN-lista"
+
+#: translations\translations.inc:132
+#: translations\translations_branch.inc:67
+#, c-format
+msgid "Graph"
+msgstr "Diagram"
+
+#: support\tracker-shortcuts.php:16
+#, c-format
+msgid "Feature Request"
+msgstr "Funktionsäskande"
+
+#: engine\page.inc:307
+#: support\mailing-lists.php:7
+#: support\mailing-lists.php:9
+#, c-format
+msgid "Mailing Lists"
+msgstr "Mailinglistor"
+
+#: about\index.php:31
+#, c-format
+msgid "Highlights differences inside lines"
+msgstr "Markera skillnader i rader"
+
+#: 404.php:28
+#, c-format
+msgid "<a href=\"%s\">Translations</a>?"
+msgstr "<a href=\"%s\">Översättningar</a>?"
+
+#: translations\translations.inc:38
+#, c-format
+msgid "File not valid."
+msgstr "Filen är felaktig."
+
+#: about\screenshots\index.php:6
+#, c-format
+msgid "WinMerge, screenshots, file comparison, open-dialog, folder comparison results, highlight line diff, location pane, splash screen"
+msgstr "WinMerge, skärmdumpar, filjämförelse, öppna-dialog, katalogjämförelseresultat, markera radskillnad, skillnadsfält, startskärm"
+
+#: engine\page.inc:315
+#, c-format
+msgid "WinMerge Translations Status (Stable Branch)"
+msgstr "WinMerge Översättningsstatus (Stabil gren)"
+
+#: about\index.php:74
+#, c-format
+msgid "For more information, please see the <a href=\"%1$s\">Installation section</a> of the <a href=\"%2$s\">Manual</a>."
+msgstr "För mer information, var god se <a href=\"%1$s\">Installationssektionen</a> av <a href=\"%2$s\">Manualen</a>."
+
+#: about\index.php:32
+#, c-format
+msgid "Difference pane shows current difference in two vertical panes"
+msgstr "Skillnadsfältet visar aktuell skillnader i två vertikala fält"
+
+#: downloads\index.php:58
+#, c-format
+msgid "Microsoft Windows 98/2000/XP/2003/Vista/2008"
+msgstr "Microsoft Windows 98/2000/XP/2003/Vista/2008"
+
+#: index.php:27
+#, c-format
+msgid "<a href=\"%1$s\">WinMerge %2$s</a> is the latest stable version, and is recommended for most users."
+msgstr "<a href=\"%1$s\">WinMerge %2$s</a> är den senaste stabila versionen, och är rekommenderad för de flesta användare."
+
+#: index.php:48
+#, c-format
+msgid "In addition, WinMerge is translated into a number of different languages. See our <a href=\"%s\">information on translating WinMerge</a> into your own language."
+msgstr "Utöver detta är, WinMerge översatt till ett antal olika språk. Se vårr <a href=\"%s\">information om översättning av WinMerge</a> till ditt eget språk."
+
+#: engine\engine.inc:19
+#: translations\index.php:24
+#, c-format
+msgid "English"
+msgstr "Engelsk"
+
+#: support\tracker-shortcuts.php:11
+#, c-format
+msgid "You can use this page to create a shortcut:"
+msgstr "Du kan använda denna sida för att skapa en genväg:"
+
+#: engine\page.inc:280
+#: engine\page.inc:285
+#: engine\page.inc:291
+#: engine\page.inc:305
+#: engine\page.inc:313
+#, c-format
+msgid "Index"
+msgstr "Index"
+
+#: engine\page.inc:300
+#, c-format
+msgid "Download WinMerge Plugins"
+msgstr "Ladda ner WinMerge Plugins"
+
+#: index.php:20
+#, c-format
+msgid "<a href=\"%1$s\">Learn More</a> or <a href=\"%2$s\">Download Now!</a>"
+msgstr "<a href=\"%1$s\">Lär dig mer</a> or <a href=\"%2$s\">Ladda ner nu!</a>"
+
+#: translations\index.php:11
+#, c-format
+msgid "We currently have WinMerge translated into the languages listed below:"
+msgstr "Vi har nu översatt WinMerge till de språk som listas nedan:"
+
+#: translations\index.php:33
+#, c-format
+msgid "You can find a more technical view about the <a href=\"%1$s\">translation system</a> in our <a href=\"\"%2$s>Development Wiki</a>."
+msgstr "Du kan hitta en mer teknisk beskrivning av <a href=\"%1$s\">översättningssystemet</a> i vår <a href=\"\"%2$s>Utvecklings-Wiki</a>."
+
+#: translations\translations.inc:131
+#: translations\translations.inc:288
+#: translations\translations_branch.inc:66
+#: translations\translations_branch.inc:182
+#, c-format
+msgid "Language"
+msgstr "Språk"
+
+#: support\mailing-lists.php:12
+#: support\mailing-lists.php:20
+#, c-format
+msgid "Announce List"
+msgstr "Annonseringslista"
+
+#: engine\page.inc:316
+#, c-format
+msgid "Status (Unstable Trunk)"
+msgstr "Status (Instabil Trunk)"
+
+#: engine\page.inc:261
+#, c-format
+msgid "WinMerge Downloads"
+msgstr "WinMerge nerladdning"
+
+#: downloads\index.php:70
+#, c-format
+msgid "Japanese WinMerge Version"
+msgstr "Japansk WinMerge-version"
+
+#: engine\page.inc:308
+#, c-format
+msgid "Tracker"
+msgstr "Tracker"
+
+#: about\history.php:20
+#: docs\changelog.php:7
+#: docs\changelog.php:8
+#: docs\index.php:14
+#: engine\page.inc:295
+#, c-format
+msgid "Change Log"
+msgstr "Versionshistoria"
+
+#: downloads\index.php:69
+#, c-format
+msgid "WinMerge Portable"
+msgstr "WinMerge Portabel"
+
+#: translations\translations.inc:83
+#: translations\translations_branch.inc:51
+#, c-format
+msgid "Fuzzy: %d%%"
+msgstr "Oklar: %d%%"
+
+#: docs\changelog.php:5
+#, c-format
+msgid "The change log is a more complete list of changes in the last WinMerge releases."
+msgstr "Ändringsloggen är en mer komplett lista på ändringar i den senaste WinMerge releasen"
+
+#: 404.php:15
+#, c-format
+msgid "Were you looking for..."
+msgstr "Letade du efter..."
+
+#: downloads\index.php:8
+#, c-format
+msgid "WinMerge, free, download, Windows, setup, installer, binaries, runtimes, stable, beta, experimental, portable"
+msgstr "WinMerge, fri, ladda ner, Windows, setup, installerare, program, körfiler, stabil, beta, experimental, portabel"
+
+#: engine\page.inc:296
+#, c-format
+msgid "WinMerge Development Wiki"
+msgstr "WinMerge Utvecklings-Wiki"
+
+#: downloads\index.php:15
+#, c-format
+msgid "The current WinMerge version is <strong>%1$s</strong> and was released at <strong>%2$s</strong>."
+msgstr "Den aktuella WinMerge versionen är <strong>%1$s</strong> och den släpptes <strong>%2$s</strong>."
+
+#: 404.php:22
+#, c-format
+msgid "<a href=\"%s\">Release Notes</a>?"
+msgstr "<a href=\"%s\">Releasenoteringar</a>?"
+
+#: 404.php:11
+#, c-format
+msgid "Page Not Found..."
+msgstr "Sida hittades inte..."
+
+#: support\index.php:16
+#, c-format
+msgid "You must <a href=\"%s\">register with SourceForge.net</a> before posting a bug report (registration is free)."
+msgstr "Du måste <a href=\"%s\">registrera dig hos SourceForge.net</a> innan du kan posta en felrapport (registrering är gratis)."
+
+#: index.php:16
+#, c-format
+msgid "More Screenshots…"
+msgstr "Mera skärmdumpar…"
+
+#: about\index.php:48
+#, c-format
+msgid "Resolve conflict files"
+msgstr "Lös konfliktfiler"
+
+#: engine\page.inc:261
+#, c-format
+msgid "Downloads"
+msgstr "Filer"
+
+#: translations\index.php:29
+#, c-format
+msgid "To change languages, select the desired language from the <span class=\"guimenu\">View</span>→ <span class=\"guimenuitem\">Languages</span> menu choice."
+msgstr "För att ändra språk, välj det önskade språket från <span class=\"guimenu\">Visa</span>→ <span class=\"guimenuitem\">Språk</span> menyvalet."
+
+#: engine\page.inc:263
+#: translations\index.php:8
+#: translations\index.php:10
+#, c-format
+msgid "Translations"
+msgstr "Översättningar"
+
+#: support\index.php:38
+#, c-format
+msgid "Since WinMerge is an <a href=\"%s\">Open Source</a> project, you may use it free of charge."
+msgstr "Eftersom WinMerge är ett <a href=\"%s\">Open Source</a> projekt, kan du använda det gratis."
+
+#: engine\page.inc:282
+#, c-format
+msgid "Project Page"
+msgstr "Projektsida"
+
+#: about\index.php:7
+#: about\index.php:10
+#: engine\page.inc:259
+#: engine\page.inc:285
+#, c-format
+msgid "About WinMerge"
+msgstr "Om WinMerge"
+
+#: engine\page.inc:263
+#: engine\page.inc:313
+#, c-format
+msgid "WinMerge Translations"
+msgstr "WinMerge Översättningar"
+
+#: engine\page.inc:308
+#, c-format
+msgid "WinMerge Tracker"
+msgstr "WinMerge Tracker"
+
+#: support\mailing-lists.php:47
+#, c-format
+msgid "This list is for user related questions. Having questions posted to this list may allow others having the same problem to solve it on their own."
+msgstr "Denna lista är för användarrelaterade frågor. Genom att ha frågor postade till denna lista kan andra som har samma problem lösa det själv."
+
+#: downloads\index.php:7
+#, c-format
+msgid "Download the current WinMerge version %1$s, which was released at %2$s. For detailed info on what is new, read the change log and the release notes."
+msgstr "Ladda ner den aktuella WinMerge versionen %1$s, som släpptes %2$s. För detaljerad information om vad som är nytt, läs ändringsloggen och releasenoteringarna."
+
+#: engine\page.inc:294
+#, c-format
+msgid "Known Issues"
+msgstr "Kända problem"
+
+#: translations\translations.inc:136
+#: translations\translations_branch.inc:71
+#, c-format
+msgid "Last Update"
+msgstr "Senaste uppdateringen"
+
+#: engine\page.inc:301
+#, c-format
+msgid "Source Code"
+msgstr "Källkod"
+
+#: about\screenshots\index.php:21
+#: about\screenshots\index.php:22
+#, c-format
+msgid "Folder Compare Tree View"
+msgstr "Katalogjämförelse trädfönster"
+
+#: downloads\index.php:27
+#: downloads\index.php:33
+#: downloads\source-code.php:17
+#, c-format
+msgid "Zip-Format (%s MB)"
+msgstr "Zip-Format (%s MB)"
+
+#: support\tracker-shortcuts.php:18
+#, c-format
+msgid "Tracker Item"
+msgstr "Trackerobjekt"
+
+#: translations\translations_branch.inc:183
+#, c-format
+msgid "Translator(s)"
+msgstr "Översättare"
+
+#: 404.php:21
+#, c-format
+msgid "<a href=\"%s\">Manual</a>?"
+msgstr "<a href=\"%s\">Manualen</a>?"
+
+#: docs\index.php:7
+#: docs\index.php:9
+#: engine\page.inc:260
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentation"
+
+#: about\history.php:19
+#: docs\index.php:10
+#: engine\page.inc:292
+#, c-format
+msgid "Manual"
+msgstr "Manual"
+
+#: docs\index.php:17
+#, c-format
+msgid "The <a href=\"%s\">Development Wiki</a> contains many informations about the WinMerge development."
+msgstr "<a href=\"%s\">Utvecklings Wiki</a> innehåller mycket information om WinMerge-utveckling."
+
+#: index.php:8
+#: index.php:30
+#, c-format
+msgid "Project News"
+msgstr "Projekt-nyheter"
+
+#: docs\index.php:13
+#, c-format
+msgid "The <a href=\"%1$s\">release notes</a> are a short summary of important changes, enhancements, bug fixes and <a href=\"%2$s\">known issues</a> in the current WinMerge release."
+msgstr "<a href=\"%1$s\">Releasenoteringarna</a> är en kort sammanfattning av viktiga ändringar, förbättringar, bugfixar och <a href=\"%2$s\">kända problem</a> i den aktuella WinMerge releasen."
+
+#: about\license.php:6
+#, c-format
+msgid "WinMerge, license, open source, GNU General Public License, GPL, free software"
+msgstr "WinMerge, licens, Open Source, GNU General Public License, GPL, fri programvara"
+
+#: engine\page.inc:282
+#, c-format
+msgid "WinMerge Project Page"
+msgstr "WinMerge Projektsida"
+
+#: downloads\index.php:40
+#: downloads\source-code.php:24
+#, c-format
+msgid "SHA-1 Checksums"
+msgstr "SHA-1 kontrollsummor"
+
+#: engine\page.inc:228
+#, c-format
+msgid "Version %1$s; %2$s MB"
+msgstr "Version %1$s; %2$s MB"
+
+#: docs\releasenotes.php:11
+#, c-format
+msgid "The release notes are currently not available..."
+msgstr "Releasenoteringarna är nu inte tillgängliga..."
+
+#: translations\translations.inc:81
+#: translations\translations.inc:95
+#: translations\translations.inc:133
+#: translations\translations_branch.inc:49
+#: translations\translations_branch.inc:68
+#: translations\translations_branch.inc:118
+#, c-format
+msgid "Translated"
+msgstr "Översatt"
+
+#: support\tracker-shortcuts.php:6
+#, c-format
+msgid "WinMerge, tracker, shortcuts, sourceforge, project page, bug, patch, support request, feature request, todo item"
+msgstr "WinMerge, Tracker, genvägar, sourceforge, projektsida, fel, patch, supportäskande, funktionsäskande, att göra objekt"
+
+#: support\index.php:6
+#, c-format
+msgid "The Open Discussion forum is the fastest way to get help. A other way is a subscription to the support mailing list."
+msgstr "Det Öppna diskussionsforumet är det snabbaste sättet att få hjälp. Ett annat sätt är att prenumera på supportmailinglistan"
+
+#: translations\index.php:39
+#, c-format
+msgid "Stable Version (Branch)"
+msgstr "Stabil version (Gren)"
+
+#: translations\translations_branch.inc:104
+#, c-format
+msgid "English (Template)"
+msgstr "Engelsk (Förlaga)"
+
+#: engine\page.inc:281
+#, c-format
+msgid "WinMerge Links"
+msgstr "WinMerge Länkar"
+
+#: about\screenshots\index.php:29
+#, c-format
+msgid "Location pane is a handy side-pane showing a overall (difference) map of files compared."
+msgstr "Skillnadsfältet är en användbar sidopanel som visar en översiktlig (skillnads) bild på jämförda filer"
+
+#: about\license.php:10
+#, c-format
+msgid ""
+"This means everybody can download the <a href=\"%s\">source code</a> and improve and modify them.\n"
+"The only thing we ask is that people submit their improvements and modifications back to us so that all WinMerge users may benefit."
+msgstr ""
+"Detta betyder att alla kan ladda ner <a href=\"%s\">källkoden</a> och förbättra och ändra i den.\n"
+"Det enda vi begär är att människor skickar deras förbättringar och modifikationer till oss så att alla WinMerge användare kan få nytta av dem."
+
+#: engine\page.inc:302
+#, c-format
+msgid "PAD File"
+msgstr "PAD-fil"
+
+#: docs\index.php:15
+#, c-format
+msgid "The <a href=\"%s\">change log</a> is a more complete list of changes in the last WinMerge releases."
+msgstr "<a href=\"%s\">Ändringsloggen</a> är en mer komplett lista på ändringar i den senaste WinMerge releasen."
+
+#: engine\page.inc:316
+#, c-format
+msgid "WinMerge Translations Status (Unstable Trunk)"
+msgstr "WinMerge Översättningsstatus (Instabil Trunk)"
+
+#: support\tracker-shortcuts.php:23
+#, c-format
+msgid "Type:"
+msgstr "Typ:"
+
+#: downloads\index.php:16
+#, c-format
+msgid "For detailed info on what is new, read the <a href=\"%1$s\">change log</a> and the <a href=\"%2$s\">release notes</a>."
+msgstr "För detaljerad information om vad som är nytt, läs <a href=\"%1$s\">ändringsloggen</a> och <a href=\"%2$s\">releasenoteringarna</a>."
+
+#: support\mailing-lists.php:14
+#: support\mailing-lists.php:40
+#, c-format
+msgid "User List"
+msgstr "Användarlista"
+
+#: index.php:47
+#, c-format
+msgid "If you are interested in contributing work to the project, see our <a href=\"%s\">developer page</a> for further information on how you may contribute."
+msgstr "Om du är intresserad att bidra med arbete i projektet, se vår <a href=\"%s\">utvecklingssida</a> för mer information om hur du kan bidra."
+
+#: translations\translations.inc:182
+#, c-format
+msgid "Total: Unknown"
+msgstr "Totalt: Okänt"
+
+#: about\index.php:29
+#, c-format
+msgid "Visual differencing and merging of text files"
+msgstr "Visuell urskillnad och ihopläggande av textfiler"
+
+#: downloads\index.php:60
+#, c-format
+msgid "Admin rights for the installer"
+msgstr "Administrationrättigheter för installationsprogrammet"
+
+#: support\mailing-lists.php:15
+#: support\mailing-lists.php:50
+#, c-format
+msgid "Translate List"
+msgstr "Översättningslista"
+
+#: support\mailing-lists.php:25
+#: support\mailing-lists.php:35
+#: support\mailing-lists.php:45
+#: support\mailing-lists.php:55
+#: support\mailing-lists.php:65
+#: support\mailing-lists.php:75
+#, c-format
+msgid "Archive"
+msgstr "Arkiv"
+
+#: support\index.php:18
+#, c-format
+msgid "We rarely sent direct emails but you will get notifications when we ask questions in the bug item."
+msgstr "Vi skickar sällan direkta email men du får notifikationer när vi ställer frågor om fel."
+
+#: downloads\index.php:20
+#, c-format
+msgid "Installer"
+msgstr "Installationsprogram"
+
+#: 404.php:26
+#, c-format
+msgid "<a href=\"%s\">Downloads</a>?"
+msgstr "<a href=\"%s\">Filer</a>?"
+
+#: about\index.php:64
+#: about\screenshots\index.php:7
+#: about\screenshots\index.php:9
+#: engine\page.inc:286
+#, c-format
+msgid "Screenshots"
+msgstr "Skärmdumpar"
+
+#: engine\page.inc:287
+#, c-format
+msgid "WinMerge History"
+msgstr "WinMerge Historia"
+
+#: about\index.php:78
+#, c-format
+msgid "Here is the current <a href=\"%s\">change log</a>."
+msgstr "Här är den aktuella <a href=\"%s\">ändringsloggen</a>."
+
+#: translations\translations.inc:41
+#, c-format
+msgid "File not found."
+msgstr "Filen hittades inte."
+
+#: downloads\index.php:9
+#: downloads\index.php:73
+#, c-format
+msgid "Project File Releases"
+msgstr "Projektfil-releaser"
+
+#: 404.php:9
+#, c-format
+msgid "Error 404 (Page Not Found)"
+msgstr "Fel 404 (Sida hittades inte)"
+
+#: downloads\index.php:52
+#, c-format
+msgid "The easiest way to install WinMerge is to download and run the Installer. Read the <a href=\"%s\">online manual</a> for help using it."
+msgstr "Det enklaste sättet att installera WinMerge är att ladda ner och köra installationsprogrammet. Läs <a href=\"%s\">onlinemanualen</a> för hjälp att använda den."
+
+#: about\screenshots\index.php:23
+#, c-format
+msgid "In the tree view, folders are expandable and collapsible, containing files and subfolders. This is useful for an easier navigation in deeply nested directory structures. <em>The tree view is available only in recursive compares."
+msgstr "I trädfönstret, är kataloger expanderbara och imploderbara, innehållande filer och underkataloger. Detta är användbart för enkel navigation i djupt liggande katalogstrukturer. <em>Trädfönstret är bara tillgändligt i rekursiva jämförelser."
+
+#: index.php:42
+#: engine\page.inc:262
+#: support\index.php:8
+#: support\index.php:10
+#, c-format
+msgid "Support"
+msgstr "Support"
+
+#: about\index.php:72
+#, c-format
+msgid "Just download the <a href=\"%s\">installer</a> and double-click it."
+msgstr "Ladda bara ner <a href=\"%s\">installationsprogrammet</a> och dubbelklicka på det."
+
+#: downloads\source-code.php:34
+#, c-format
+msgid "You can <a href=\"%1$s\">browse the source code</a> with a web browser or you can check out the whole code by clicking on one of the following links (if you have <a href=\"%2$s\">TortoiseSVN</a> installed):"
+msgstr "Du kan <a href=\"%1$s\">titta på källkoden</a> med en webläsare eller du kan hämta hela källkoden genom att klicka på en av följande länkar (om du har <a href=\"%2$s\">TortoiseSVN</a> installerad):"
+
+#: downloads\source-code.php:5
+#, c-format
+msgid "Download the source code of WinMerge, which is released under the GNU General Public License."
+msgstr "Ladda ner källkoden för WinMerge, som är släppt under GNU General Public licensen."
+
+#: index.php:46
+#, c-format
+msgid "WinMerge is an open source project, which means that the program is maintained and developed by volunteers."
+msgstr "WinMerge är ett Open Source-projekt, vilket betyder att programmet är underhållet och utvecklat av frivilliga."
+
+#: about\index.php:24
+#, c-format
+msgid "Tabbed interface"
+msgstr "Tabbgränssnitt"
+
+#: about\index.php:33
+#, c-format
+msgid "Location pane shows map of files compared"
+msgstr "Skillnadsfält visar en karta på jämförda filer"
+
+#: about\screenshots\index.php:17
+#, c-format
+msgid "WinMerge allows selecting/opening paths in several ways. Using the Open-dialog is just one of them."
+msgstr "WinMerge tillåter val/öppning av sökvägar på olika sätt. Att använda Öppna-dialogen är bara ett av dem."
+
+#: about\index.php:77
+#, c-format
+msgid "For information on using WinMerge, see our <a href=\"%s\">online Manual</a>, or you can use the local help file (just press <code>F1</code> inside WinMerge) for offline use."
+msgstr "För information om att använda WinMerge, se vår <a href=\"%s\">online Manual</a>, eller använd den lokala hjälpfilen (tryck bara på <code>F1</code> i WinMerge) för fristående användning."
+
+#: about\index.php:73
+#, c-format
+msgid "Or you may simply unzip the <a href=\"%s\">binary zip package</a> into the desired location, and run <code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>)."
+msgstr "Eller du kan enkelt packa upp <a href=\"%s\">det binära zip-paketet</a> till den önskade platsen, och köra <code>WinMergeU.exe</code> (utom för Windows 98/ME användare som ska använda <code>WinMerge.exe</code>)."
+
+#: engine\page.inc:309
+#: support\tracker-shortcuts.php:7
+#: support\tracker-shortcuts.php:9
+#, c-format
+msgid "Tracker Shortcuts"
+msgstr "Trackergenvägar"
+
+#: engine\page.inc:310
+#: support\index.php:37
+#, c-format
+msgid "Donate"
+msgstr "Donera"
+
+#: about\index.php:45
+#, c-format
+msgid "Version Control"
+msgstr "Versionskontroll"
+
+#: translations\translations.inc:81
+#: translations\translations_branch.inc:49
+#, c-format
+msgid "Translated: %d%%"
+msgstr "Översatt: %d%%"
+
+#: about\screenshots\index.php:30
+#: about\screenshots\index.php:31
+#, c-format
+msgid "Splash Screen"
+msgstr "Startskärm"
+
+#: about\license.php:33
+#, c-format
+msgid "The Open Source Definition"
+msgstr "Open Source definitionen"
+
+#: engine\page.inc:258
+#, c-format
+msgid "Home"
+msgstr "Hem"
+
+#: index.php:6
+#, c-format
+msgid "WinMerge is an Open Source differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle."
+msgstr "WinMerge är ett Open Source skillnads och lägg ihop-verktyg för Windows. WinMerge kan jämföra både kataloger och filer, presentera skillnader i ett visuellt textformat som är lätt att förstå och hantera."
+
+#: downloads\index.php:67
+#, c-format
+msgid "Beta Versions"
+msgstr "Beta-versioner"
+
+#: about\index.php:6
+#, c-format
+msgid "WinMerge, about, features, file compare, folder compare, version control, screenshots, installation"
+msgstr "WinMerge, om, funktioner, filjämförelse, katalogjämförelse, versionskontroll, skärmdumpar, installation"
+
+#: engine\page.inc:286
+#, c-format
+msgid "WinMerge Screenshots"
+msgstr "WinMerge skärmdumpar"
+
+#: translations\index.php:7
+#: translations\status_trunk.php:7
+#: translations\status_trunk.php:9
+#, c-format
+msgid "Translations Status (Unstable Trunk)"
+msgstr "Översättningsstatus (Instabil Trunk)"
+
+#: support\index.php:12
+#, c-format
+msgid "A other way is a subscription to the <a href=\"%s\">support mailing list</a>."
+msgstr "Ett annat sätt är att prenumerera på <a href=\"%s\">supportmailinglistan</a>."
+
+#: about\screenshots\index.php:5
+#, c-format
+msgid "Screenshots from WinMerge features like file comparison, folder comparison results and location pane."
+msgstr "Skärmdumpar från WinMerge funktioner som filjämförelse, katalogjämförelseresultat och skillnadsfält."
+
+#: translations\translations.inc:85
+#: translations\translations_branch.inc:53
+#, c-format
+msgid "Untranslated: %d%%"
+msgstr "Oöversatt: %d%%"
+
+#: index.php:43
+#, c-format
+msgid "If you need support, look at our <a href=\"%s\">support page</a> for more information how you can get it."
+msgstr "Om du behöver support, titta på vår <a href=\"%s\">supportsida</a> för mer information om hur du kan få det."
+
+#: engine\page.inc:315
+#, c-format
+msgid "Status (Stable Branch)"
+msgstr "Status (Stabil gren)"
+
+#: about\index.php:47
+#, c-format
+msgid "Creates patch files (Normal-, Context- and Unified formats)"
+msgstr "Skapar patchfiler (i Normal-, Context- och Unified format)"
+
+#: translations\instructions.php:9
+#, c-format
+msgid "The translations instructions are currently not available..."
+msgstr "Översättningsinstruktionerna är nu inte tillgängliga..."
+
+#: support\tracker-shortcuts.php:13
+#, c-format
+msgid "Bug"
+msgstr "Fel"
+
+#: downloads\source-code.php:6
+#, c-format
+msgid "WinMerge, free, download, source code, GPL, Subversion, SVN, TortoiseSVN"
+msgstr "WinMerge, fri, ladda ner, källkod, GPL, Subversion, SVN, TortoiseSVN"
+
+#: docs\releasenotes.php:5
+#, c-format
+msgid "The release notes are a short summary of important changes, enhancements, bug fixes and known issues in the current WinMerge release."
+msgstr "Releasenoteringarna är en kort sammanfattning av viktiga förändringar, förbättringar, felfixar och kända problem i den aktuella WinMerge releasen."
+
+#: docs\changelog.php:6
+#, c-format
+msgid "WinMerge, change log, changes, release, tracker item, revision number"
+msgstr "WinMerge, ändringslog, ändringar, releaser, trackerobjekt, revisionsnummer"
+
+#: docs\releasenotes.php:6
+#, c-format
+msgid "WinMerge, release notes, summary, changes, enhancements, bug fixes, known issues, release"
+msgstr "WinMerge, releasenoteringar, sammanfattning, ändringar, förbättringar, felfixar, kända problem, releaser"
+
+#: about\index.php:57
+#, c-format
+msgid "Localizable interface"
+msgstr "Översättningsbart gränssnitt"
+
+#: about\index.php:56
+#, c-format
+msgid "Plugin support"
+msgstr "Plugin-stöd"
+
+#: about\index.php:54
+#, c-format
+msgid "Shell Integration (supports 64-bit Windows versions)"
+msgstr "Kommandoradsintegration (stöder 64-bit Windowsversioner)"
+
+#: about\index.php:55
+#, c-format
+msgid "Archive file support using 7-Zip"
+msgstr "Arkivfilstöd med 7-Zip"
+
+#: support\index.php:11
+#, c-format
+msgid "The <a href=\"%s\">Open Discussion forum</a> is the fastest way to get help. Please be patient, it may take some time for somebody to answer."
+msgstr "<a href=\"%s\">Det öppna diskussionsforumet</a> är snabbaste sättet att få hjälp. Var god och var tålmodig, det kan ta lite tid för någon att svara."
+
+#: support\index.php:21
+#, c-format
+msgid "Tracker Statistics"
+msgstr "Trackerstatistik"
+
+#: engine\page.inc:301
+#, c-format
+msgid "Download WinMerge Source Code"
+msgstr "Ladda ner WinMerges källkod"
+
+#: downloads\index.php:13
+#: downloads\source-code.php:39
+#, c-format
+msgid "WinMerge %s"
+msgstr "WinMerge %s"
+
+#: translations\status_branch.php:14
+#: translations\translations.inc:285
+#, c-format
+msgid "Translators"
+msgstr "Översättare"
+
+#: translations\translations.inc:83
+#: translations\translations.inc:96
+#: translations\translations.inc:134
+#: translations\translations_branch.inc:51
+#: translations\translations_branch.inc:69
+#: translations\translations_branch.inc:119
+#, c-format
+msgid "Fuzzy"
+msgstr "Oklar"
+
+#: downloads\source-code.php:15
+#, c-format
+msgid "WinMerge %s - Source Code"
+msgstr "WinMerge %s - källkod"
+
+#: about\history.php:5
+#, c-format
+msgid "History of WinMerge releases with version numbers, release dates and manuals."
+msgstr ""
+
+#: engine\page.inc:292
+#, c-format
+msgid "WinMerge Manual"
+msgstr "WinMerge manual"
+
+#: 404.php:23
+#, c-format
+msgid "<a href=\"%s\">Change Log</a>?"
+msgstr "<a href=\"%s\">Ändringslog</a>?"
+
+#: about\index.php:27
+#, c-format
+msgid "File Compare"
+msgstr "Filjämförelse"
+
+#: support\tracker-shortcuts.php:41
+#, c-format
+msgid "ID:"
+msgstr "ID:"
+
+#: about\index.php:15
+#, c-format
+msgid "Features"
+msgstr "Funktioner"
+
+#: engine\engine.inc:20
+#, c-format
+msgid "German"
+msgstr "Tysk"
+
+#: support\index.php:14
+#, c-format
+msgid "Please attach as much information as you can: at a minimum, the version number of WinMerge that you are using. If you can, also attach a configuration log which, you can display by clicking <span class=\"guimenu\">Help</span> → <span class=\"guimenuitem\">Configuration</span> in the WinMerge window."
+msgstr "Var god och lägg till så mycket information du kan: som ett minimum, versionsnumret på WinMerge som du använder. Om du kan, lägg också till en konfigurationslog ,som du kan visa genom att klicka på <span class=\"guimenu\">Hjälp</span> → <span class=\"guimenuitem\">Konfiguration</span> i WinMerges fönster."
+
+#: engine\page.inc:258
+#: engine\page.inc:280
+#, c-format
+msgid "WinMerge Home"
+msgstr "WinMerges hemsida"
+
+#: about\index.php:19
+#, c-format
+msgid "General"
+msgstr "Generellt"
+
+#: docs\index.php:11
+#, c-format
+msgid "The <a href=\"%s\">manual</a> explains how to use WinMerge, and documents its capabilities and limitations."
+msgstr "<a href=\"%s\">Manualen</a> förklarar hur man ska använda WinMerge, och dokument dess kapacitet och begränsningar."
+
+#: engine\page.inc:299
+#, c-format
+msgid "WinMerge"
+msgstr "WinMerge"
+
+#: support\tracker-shortcuts.php:17
+#, c-format
+msgid "Todo Item"
+msgstr "Att göra objekt"
+
+#: support\mailing-lists.php:67
+#, c-format
+msgid "This is the list where participating developers of the WinMerge meet and discuss issues, code changes/additions, etc."
+msgstr "Detta är listan där deltagande utvecklare av WinMerge möts och diskuterar problem, kodändringar/tillägg, osv."
+
+#: about\license.php:5
+#, c-format
+msgid "WinMerge is Open Source software under the GNU General Public License. This means everybody can download the source code and improve and modify them."
+msgstr "WinMerge är ett Open Source program under GNU General Public License. Detta betyder att alla kan ladda ner källkoden och förbättra och ändra i den."
+
+#: engine\page.inc:300
+#, c-format
+msgid "Plugins"
+msgstr "Plugins"
+
+#: support\mailing-lists.php:6
+#, c-format
+msgid "WinMerge, mailing lists, announce, support, user, translate, development, SVN"
+msgstr "WinMerge, mailinglistor, annonsera, support, användare, översätt, utveckling, SVN"
+
+#: about\index.php:67
+#: about\screenshots\index.php:18
+#: about\screenshots\index.php:19
+#, c-format
+msgid "Folder Comparison Results"
+msgstr "Katalogjämförelseresultat"
+
+#: about\index.php:23
+#, c-format
+msgid "Unicode support"
+msgstr "Unicode-stöd"
+
+#: support\index.php:39
+#, c-format
+msgid "But please consider making a <a href=\"%s\">donation</a> to support the continued development of WinMerge."
+msgstr "Men snälla tänk på om du vill göra en <a href=\"%s\">donation</a> för att stödja den fortsatta utvecklingen av WinMerge."
+
+#: about\index.php:21
+#, c-format
+msgid "Supports Microsoft Windows 98/2000/XP/2003/Vista/2008"
+msgstr "Stöder Microsoft Windows 98/2000/XP/2003/Vista/2008"
+
+#: engine\page.inc:260
+#: engine\page.inc:291
+#, c-format
+msgid "WinMerge Documentation"
+msgstr "WinMerge Dokumentation"
+
+#: downloads\source-code.php:11
+#, c-format
+msgid "WinMerge is released under the <a href=\"%s\">GNU General Public License</a>. That means you can get the whole source code and can build the program yourself."
+msgstr "WinMerge är släppt under <a href=\"%s\">GNU General Public License</a>. Detta betyder att du kan hämta hela källkoden och bygga programmet själv."
+
+#: about\index.php:40
+#, c-format
+msgid "Fast compare using file sizes and dates"
+msgstr "Snabb jämförelse med filstorlek och datum"
+
+#: support\mailing-lists.php:24
+#: support\mailing-lists.php:34
+#: support\mailing-lists.php:44
+#: support\mailing-lists.php:54
+#: support\mailing-lists.php:64
+#: support\mailing-lists.php:74
+#, c-format
+msgid "Unsubscribe"
+msgstr "Avbryt prenumeration"
+
+#: about\license.php:14
+#, c-format
+msgid "GNU General Public License"
+msgstr "GNU General Public License"
+
+#: translations\translations.inc:85
+#: translations\translations.inc:97
+#: translations\translations.inc:135
+#: translations\translations_branch.inc:53
+#: translations\translations_branch.inc:70
+#: translations\translations_branch.inc:120
+#, c-format
+msgid "Untranslated"
+msgstr "Oöversatt"
+
+#: about\screenshots\index.php:24
+#: about\screenshots\index.php:25
+#, c-format
+msgid "Highlight Line Diff"
+msgstr "Markera radskillnad"
+
+#: index.php:15
+#: about\index.php:66
+#: about\screenshots\index.php:12
+#: about\screenshots\index.php:13
+#, c-format
+msgid "File Comparison"
+msgstr "Filjänförelse"
+
+#: support\mailing-lists.php:37
+#, c-format
+msgid "You should ask all your support questions on this list."
+msgstr "Du bör ställa alla dina supportfrågor på denna lista."
+
+#: about\index.php:52
+#, c-format
+msgid "Other"
+msgstr "Andra"
+
+#: 404.php:27
+#, c-format
+msgid "<a href=\"%s\">Support</a>?"
+msgstr "<a href=\"%s\">Support</a>?"
+
+#: docs\index.php:6
+#, c-format
+msgid "WinMerge, documentation, manual, release notes, known issues, change log, development wiki"
+msgstr "WinMerge, dokumentation, manual, releasenoteringar, kända problem, ändringslog, utvecklings-Wiki"
+
+#: support\index.php:7
+#, c-format
+msgid "WinMerge, support, discussion forums, mailing lists, tracker, donate, bugs, support requests, patches, feature requests, todo, open source, sourceforge.net"
+msgstr "WinMerge, support, discussionsforum, mailinglistor, tracker, donera, fel, supportäskanden, patchar, funktionsäskanden, att göra, Open Source, sourceforge.net"
+
+#: downloads\index.php:31
+#, c-format
+msgid "Runtimes"
+msgstr "Körfiler"
+
+#: about\index.php:49
+#, c-format
+msgid "Rudimentary Visual SourceSafe and Rational ClearCase integration"
+msgstr "Enkel Visual SourceSafe och Rational ClearCase integration"
+
+#: translations\translations.inc:180
+#: translations\translations_branch.inc:106
+#, c-format
+msgid "Total: %d"
+msgstr "Totalt: %d"
+
+#: support\mailing-lists.php:72
+#, c-format
+msgid "High Traffic"
+msgstr "Hög trafik"
+
+#: 404.php:18
+#, c-format
+msgid "<a href=\"%s\">Screenshots</a>?"
+msgstr "<a href=\"%s\">Skärmdumpar</a>?"
+
+#: docs\index.php:16
+#: engine\page.inc:296
+#, c-format
+msgid "Development Wiki"
+msgstr "UtvecklingsWiki"
+
+#: about\index.php:69
+#, c-format
+msgid "See the <a href=\"%s\">screenshots page</a> for more screenshots."
+msgstr "Se <a href=\"%s\">skärmdumparsidan</a> för mer skärmdumpar."
+
+#: index.php:37
+#: downloads\index.php:88
+#, c-format
+msgid "Y-m-d"
+msgstr "Y.m.d"
+
+#: translations\instructions.php:5
+#: translations\instructions.php:8
+#, c-format
+msgid "Translations instructions"
+msgstr "Översättningsinstruktioner"
+
+#: engine\page.inc:307
+#, c-format
+msgid "WinMerge Mailing Lists"
+msgstr "WinMerge brevlistor"
+
+#: downloads\index.php:68
+#, c-format
+msgid "Experimental Builds"
+msgstr "Experimentella versioner"
+
+#: engine\page.inc:310
+#, c-format
+msgid "Donate money to WinMerge"
+msgstr "Donera pengar till WinMerge"
+
+#: downloads\index.php:66
+#, c-format
+msgid "Stable Versions"
+msgstr "Stabila versioner"
+
+#: engine\page.inc:259
+#, c-format
+msgid "About"
+msgstr "Om"
+
+#: about\license.php:7
+#: about\license.php:9
+#: engine\page.inc:288
+#, c-format
+msgid "License"
+msgstr "Licens"
+
+#: downloads\index.php:63
+#, c-format
+msgid "Other Versions"
+msgstr "Andra versioner"
+
+#: engine\page.inc:314
+#, c-format
+msgid "Instructions"
+msgstr "Instruktioner"
+
+#: engine\page.inc:306
+#, c-format
+msgid "Discussion Forums"
+msgstr "Diskussionsforum"
+
+#: support\tracker-shortcuts.php:37
+#, c-format
+msgid "Generate"
+msgstr "Generera"
+
+#: support\index.php:13
+#, c-format
+msgid "If you find a bug, please submit it as a <a href=\"%s\">bug report</a>."
+msgstr "Om du hittar ett fel, var god och skicka den som en <a href=\"%s\">felrapport</a>."
+
+#: downloads\source-code.php:37
+#, c-format
+msgid "Developer Version"
+msgstr "Utvecklarversion"
+
+#: index.php:7
+#, c-format
+msgid "WinMerge, free, open source, Windows, windiff, diff, merge, compare, tool, utility, text, file, folder, directory, compare files, compare folders, merge files, merge folders, diff tool, merge tool, compare tool"
+msgstr "WinMerge, fri, Open Source, Windows, windiff, skillnad, lägg samman, jämför, verktyg, nyttighet, text, fil, folder, katalog, jämför filer, jämför folder, lägg samman filer, lägg samman folder, skillnadsverktyg, lägg samman-verktyg, jämförverktyg"
+
+#: engine\page.inc:227
+#, c-format
+msgid "Download Now!"
+msgstr "Ladda ner nu!"
+
+#: index.php:39
+#, c-format
+msgid "View all news…"
+msgstr "Visa alla nyheter…"
+
+#: about\index.php:37
+#, c-format
+msgid "Folder Compare"
+msgstr "Katalogjämförelse"
+
+#: docs\index.php:12
+#: docs\releasenotes.php:7
+#: docs\releasenotes.php:10
+#: engine\page.inc:293
+#, c-format
+msgid "Release Notes"
+msgstr "Releasenoteringar"
+
+#: engine\page.inc:314
+#, c-format
+msgid "WinMerge Translations Instructions"
+msgstr "WinMerges översättningsinstruktioner"
+
+#: engine\page.inc:293
+#, c-format
+msgid "WinMerge Release Notes"
+msgstr "WinMerge releasenoteringar"
+
+#: index.php:26
+#, c-format
+msgid "WinMerge %s - latest stable version"
+msgstr "WinMerge %s - Aktuell stabil version"
+
+#: translations\index.php:32
+#, c-format
+msgid "If you would like to update any of these translations or add another translation, then please follow <a href=\"%s\">these instructions</a>."
+msgstr "Om du vill uppdatera någon av dessa översättningar eller lägga till en annan översättning, då snälla följ <a href=\"%s\">dessa instruktioner</a>."
+
+#: translations\index.php:31
+#, c-format
+msgid "Translating"
+msgstr "Översätter"
+
+#: about\screenshots\index.php:15
+#: about\screenshots\index.php:16
+#, c-format
+msgid "Open-dialog"
+msgstr "Öppna-dialog"
+
+#: downloads\index.php:90
+#, c-format
+msgid "View all file releases…"
+msgstr "Visa alla filreleaser…"
+
+#: about\index.php:5
+#: about\index.php:12
+#, c-format
+msgid "WinMerge is highly useful for determining what has changed between project versions, and then merging changes between versions. WinMerge can be used as an external differencing/merging tool or as a standalone application."
+msgstr "WinMerge är mycket användbart för att se vad som har ändrats mellan projektversioner, och sedan lägga samman ändringar mellan versioner. WinMerge kan användas som en extern skillnads/lägga ihop-verktyg eller som en självständig applikation."
+
+#: downloads\source-code.php:7
+#: downloads\source-code.php:10
+#, c-format
+msgid "Download Source Code"
+msgstr "Ladda ner källkod"
+
+#: support\mailing-lists.php:23
+#: support\mailing-lists.php:33
+#: support\mailing-lists.php:43
+#: support\mailing-lists.php:53
+#: support\mailing-lists.php:63
+#: support\mailing-lists.php:73
+#, c-format
+msgid "Subscribe"
+msgstr "Prenumerera"
+
+#: support\mailing-lists.php:16
+#: support\mailing-lists.php:60
+#, c-format
+msgid "Development List"
+msgstr "Utvecklingslista"
+
+#: about\index.php:34
+#, c-format
+msgid "Moved lines detection"
+msgstr "Flyttade rader detektering"
+
+#: downloads\index.php:69
+#, c-format
+msgid "(by PortableApps.com)"
+msgstr "(av PortableApps.com)"
+
+#: about\license.php:10
+#, c-format
+msgid "WinMerge is <a href=\"%1$s\">Open Source</a> software under the <a href=\"%2$s\">GNU General Public License</a>."
+msgstr "WinMerge är <a href=\"%1$s\">Open Source</a> programvara under <a href=\"%2$s\">GNU General Public License</a>."
+
+#: engine\page.inc:288
+#, c-format
+msgid "WinMerge License"
+msgstr "WinMerge licens"
+
+#: about\history.php:6
+#, c-format
+msgid "WinMerge, history, version number, release date, manual, users guide"
+msgstr "WinMerge, historia, versionsnummer, releasedatum, manual, användarguide"
+
+#: downloads\index.php:10
+#: downloads\index.php:12
+#: engine\page.inc:299
+#, c-format
+msgid "Download WinMerge"
+msgstr "Ladda ner WinMerge"
+
+#: engine\page.inc:366
+#, c-format
+msgid "Bookmark this on Delicious"
+msgstr "Bokmärk detta på Delicious"
+
+#: about\screenshots\index.php:14
+#, c-format
+msgid "File compare window is basically two files opened to editor into two horizontal panes. Editing allows user to easily do small changes without need to open files to other editor or development environment."
+msgstr "Filjämförfönstret är i huvudsak två filer öppnade i en editor i två horisontella fält. Editering låter användare enkelt göra små ändringar utan behov att öppna filer i annan editor eller utvecklingsmiljö."
+
+#~ msgid "Total: %s"
+#~ msgstr "Totalt: %s"
+
Property changes on: trunk/Translations/Web/se.po
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/Web/engine/engine.inc
===================================================================
--- trunk/Web/engine/engine.inc 2009-08-26 16:53:15 UTC (rev 6969)
+++ trunk/Web/engine/engine.inc 2009-08-27 14:39:47 UTC (rev 6970)
@@ ...
[truncated message content] |
|
From: <ge...@us...> - 2009-08-26 16:53:30
|
Revision: 6969
http://winmerge.svn.sourceforge.net/winmerge/?rev=6969&view=rev
Author: gerundt
Date: 2009-08-26 16:53:15 +0000 (Wed, 26 Aug 2009)
Log Message:
-----------
Update web PO(T) files
Modified Paths:
--------------
trunk/Translations/Web/de.po
trunk/Translations/Web/en-US.pot
Modified: trunk/Translations/Web/de.po
===================================================================
--- trunk/Translations/Web/de.po 2009-08-26 16:13:13 UTC (rev 6968)
+++ trunk/Translations/Web/de.po 2009-08-26 16:53:15 UTC (rev 6969)
@@ -12,7 +12,7 @@
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2009-08-21 19:45+0000\n"
+"PO-Revision-Date: 2009-08-26 18:51+0100\n"
"Last-Translator: Tim Gerundt <tim at gerundt.de>\n"
"Language-Team: German <win...@li...>\n"
"MIME-Version: 1.0\n"
@@ -27,6 +27,11 @@
msgid "Exe-Format (%s MB)"
msgstr "Exe-Format (%s MB)"
+#: 404.php:13
+#, c-format
+msgid "This site has recently undergone a major re-working, so that might explain why you got this page instead."
+msgstr ""
+
#: translations\index.php:36
#, c-format
msgid "Status"
@@ -57,6 +62,11 @@
msgid "What is WinMerge?"
msgstr "Was ist WinMerge?"
+#: support\index.php:15
+#, c-format
+msgid "Good information in a bug report makes it more likely that your bug will be fixed quickly."
+msgstr ""
+
#: about\index.php:30
#, c-format
msgid "Flexible editor with syntax highlighting, line numbers and word-wrap"
@@ -67,10 +77,17 @@
msgid "Handles Windows, Unix and Mac text file formats"
msgstr ""
+#: translations\index.php:6
+#: translations\status_branch.php:7
+#: translations\status_branch.php:10
+#, c-format
+msgid "Translations Status (Stable Branch)"
+msgstr ""
+
#: engine\page.inc:295
#, c-format
msgid "WinMerge Change Log"
-msgstr ""
+msgstr "WinMerge Versionshistorie"
#: about\screenshots\index.php:27
#: about\screenshots\index.php:28
@@ -114,6 +131,12 @@
msgid "Subscribers to this list get notices of each and every code change commited to Subversion."
msgstr ""
+#: support\mailing-lists.php:13
+#: support\mailing-lists.php:30
+#, c-format
+msgid "Support List"
+msgstr "Support-Liste"
+
#: engine\page.inc:302
#, c-format
msgid "WinMerge PAD File"
@@ -152,7 +175,7 @@
#: about\screenshots\index.php:32
#, c-format
msgid "WinMerge 2.8 has a new professional looking splash screen."
-msgstr ""
+msgstr "WinMerge 2.8 hat einen neuen, professionell aussehenden Startbildschirm."
#: about\index.php:42
#, c-format
@@ -182,10 +205,9 @@
msgid "This list is only for announcing new releases of WinMerge."
msgstr ""
-#: support\mailing-lists.php:12
-#: support\mailing-lists.php:20
+#: 404.php:19
#, c-format
-msgid "Announce List"
+msgid "<a href=\"%s\">Documentation</a>?"
msgstr ""
#: support\mailing-lists.php:57
@@ -217,6 +239,11 @@
msgid "Installation"
msgstr "Installation"
+#: support\index.php:19
+#, c-format
+msgid "Wish list items on the <a href=\"%s\">feature request list</a> will also be considered, but we make absolutely no promises."
+msgstr ""
+
#: about\index.php:58
#, c-format
msgid "<a href=\"%s\">Online manual</a> and installed HTML Help manual"
@@ -258,21 +285,19 @@
msgid "We require registering because anonymous submissions caused a lot of spam and also because there were no possibility to contact people for asking more information."
msgstr ""
-#: engine\page.inc:307
-#: support\mailing-lists.php:7
-#: support\mailing-lists.php:9
+#: docs\index.php:5
#, c-format
-msgid "Mailing Lists"
-msgstr "Verteilerlisten"
+msgid "Documentation from WinMerge like manual, release notes, change log and development wiki."
+msgstr ""
#: about\index.php:41
#, c-format
msgid "Compares one folder or includes all subfolders"
msgstr ""
-#: support\index.php:15
+#: 404.php:12
#, c-format
-msgid "Good information in a bug report makes it more likely that your bug will be fixed quickly."
+msgid "For some reason (mis-typed URL, faulty referral from another site, out-of-date search engine listing or we simply deleted a file) the page you were looking for could not be found."
msgstr ""
#: index.php:19
@@ -339,19 +364,21 @@
msgid "Feature Request"
msgstr ""
-#: support\index.php:11
+#: engine\page.inc:307
+#: support\mailing-lists.php:7
+#: support\mailing-lists.php:9
#, c-format
-msgid "The <a href=\"%s\">Open Discussion forum</a> is the fastest way to get help. Please be patient, it may take some time for somebody to answer."
-msgstr ""
+msgid "Mailing Lists"
+msgstr "Verteilerlisten"
#: about\index.php:31
#, c-format
msgid "Highlights differences inside lines"
msgstr ""
-#: translations\index.php:31
+#: 404.php:28
#, c-format
-msgid "Translating"
+msgid "<a href=\"%s\">Translations</a>?"
msgstr ""
#: translations\translations.inc:38
@@ -389,9 +416,9 @@
msgid "<a href=\"%1$s\">WinMerge %2$s</a> is the latest stable version, and is recommended for most users."
msgstr ""
-#: index.php:47
+#: index.php:48
#, c-format
-msgid "If you are interested in contributing work to the project, see our <a href=\"%s\">developer page</a> for further information on how you may contribute."
+msgid "In addition, WinMerge is translated into a number of different languages. See our <a href=\"%s\">information on translating WinMerge</a> into your own language."
msgstr ""
#: engine\engine.inc:19
@@ -442,10 +469,10 @@
msgid "Language"
msgstr "Sprache"
-#: translations\instructions.php:5
-#: translations\instructions.php:8
+#: support\mailing-lists.php:12
+#: support\mailing-lists.php:20
#, c-format
-msgid "Translations instructions"
+msgid "Announce List"
msgstr ""
#: engine\page.inc:316
@@ -475,7 +502,7 @@
#: engine\page.inc:295
#, c-format
msgid "Change Log"
-msgstr ""
+msgstr "Versionshistorie"
#: downloads\index.php:69
#, c-format
@@ -493,6 +520,11 @@
msgid "The change log is a more complete list of changes in the last WinMerge releases."
msgstr ""
+#: 404.php:15
+#, c-format
+msgid "Were you looking for..."
+msgstr ""
+
#: downloads\index.php:8
#, c-format
msgid "WinMerge, free, download, Windows, setup, installer, binaries, runtimes, stable, beta, experimental, portable"
@@ -508,11 +540,16 @@
msgid "The current WinMerge version is <strong>%1$s</strong> and was released at <strong>%2$s</strong>."
msgstr ""
-#: index.php:7
+#: 404.php:22
#, c-format
-msgid "WinMerge, free, open source, Windows, windiff, diff, merge, compare, tool, utility, text, file, folder, directory, compare files, compare folders, merge files, merge folders, diff tool, merge tool, compare tool"
+msgid "<a href=\"%s\">Release Notes</a>?"
msgstr ""
+#: 404.php:11
+#, c-format
+msgid "Page Not Found..."
+msgstr "Seite nicht gefunden..."
+
#: support\index.php:16
#, c-format
msgid "You must <a href=\"%s\">register with SourceForge.net</a> before posting a bug report (registration is free)."
@@ -545,6 +582,11 @@
msgid "Translations"
msgstr "Übersetzungen"
+#: support\index.php:38
+#, c-format
+msgid "Since WinMerge is an <a href=\"%s\">Open Source</a> project, you may use it free of charge."
+msgstr ""
+
#: engine\page.inc:282
#, c-format
msgid "Project Page"
@@ -564,9 +606,9 @@
msgid "WinMerge Translations"
msgstr "WinMerge Übersetzungen"
-#: support\index.php:19
+#: engine\page.inc:308
#, c-format
-msgid "Wish list items on the <a href=\"%s\">feature request list</a> will also be considered, but we make absolutely no promises."
+msgid "WinMerge Tracker"
msgstr ""
#: support\mailing-lists.php:47
@@ -618,6 +660,11 @@
msgid "Translator(s)"
msgstr "Übersetzer"
+#: 404.php:21
+#, c-format
+msgid "<a href=\"%s\">Manual</a>?"
+msgstr ""
+
#: docs\index.php:7
#: docs\index.php:9
#: engine\page.inc:260
@@ -752,9 +799,9 @@
msgid "User List"
msgstr "Benutzer-Liste"
-#: index.php:48
+#: index.php:47
#, c-format
-msgid "In addition, WinMerge is translated into a number of different languages. See our <a href=\"%s\">information on translating WinMerge</a> into your own language."
+msgid "If you are interested in contributing work to the project, see our <a href=\"%s\">developer page</a> for further information on how you may contribute."
msgstr ""
#: translations\translations.inc:182
@@ -770,13 +817,13 @@
#: downloads\index.php:60
#, c-format
msgid "Admin rights for the installer"
-msgstr ""
+msgstr "Administrationsrechte für den Setup"
#: support\mailing-lists.php:15
#: support\mailing-lists.php:50
#, c-format
msgid "Translate List"
-msgstr ""
+msgstr "Übersetzungs-Liste"
#: support\mailing-lists.php:25
#: support\mailing-lists.php:35
@@ -798,10 +845,10 @@
msgid "Installer"
msgstr "Setup"
-#: index.php:26
+#: 404.php:26
#, c-format
-msgid "WinMerge %s - latest stable version"
-msgstr "WinMerge %s - Aktuelle stabile Version"
+msgid "<a href=\"%s\">Downloads</a>?"
+msgstr ""
#: about\index.php:64
#: about\screenshots\index.php:7
@@ -832,11 +879,10 @@
msgid "Project File Releases"
msgstr "Projekt-Dateifreigaben"
-#: support\mailing-lists.php:13
-#: support\mailing-lists.php:30
+#: 404.php:9
#, c-format
-msgid "Support List"
-msgstr ""
+msgid "Error 404 (Page Not Found)"
+msgstr "Fehler 404 (Seite nicht gefunden)"
#: downloads\index.php:52
#, c-format
@@ -917,7 +963,7 @@
#: about\index.php:45
#, c-format
msgid "Version Control"
-msgstr ""
+msgstr "Versionskontrolle"
#: translations\translations.inc:81
#: translations\translations_branch.inc:49
@@ -929,7 +975,7 @@
#: about\screenshots\index.php:31
#, c-format
msgid "Splash Screen"
-msgstr ""
+msgstr "Startbildschirm"
#: about\license.php:33
#, c-format
@@ -984,9 +1030,9 @@
msgid "Untranslated: %d%%"
msgstr "Unübersetzt: %d%%"
-#: about\index.php:54
+#: index.php:43
#, c-format
-msgid "Shell Integration (supports 64-bit Windows versions)"
+msgid "If you need support, look at our <a href=\"%s\">support page</a> for more information how you can get it."
msgstr ""
#: engine\page.inc:315
@@ -1039,9 +1085,9 @@
msgid "Plugin support"
msgstr "Plugin-Unterstützung"
-#: index.php:43
+#: about\index.php:54
#, c-format
-msgid "If you need support, look at our <a href=\"%s\">support page</a> for more information how you can get it."
+msgid "Shell Integration (supports 64-bit Windows versions)"
msgstr ""
#: about\index.php:55
@@ -1049,11 +1095,9 @@
msgid "Archive file support using 7-Zip"
msgstr ""
-#: translations\index.php:6
-#: translations\status_branch.php:7
-#: translations\status_branch.php:10
+#: support\index.php:11
#, c-format
-msgid "Translations Status (Stable Branch)"
+msgid "The <a href=\"%s\">Open Discussion forum</a> is the fastest way to get help. Please be patient, it may take some time for somebody to answer."
msgstr ""
#: support\index.php:21
@@ -1103,6 +1147,11 @@
msgid "WinMerge Manual"
msgstr "WinMerge Handbuch"
+#: 404.php:23
+#, c-format
+msgid "<a href=\"%s\">Change Log</a>?"
+msgstr ""
+
#: about\index.php:27
#, c-format
msgid "File Compare"
@@ -1116,7 +1165,7 @@
#: about\index.php:15
#, c-format
msgid "Features"
-msgstr ""
+msgstr "Funktionen"
#: engine\engine.inc:20
#, c-format
@@ -1137,7 +1186,7 @@
#: about\index.php:19
#, c-format
msgid "General"
-msgstr ""
+msgstr "Allgemein"
#: docs\index.php:11
#, c-format
@@ -1207,9 +1256,9 @@
msgid "WinMerge is released under the <a href=\"%s\">GNU General Public License</a>. That means you can get the whole source code and can build the program yourself."
msgstr ""
-#: engine\page.inc:308
+#: about\index.php:40
#, c-format
-msgid "WinMerge Tracker"
+msgid "Fast compare using file sizes and dates"
msgstr ""
#: support\mailing-lists.php:24
@@ -1235,7 +1284,7 @@
#: translations\translations_branch.inc:120
#, c-format
msgid "Untranslated"
-msgstr ""
+msgstr "Unübersetzt"
#: about\screenshots\index.php:24
#: about\screenshots\index.php:25
@@ -1261,9 +1310,9 @@
msgid "Other"
msgstr ""
-#: about\index.php:40
+#: 404.php:27
#, c-format
-msgid "Fast compare using file sizes and dates"
+msgid "<a href=\"%s\">Support</a>?"
msgstr ""
#: docs\index.php:6
@@ -1287,6 +1336,7 @@
msgstr ""
#: translations\translations.inc:180
+#: translations\translations_branch.inc:106
#, c-format
msgid "Total: %d"
msgstr "Gesamt: %d"
@@ -1296,6 +1346,11 @@
msgid "High Traffic"
msgstr ""
+#: 404.php:18
+#, c-format
+msgid "<a href=\"%s\">Screenshots</a>?"
+msgstr ""
+
#: docs\index.php:16
#: engine\page.inc:296
#, c-format
@@ -1313,10 +1368,11 @@
msgid "Y-m-d"
msgstr "d.m.Y"
-#: translations\translations_branch.inc:106
+#: translations\instructions.php:5
+#: translations\instructions.php:8
#, c-format
-msgid "Total: %s"
-msgstr "Gesamt: %s"
+msgid "Translations instructions"
+msgstr ""
#: engine\page.inc:307
#, c-format
@@ -1380,9 +1436,9 @@
msgid "Developer Version"
msgstr "Entwickler-Version"
-#: docs\index.php:5
+#: index.php:7
#, c-format
-msgid "Documentation from WinMerge like manual, release notes, change log and development wiki."
+msgid "WinMerge, free, open source, Windows, windiff, diff, merge, compare, tool, utility, text, file, folder, directory, compare files, compare folders, merge files, merge folders, diff tool, merge tool, compare tool"
msgstr ""
#: engine\page.inc:227
@@ -1418,16 +1474,21 @@
msgid "WinMerge Release Notes"
msgstr ""
-#: support\index.php:38
+#: index.php:26
#, c-format
-msgid "Since WinMerge is an <a href=\"%s\">Open Source</a> project, you may use it free of charge."
-msgstr ""
+msgid "WinMerge %s - latest stable version"
+msgstr "WinMerge %s - Aktuelle stabile Version"
#: translations\index.php:32
#, c-format
msgid "If you would like to update any of these translations or add another translation, then please follow <a href=\"%s\">these instructions</a>."
msgstr ""
+#: translations\index.php:31
+#, c-format
+msgid "Translating"
+msgstr ""
+
#: about\screenshots\index.php:15
#: about\screenshots\index.php:16
#, c-format
@@ -1499,8 +1560,16 @@
msgid "Download WinMerge"
msgstr "WinMerge herunterladen"
+#: engine\page.inc:366
+#, c-format
+msgid "Bookmark this on Delicious"
+msgstr ""
+
#: about\screenshots\index.php:14
#, c-format
msgid "File compare window is basically two files opened to editor into two horizontal panes. Editing allows user to easily do small changes without need to open files to other editor or development environment."
msgstr ""
+#~ msgid "Total: %s"
+#~ msgstr "Gesamt: %s"
+
Modified: trunk/Translations/Web/en-US.pot
===================================================================
--- trunk/Translations/Web/en-US.pot 2009-08-26 16:13:13 UTC (rev 6968)
+++ trunk/Translations/Web/en-US.pot 2009-08-26 16:53:15 UTC (rev 6969)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: http://bugs.winmerge.org\n"
-"POT-Creation-Date: 2009-08-21 19:31+0000\n"
+"POT-Creation-Date: 2009-08-26 18:51+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <win...@li...>\n"
@@ -24,6 +24,11 @@
msgid "Exe-Format (%s MB)"
msgstr ""
+#: 404.php:13
+#, c-format
+msgid "This site has recently undergone a major re-working, so that might explain why you got this page instead."
+msgstr ""
+
#: translations\index.php:36
#, c-format
msgid "Status"
@@ -54,6 +59,11 @@
msgid "What is WinMerge?"
msgstr ""
+#: support\index.php:15
+#, c-format
+msgid "Good information in a bug report makes it more likely that your bug will be fixed quickly."
+msgstr ""
+
#: about\index.php:30
#, c-format
msgid "Flexible editor with syntax highlighting, line numbers and word-wrap"
@@ -64,6 +74,13 @@
msgid "Handles Windows, Unix and Mac text file formats"
msgstr ""
+#: translations\index.php:6
+#: translations\status_branch.php:7
+#: translations\status_branch.php:10
+#, c-format
+msgid "Translations Status (Stable Branch)"
+msgstr ""
+
#: engine\page.inc:295
#, c-format
msgid "WinMerge Change Log"
@@ -111,6 +128,12 @@
msgid "Subscribers to this list get notices of each and every code change commited to Subversion."
msgstr ""
+#: support\mailing-lists.php:13
+#: support\mailing-lists.php:30
+#, c-format
+msgid "Support List"
+msgstr ""
+
#: engine\page.inc:302
#, c-format
msgid "WinMerge PAD File"
@@ -179,10 +202,9 @@
msgid "This list is only for announcing new releases of WinMerge."
msgstr ""
-#: support\mailing-lists.php:12
-#: support\mailing-lists.php:20
+#: 404.php:19
#, c-format
-msgid "Announce List"
+msgid "<a href=\"%s\">Documentation</a>?"
msgstr ""
#: support\mailing-lists.php:57
@@ -214,6 +236,11 @@
msgid "Installation"
msgstr ""
+#: support\index.php:19
+#, c-format
+msgid "Wish list items on the <a href=\"%s\">feature request list</a> will also be considered, but we make absolutely no promises."
+msgstr ""
+
#: about\index.php:58
#, c-format
msgid "<a href=\"%s\">Online manual</a> and installed HTML Help manual"
@@ -255,11 +282,9 @@
msgid "We require registering because anonymous submissions caused a lot of spam and also because there were no possibility to contact people for asking more information."
msgstr ""
-#: engine\page.inc:307
-#: support\mailing-lists.php:7
-#: support\mailing-lists.php:9
+#: docs\index.php:5
#, c-format
-msgid "Mailing Lists"
+msgid "Documentation from WinMerge like manual, release notes, change log and development wiki."
msgstr ""
#: about\index.php:41
@@ -267,9 +292,9 @@
msgid "Compares one folder or includes all subfolders"
msgstr ""
-#: support\index.php:15
+#: 404.php:12
#, c-format
-msgid "Good information in a bug report makes it more likely that your bug will be fixed quickly."
+msgid "For some reason (mis-typed URL, faulty referral from another site, out-of-date search engine listing or we simply deleted a file) the page you were looking for could not be found."
msgstr ""
#: index.php:19
@@ -336,9 +361,11 @@
msgid "Feature Request"
msgstr ""
-#: support\index.php:11
+#: engine\page.inc:307
+#: support\mailing-lists.php:7
+#: support\mailing-lists.php:9
#, c-format
-msgid "The <a href=\"%s\">Open Discussion forum</a> is the fastest way to get help. Please be patient, it may take some time for somebody to answer."
+msgid "Mailing Lists"
msgstr ""
#: about\index.php:31
@@ -346,9 +373,9 @@
msgid "Highlights differences inside lines"
msgstr ""
-#: translations\index.php:31
+#: 404.php:28
#, c-format
-msgid "Translating"
+msgid "<a href=\"%s\">Translations</a>?"
msgstr ""
#: translations\translations.inc:38
@@ -386,9 +413,9 @@
msgid "<a href=\"%1$s\">WinMerge %2$s</a> is the latest stable version, and is recommended for most users."
msgstr ""
-#: index.php:47
+#: index.php:48
#, c-format
-msgid "If you are interested in contributing work to the project, see our <a href=\"%s\">developer page</a> for further information on how you may contribute."
+msgid "In addition, WinMerge is translated into a number of different languages. See our <a href=\"%s\">information on translating WinMerge</a> into your own language."
msgstr ""
#: engine\engine.inc:19
@@ -439,10 +466,10 @@
msgid "Language"
msgstr ""
-#: translations\instructions.php:5
-#: translations\instructions.php:8
+#: support\mailing-lists.php:12
+#: support\mailing-lists.php:20
#, c-format
-msgid "Translations instructions"
+msgid "Announce List"
msgstr ""
#: engine\page.inc:316
@@ -490,6 +517,11 @@
msgid "The change log is a more complete list of changes in the last WinMerge releases."
msgstr ""
+#: 404.php:15
+#, c-format
+msgid "Were you looking for..."
+msgstr ""
+
#: downloads\index.php:8
#, c-format
msgid "WinMerge, free, download, Windows, setup, installer, binaries, runtimes, stable, beta, experimental, portable"
@@ -505,11 +537,16 @@
msgid "The current WinMerge version is <strong>%1$s</strong> and was released at <strong>%2$s</strong>."
msgstr ""
-#: index.php:7
+#: 404.php:22
#, c-format
-msgid "WinMerge, free, open source, Windows, windiff, diff, merge, compare, tool, utility, text, file, folder, directory, compare files, compare folders, merge files, merge folders, diff tool, merge tool, compare tool"
+msgid "<a href=\"%s\">Release Notes</a>?"
msgstr ""
+#: 404.php:11
+#, c-format
+msgid "Page Not Found..."
+msgstr ""
+
#: support\index.php:16
#, c-format
msgid "You must <a href=\"%s\">register with SourceForge.net</a> before posting a bug report (registration is free)."
@@ -542,6 +579,11 @@
msgid "Translations"
msgstr ""
+#: support\index.php:38
+#, c-format
+msgid "Since WinMerge is an <a href=\"%s\">Open Source</a> project, you may use it free of charge."
+msgstr ""
+
#: engine\page.inc:282
#, c-format
msgid "Project Page"
@@ -561,9 +603,9 @@
msgid "WinMerge Translations"
msgstr ""
-#: support\index.php:19
+#: engine\page.inc:308
#, c-format
-msgid "Wish list items on the <a href=\"%s\">feature request list</a> will also be considered, but we make absolutely no promises."
+msgid "WinMerge Tracker"
msgstr ""
#: support\mailing-lists.php:47
@@ -615,6 +657,11 @@
msgid "Translator(s)"
msgstr ""
+#: 404.php:21
+#, c-format
+msgid "<a href=\"%s\">Manual</a>?"
+msgstr ""
+
#: docs\index.php:7
#: docs\index.php:9
#: engine\page.inc:260
@@ -747,9 +794,9 @@
msgid "User List"
msgstr ""
-#: index.php:48
+#: index.php:47
#, c-format
-msgid "In addition, WinMerge is translated into a number of different languages. See our <a href=\"%s\">information on translating WinMerge</a> into your own language."
+msgid "If you are interested in contributing work to the project, see our <a href=\"%s\">developer page</a> for further information on how you may contribute."
msgstr ""
#: translations\translations.inc:182
@@ -793,9 +840,9 @@
msgid "Installer"
msgstr ""
-#: index.php:26
+#: 404.php:26
#, c-format
-msgid "WinMerge %s - latest stable version"
+msgid "<a href=\"%s\">Downloads</a>?"
msgstr ""
#: about\index.php:64
@@ -827,10 +874,9 @@
msgid "Project File Releases"
msgstr ""
-#: support\mailing-lists.php:13
-#: support\mailing-lists.php:30
+#: 404.php:9
#, c-format
-msgid "Support List"
+msgid "Error 404 (Page Not Found)"
msgstr ""
#: downloads\index.php:52
@@ -979,9 +1025,9 @@
msgid "Untranslated: %d%%"
msgstr ""
-#: about\index.php:54
+#: index.php:43
#, c-format
-msgid "Shell Integration (supports 64-bit Windows versions)"
+msgid "If you need support, look at our <a href=\"%s\">support page</a> for more information how you can get it."
msgstr ""
#: engine\page.inc:315
@@ -1034,9 +1080,9 @@
msgid "Plugin support"
msgstr ""
-#: index.php:43
+#: about\index.php:54
#, c-format
-msgid "If you need support, look at our <a href=\"%s\">support page</a> for more information how you can get it."
+msgid "Shell Integration (supports 64-bit Windows versions)"
msgstr ""
#: about\index.php:55
@@ -1044,11 +1090,9 @@
msgid "Archive file support using 7-Zip"
msgstr ""
-#: translations\index.php:6
-#: translations\status_branch.php:7
-#: translations\status_branch.php:10
+#: support\index.php:11
#, c-format
-msgid "Translations Status (Stable Branch)"
+msgid "The <a href=\"%s\">Open Discussion forum</a> is the fastest way to get help. Please be patient, it may take some time for somebody to answer."
msgstr ""
#: support\index.php:21
@@ -1098,6 +1142,11 @@
msgid "WinMerge Manual"
msgstr ""
+#: 404.php:23
+#, c-format
+msgid "<a href=\"%s\">Change Log</a>?"
+msgstr ""
+
#: about\index.php:27
#, c-format
msgid "File Compare"
@@ -1202,9 +1251,9 @@
msgid "WinMerge is released under the <a href=\"%s\">GNU General Public License</a>. That means you can get the whole source code and can build the program yourself."
msgstr ""
-#: engine\page.inc:308
+#: about\index.php:40
#, c-format
-msgid "WinMerge Tracker"
+msgid "Fast compare using file sizes and dates"
msgstr ""
#: support\mailing-lists.php:24
@@ -1256,9 +1305,9 @@
msgid "Other"
msgstr ""
-#: about\index.php:40
+#: 404.php:27
#, c-format
-msgid "Fast compare using file sizes and dates"
+msgid "<a href=\"%s\">Support</a>?"
msgstr ""
#: docs\index.php:6
@@ -1282,6 +1331,7 @@
msgstr ""
#: translations\translations.inc:180
+#: translations\translations_branch.inc:106
#, c-format
msgid "Total: %d"
msgstr ""
@@ -1291,6 +1341,11 @@
msgid "High Traffic"
msgstr ""
+#: 404.php:18
+#, c-format
+msgid "<a href=\"%s\">Screenshots</a>?"
+msgstr ""
+
#: docs\index.php:16
#: engine\page.inc:296
#, c-format
@@ -1308,9 +1363,10 @@
msgid "Y-m-d"
msgstr ""
-#: translations\translations_branch.inc:106
+#: translations\instructions.php:5
+#: translations\instructions.php:8
#, c-format
-msgid "Total: %s"
+msgid "Translations instructions"
msgstr ""
#: engine\page.inc:307
@@ -1375,9 +1431,9 @@
msgid "Developer Version"
msgstr ""
-#: docs\index.php:5
+#: index.php:7
#, c-format
-msgid "Documentation from WinMerge like manual, release notes, change log and development wiki."
+msgid "WinMerge, free, open source, Windows, windiff, diff, merge, compare, tool, utility, text, file, folder, directory, compare files, compare folders, merge files, merge folders, diff tool, merge tool, compare tool"
msgstr ""
#: engine\page.inc:227
@@ -1413,9 +1469,9 @@
msgid "WinMerge Release Notes"
msgstr ""
-#: support\index.php:38
+#: index.php:26
#, c-format
-msgid "Since WinMerge is an <a href=\"%s\">Open Source</a> project, you may use it free of charge."
+msgid "WinMerge %s - latest stable version"
msgstr ""
#: translations\index.php:32
@@ -1423,6 +1479,11 @@
msgid "If you would like to update any of these translations or add another translation, then please follow <a href=\"%s\">these instructions</a>."
msgstr ""
+#: translations\index.php:31
+#, c-format
+msgid "Translating"
+msgstr ""
+
#: about\screenshots\index.php:15
#: about\screenshots\index.php:16
#, c-format
@@ -1494,6 +1555,11 @@
msgid "Download WinMerge"
msgstr ""
+#: engine\page.inc:366
+#, c-format
+msgid "Bookmark this on Delicious"
+msgstr ""
+
#: about\screenshots\index.php:14
#, c-format
msgid "File compare window is basically two files opened to editor into two horizontal panes. Editing allows user to easily do small changes without need to open files to other editor or development environment."
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2009-08-26 16:13:25
|
Revision: 6968
http://winmerge.svn.sourceforge.net/winmerge/?rev=6968&view=rev
Author: gerundt
Date: 2009-08-26 16:13:13 +0000 (Wed, 26 Aug 2009)
Log Message:
-----------
Web: Add getLanguagesCount() function to "SimpleTranslate" class
Modified Paths:
--------------
trunk/Web/engine/engine.inc
trunk/Web/engine/page.inc
trunk/Web/engine/simpletranslate.inc
Modified: trunk/Web/engine/engine.inc
===================================================================
--- trunk/Web/engine/engine.inc 2009-08-21 19:10:34 UTC (rev 6967)
+++ trunk/Web/engine/engine.inc 2009-08-26 16:13:13 UTC (rev 6968)
@@ -17,7 +17,7 @@
$translations = new SimpleTranslate;
$translations->setUrlParameter('lang');
$translations->addLanguage('en', __('English'));
- //$translations->addLanguage('de', __('German'), $languagesdir . 'de.po');
+ $translations->addLanguage('de', __('German'), $languagesdir . 'de.po');
if (!$translations->detectLanguageFromUrl()) {
$translations->detectLanguageFromBrowser();
}
Modified: trunk/Web/engine/page.inc
===================================================================
--- trunk/Web/engine/page.inc 2009-08-21 19:10:34 UTC (rev 6967)
+++ trunk/Web/engine/page.inc 2009-08-26 16:13:13 UTC (rev 6968)
@@ -374,19 +374,22 @@
function getLanguages() {
global $translations;
- $temp = "<div id=\"languages\">\n";
- $temp .= "<ul>\n";
- $languages = $translations->getLanguages();
- foreach ($languages as $language) { //for all languages...
- if ($translations->isActiveLanguage($language)) { //if current language...
- $temp .= " <li><strong><a href=\"" . $translations->getLink($language) . "\">" . __($language->getName()) . "</a></strong></li>\n";
+ $temp = "";
+ if ($translations->getLanguagesCount() > 1) { //if at least 2 languages exists...
+ $temp .= "<div id=\"languages\">\n";
+ $temp .= "<ul>\n";
+ $languages = $translations->getLanguages();
+ foreach ($languages as $language) { //for all languages...
+ if ($translations->isActiveLanguage($language)) { //if current language...
+ $temp .= " <li><strong><a href=\"" . $translations->getLink($language) . "\">" . __($language->getName()) . "</a></strong></li>\n";
+ }
+ else { //if NOT current language...
+ $temp .= " <li><a href=\"" . $translations->getLink($language) . "\">" . __($language->getName()) . "</a></li>\n";
+ }
}
- else { //if NOT current language...
- $temp .= " <li><a href=\"" . $translations->getLink($language) . "\">" . __($language->getName()) . "</a></li>\n";
- }
+ $temp .= "</ul>\n";
+ $temp .= "</div> <!-- #languages -->\n";
}
- $temp .= "</ul>\n";
- $temp .= "</div> <!-- #languages -->\n";
return $temp;
}
Modified: trunk/Web/engine/simpletranslate.inc
===================================================================
--- trunk/Web/engine/simpletranslate.inc 2009-08-21 19:10:34 UTC (rev 6967)
+++ trunk/Web/engine/simpletranslate.inc 2009-08-26 16:13:13 UTC (rev 6968)
@@ -116,7 +116,9 @@
$this->_baselanguageid = $id;
}
else { //if normal language...
- $this->_languages[$id] = new SimpleTranslateLanguage($id, $name, $pofile);
+ if (file_exists($pofile) == true) { //if the PO file exists...
+ $this->_languages[$id] = new SimpleTranslateLanguage($id, $name, $pofile);
+ }
}
}
@@ -139,6 +141,13 @@
}
/**
+ * get the languages count...
+ */
+ function getLanguagesCount() {
+ return count($this->_languages);
+ }
+
+ /**
* get the base language ID...
*/
function getBaseLanguageId() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
