BitBucket -> Bitbucket

--HG--
branch : stable

diff --git a/Src/Merge.rc b/Src/Merge.rc
index c0c4b9f..209b835 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1113,7 +1113,7 @@ BEGIN
     CONTROL         "",IDC_SEL_WORDDIFF_TEXT_COLOR,"Button",
                     BS_OWNERDRAW | WS_TABSTOP,199,189,17,14,WS_EX_TRANSPARENT |
                     WS_EX_CLIENTEDGE
-    PUSHBUTTON      "GitHub/BitBucket",IDC_COLORSCHEME_GITHUBBITBUCKET,76,208,70,14
+    PUSHBUTTON      "GitHub/Bitbucket",IDC_COLORSCHEME_GITHUBBITBUCKET,76,208,70,14
     PUSHBUTTON      "Defaults",IDC_COLORDEFAULTS_BTN,146,208,70,14
 END
 

diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po
index e85c723..80bf5a7 100644 (file)
--- a/Translations/WinMerge/Basque.po
+++ b/Translations/WinMerge/Basque.po
@@ -1814,7 +1814,7 @@ msgstr "Hautatutako Hitz Ezberd:"
 
 #: Merge.rc:1116
 #, c-format
-msgid "GitHub/BitBucket"
+msgid "GitHub/Bitbucket"
 msgstr ""
 
 #: Merge.rc:1117

diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po
index 4fa09e6..3f0c929 100644 (file)
--- a/Translations/WinMerge/Brazilian.po
+++ b/Translations/WinMerge/Brazilian.po
@@ -1813,7 +1813,7 @@ msgstr "Diferen
 
 #: Merge.rc:1116
 #, c-format
-msgid "GitHub/BitBucket"
+msgid "GitHub/Bitbucket"
 msgstr ""
 
 #: Merge.rc:1117

diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
index 0b274e0..388d51b 100644 (file)
--- a/Translations/WinMerge/Bulgarian.po
+++ b/Translations/WinMerge/Bulgarian.po
@@ -1811,7 +1811,7 @@ msgstr "
 
 #: Merge.rc:1116
 #, c-format
-msgid "GitHub/BitBucket"
+msgid "GitHub/Bitbucket"
 msgstr ""
 
 #: Merge.rc:1117

diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po
index 74ff6d9..4426ca2 100644 (file)
--- a/Translations/WinMerge/Catalan.po
+++ b/Translations/WinMerge/Catalan.po
@@ -1810,7 +1810,7 @@ msgstr "Paraula diferent seleccionada:"
 
 #: Merge.rc:1116
 #, c-format
-msgid "GitHub/BitBucket"
+msgid "GitHub/Bitbucket"
 msgstr ""
 
 #: Merge.rc:1117

diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
index a5a118e..826fb2a 100644 (file)
--- a/Translations/WinMerge/ChineseSimplified.po
+++ b/Translations/WinMerge/ChineseSimplified.po
@@ -1811,7 +1811,7 @@ msgstr "ѡ
 
 #: Merge.rc:1116
 #, c-format
-msgid "GitHub/BitBucket"
+msgid "GitHub/Bitbucket"
 msgstr ""
 
 #: Merge.rc:1117

diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po
index a556e17..2c9b7d9 100644 (file)
--- a/Translations/WinMerge/ChineseTraditional.po
+++ b/Translations/WinMerge/ChineseTraditional.po
@@ -1819,7 +1819,7 @@ msgstr "
 
 #: Merge.rc:1116
 #, c-format
-msgid "GitHub/BitBucket"
+msgid "GitHub/Bitbucket"
 msgstr ""
 
 #: Merge.rc:1117

diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po
index 7889ac1..5a7e973 100644 (file)
--- a/Translations/WinMerge/Croatian.po
+++ b/Translations/WinMerge/Croatian.po
@@ -1811,7 +1811,7 @@ msgstr "Razlike ozna
 
 #: Merge.rc:1116
 #, c-format
-msgid "GitHub/BitBucket"
+msgid "GitHub/Bitbucket"
 msgstr ""
 
 #: Merge.rc:1117

diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po
index ae56294..498be7a 100644 (file)
--- a/Translations/WinMerge/Czech.po
+++ b/Translations/WinMerge/Czech.po
@@ -1813,7 +1813,7 @@ msgstr "Vybran
 
 #: Merge.rc:1116
 #, c-format
-msgid "GitHub/BitBucket"
+msgid "GitHub/Bitbucket"
 msgstr ""
 
 #: Merge.rc:1117

diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po
index f39374e..b8a24a4 100644 (file)
--- a/Translations/WinMerge/Danish.po
+++ b/Translations/WinMerge/Danish.po
@@ -1816,7 +1816,7 @@ msgstr "Valgte ordforskelle:"
 
 #: Merge.rc:1116
 #, c-format
-msgid "GitHub/BitBucket"
+msgid "GitHub/Bitbucket"
 msgstr ""
 
 #: Merge.rc:1117

diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
index c6d331f..ac9d3d3 100644 (file)
--- a/Translations/WinMerge/Dutch.po
+++ b/Translations/WinMerge/Dutch.po
@@ -1817,7 +1817,7 @@ msgstr "Geselect. woordverschil:"
 
 #: Merge.rc:1116
 #, c-format
-msgid "GitHub/BitBucket"
+msgid "GitHub/Bitbucket"
 msgstr ""
 
 #: Merge.rc:1117

diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
index f82002c..5bd5833 100644 (file)
--- a/Translations/WinMerge/English.pot
+++ b/Translations/WinMerge/English.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2014-02-23 11:57+0000\n"
+"POT-Creation-Date: 2014-02-27 23:16+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
@@ -1807,7 +1807,7 @@ msgstr ""
 
 #: Merge.rc:1116
 #, c-format
-msgid "GitHub/BitBucket"
+msgid "GitHub/Bitbucket"
 msgstr ""
 
 #: Merge.rc:1117

diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po
index aa4ef9a..07a4762 100644 (file)
--- a/Translations/WinMerge/French.po
+++ b/Translations/WinMerge/French.po
@@ -1815,7 +1815,7 @@ msgstr "Mot diff
 
 #: Merge.rc:1116
 #, c-format
-msgid "GitHub/BitBucket"
+msgid "GitHub/Bitbucket"
 msgstr ""
 
 #: Merge.rc:1117

diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po
index cc9a9b6..2e65bcd 100644 (file)
--- a/Translations/WinMerge/Galician.po
+++ b/Translations/WinMerge/Galician.po
@@ -1811,7 +1811,7 @@ msgstr "Diferenza de palabra seleccionada:"
 
 #: Merge.rc:1116
 #, c-format
-msgid "GitHub/BitBucket"
+msgid "GitHub/Bitbucket"
 msgstr ""
 
 #: Merge.rc:1117

diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po
index e13e4a3..3d4961c 100644 (file)
--- a/Translations/WinMerge/German.po
+++ b/Translations/WinMerge/German.po
@@ -1816,7 +1816,7 @@ msgstr "Wortunterschied (Selektiert):"
 
 #: Merge.rc:1116
 #, c-format
-msgid "GitHub/BitBucket"
+msgid "GitHub/Bitbucket"
 msgstr ""
 
 #: Merge.rc:1117

diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po
index 4f6b6a6..c2050c9 100644 (file)
--- a/Translations/WinMerge/Greek.po
+++ b/Translations/WinMerge/Greek.po
@@ -1810,7 +1810,7 @@ msgstr "
 
 #: Merge.rc:1116
 #, c-format
-msgid "GitHub/BitBucket"
+msgid "GitHub/Bitbucket"
 msgstr ""
 
 #: Merge.rc:1117

diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po
index 1a97105..3a70425 100644 (file)
--- a/Translations/WinMerge/Hungarian.po
+++ b/Translations/WinMerge/Hungarian.po
@@ -1811,7 +1811,7 @@ msgstr "Kijel
 
 #: Merge.rc:1116
 #, c-format
-msgid "GitHub/BitBucket"
+msgid "GitHub/Bitbucket"
 msgstr ""
 
 #: Merge.rc:1117

diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po
index 9505075..84e0f78 100644 (file)
--- a/Translations/WinMerge/Italian.po
+++ b/Translations/WinMerge/Italian.po
@@ -1811,7 +1811,7 @@ msgstr "Diff. parole selezionata:"
 
 #: Merge.rc:1116
 #, c-format
-msgid "GitHub/BitBucket"
+msgid "GitHub/Bitbucket"
 msgstr ""
 
 #: Merge.rc:1117

diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po
index e295428..6311e3c 100644 (file)
--- a/Translations/WinMerge/Japanese.po
+++ b/Translations/WinMerge/Japanese.po
@@ -12,8 +12,8 @@ msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2014-02-04 00:45+0900\n"
-"Last-Translator: Takashi Sawanaka <sawanaka@d1.dion.ne.jp>\n"
+"PO-Revision-Date: 2014-02-27 01:17+0900\n"
+"Last-Tranuslator: Takashi Sawanaka <sawanaka@d1.dion.ne.jp>\n"
 "Language-Team: Japanese <winmerge-translate@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CP932\n"
@@ -1819,7 +1819,7 @@ msgstr "
 
 #: Merge.rc:1116
 #, c-format
-msgid "GitHub/BitBucket"
+msgid "GitHub/Bitbucket"
 msgstr ""
 
 #: Merge.rc:1117

diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po
index 7db8475..d1cbede 100644 (file)
--- a/Translations/WinMerge/Korean.po
+++ b/Translations/WinMerge/Korean.po
@@ -1812,7 +1812,7 @@ msgstr "
 
 #: Merge.rc:1116
 #, c-format
-msgid "GitHub/BitBucket"
+msgid "GitHub/Bitbucket"
 msgstr ""
 
 #: Merge.rc:1117

diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po
index 51d3cbb..5c54c1e 100644 (file)
--- a/Translations/WinMerge/Norwegian.po
+++ b/Translations/WinMerge/Norwegian.po
@@ -1811,7 +1811,7 @@ msgstr "Valgt ordforskjell:"
 
 #: Merge.rc:1116
 #, c-format
-msgid "GitHub/BitBucket"
+msgid "GitHub/Bitbucket"
 msgstr ""
 
 #: Merge.rc:1117

diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po
index f35b01a..e7506f7 100644 (file)
--- a/Translations/WinMerge/Persian.po
+++ b/Translations/WinMerge/Persian.po
@@ -1810,7 +1810,7 @@ msgstr " 
 
 #: Merge.rc:1116
 #, c-format
-msgid "GitHub/BitBucket"
+msgid "GitHub/Bitbucket"
 msgstr ""
 
 #: Merge.rc:1117

diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po
index 8240331..e75cc7f 100644 (file)
--- a/Translations/WinMerge/Polish.po
+++ b/Translations/WinMerge/Polish.po
@@ -1812,7 +1812,7 @@ msgstr "Wybrana r
 
 #: Merge.rc:1116
 #, c-format
-msgid "GitHub/BitBucket"
+msgid "GitHub/Bitbucket"
 msgstr ""
 
 #: Merge.rc:1117

diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po
index f4d03c9..1857c2c 100644 (file)
--- a/Translations/WinMerge/Portuguese.po
+++ b/Translations/WinMerge/Portuguese.po
@@ -1810,7 +1810,7 @@ msgstr "Diferen
 
 #: Merge.rc:1116
 #, c-format
-msgid "GitHub/BitBucket"
+msgid "GitHub/Bitbucket"
 msgstr ""
 
 #: Merge.rc:1117

diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po
index 9cb0466..635e780 100644 (file)
--- a/Translations/WinMerge/Romanian.po
+++ b/Translations/WinMerge/Romanian.po
@@ -1811,7 +1811,7 @@ msgstr "Diferen
 
 #: Merge.rc:1116
 #, c-format
-msgid "GitHub/BitBucket"
+msgid "GitHub/Bitbucket"
 msgstr ""
 
 #: Merge.rc:1117

diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po
index 9d5c94e..16e23d2 100644 (file)
--- a/Translations/WinMerge/Russian.po
+++ b/Translations/WinMerge/Russian.po
@@ -1813,7 +1813,7 @@ msgstr "
 
 #: Merge.rc:1116
 #, c-format
-msgid "GitHub/BitBucket"
+msgid "GitHub/Bitbucket"
 msgstr ""
 
 #: Merge.rc:1117

diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po
index 65385c2..2285de2 100644 (file)
--- a/Translations/WinMerge/Serbian.po
+++ b/Translations/WinMerge/Serbian.po
@@ -1810,7 +1810,7 @@ msgstr "
 
 #: Merge.rc:1116
 #, c-format
-msgid "GitHub/BitBucket"
+msgid "GitHub/Bitbucket"
 msgstr ""
 
 #: Merge.rc:1117

diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po
index 6a2137e..cde854b 100644 (file)
--- a/Translations/WinMerge/Slovak.po
+++ b/Translations/WinMerge/Slovak.po
@@ -1811,7 +1811,7 @@ msgstr "Rozdiel vo vybranom slove:"
 
 #: Merge.rc:1116
 #, c-format
-msgid "GitHub/BitBucket"
+msgid "GitHub/Bitbucket"
 msgstr ""
 
 #: Merge.rc:1117

diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po
index 6d385a1..dd7eaad 100644 (file)
--- a/Translations/WinMerge/Slovenian.po
+++ b/Translations/WinMerge/Slovenian.po
@@ -1814,7 +1814,7 @@ msgstr "Izbrane razlike besed:"
 
 #: Merge.rc:1116
 #, c-format
-msgid "GitHub/BitBucket"
+msgid "GitHub/Bitbucket"
 msgstr ""
 
 #: Merge.rc:1117

diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po
index f6a30a9..a19c4ef 100644 (file)
--- a/Translations/WinMerge/Spanish.po
+++ b/Translations/WinMerge/Spanish.po
@@ -1813,7 +1813,7 @@ msgstr "Dif. de palabra sel.:"
 
 #: Merge.rc:1116
 #, c-format
-msgid "GitHub/BitBucket"
+msgid "GitHub/Bitbucket"
 msgstr ""
 
 #: Merge.rc:1117

diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po
index d17ebed..2be5b32 100644 (file)
--- a/Translations/WinMerge/Swedish.po
+++ b/Translations/WinMerge/Swedish.po
@@ -1811,7 +1811,7 @@ msgstr "Vald ordskillnad:"
 
 #: Merge.rc:1116
 #, c-format
-msgid "GitHub/BitBucket"
+msgid "GitHub/Bitbucket"
 msgstr ""
 
 #: Merge.rc:1117

diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po
index eac1249..c443d2b 100644 (file)
--- a/Translations/WinMerge/Turkish.po
+++ b/Translations/WinMerge/Turkish.po
@@ -1814,7 +1814,7 @@ msgstr "Se
 
 #: Merge.rc:1116
 #, c-format
-msgid "GitHub/BitBucket"
+msgid "GitHub/Bitbucket"
 msgstr ""
 
 #: Merge.rc:1117

diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po
index 3979287..2d71776 100644 (file)
--- a/Translations/WinMerge/Ukrainian.po
+++ b/Translations/WinMerge/Ukrainian.po
@@ -1812,7 +1812,7 @@ msgstr "³
 
 #: Merge.rc:1116
 #, c-format
-msgid "GitHub/BitBucket"
+msgid "GitHub/Bitbucket"
 msgstr ""
 
 #: Merge.rc:1117