Updated translations

FossilOrigin-Name: 24074dfcc2b754993aa5531725a53e6aea8ddc55

intl/convert.sh

@@ -8,10 +8,10 @@ echo "Converting localizations"
 rm -rf $PRJDIR/rsrc/intl
 mkdir $PRJDIR/rsrc/intl
 
-for i in $INTLDIR/*.po
+for i in $INTLDIR/*.ts
 do
-	TARGET=`basename $i .po`.qm
+	TARGET=`basename $i .ts`.qm
 	echo "$TARGET"
-	lconvert $i -o $PRJDIR/rsrc/intl/$TARGET
+	lrelease $i -qm $PRJDIR/rsrc/intl/$TARGET
 done
 

intl/el_GR.po

@@ -518,7 +518,8 @@ msgctxt "MainWindow|"
 msgid "Open the selected folder"
 msgstr "Άνοιγμα του επιλεγμένου φακέλου"
 
-#: ../ui/MainWindow.ui:762 ../src/MainWindow.cpp:2161 ../src/MainWindow.cpp:2206
+#: ../ui/MainWindow.ui:762 ../src/MainWindow.cpp:2161
+#: ../src/MainWindow.cpp:2206
 msgctxt "MainWindow|"
 msgid "Rename Folder"
 msgstr "Μετονομασία Φακέλου"
@@ -809,7 +810,7 @@ msgid ""
 msgstr ""
 "ένα γραφικό περιβάλλον για το FOSSIL\n"
 "από τον Κώστα Καρανικόλα\n"
-"Διάθεση σύμφωνα με τους όρους του GPL"
+"Διατίθεται σύμφωνα με τους όρους του GPL"
 
 #: ../src/MainWindow.cpp:1956
 msgctxt "MainWindow|"
@@ -968,8 +969,8 @@ msgid ""
 "Available under the CC Attribution Noncommercial No Derivative 3.0 License"
 msgstr ""
 "Εικονίδια από τον Deleket - Jojo Mendoza\n"
-"Διάθεση σύμφωνα με τους όρους του CC Attribution Noncommercial No Derivative "
+"Διατίθεται σύμφωνα με τους όρους CC Attribution Noncommercial No Derivative "
-"3.0 License"
+"3.0"
 
 #: ../src/MainWindow.cpp:2209
 msgctxt "MainWindow|"
@@ -1162,73 +1163,59 @@ msgctxt "SettingsDialog|"
 msgid "Ignore CR/NL"
 msgstr "Παράβλεψη CR/NL"
 
-#: ../src/SettingsDialog.cpp:16
+#: ../src/SettingsDialog.cpp:17
 msgctxt "SettingsDialog|"
 msgid "Applications"
 msgstr "Εφαρμογές"
 
-#: ../src/SettingsDialog.cpp:45
+#: ../src/SettingsDialog.cpp:46
 msgctxt "SettingsDialog|"
 msgid "Diff File"
 msgstr "Συγκριση Αρχείου"
 
-#: ../src/SettingsDialog.cpp:46
+#: ../src/SettingsDialog.cpp:47
 msgctxt "SettingsDialog|"
 msgid "Open File"
 msgstr "Άνοιγμα Αρχείου"
 
-#: ../src/SettingsDialog.cpp:47
+#: ../src/SettingsDialog.cpp:48
 msgctxt "SettingsDialog|"
 msgid "Open Containing Folder"
 msgstr "Άνοιγμα Φακέλου"
 
-#: ../src/SettingsDialog.cpp:98
+#: ../src/SettingsDialog.cpp:99
 msgctxt "SettingsDialog|"
 msgid "Restart required"
 msgstr "Ανάγκη Επανεκκίνησης"
 
-#: ../src/SettingsDialog.cpp:98
+#: ../src/SettingsDialog.cpp:99
 msgctxt "SettingsDialog|"
 msgid "The language change will take effect after restarting the application"
 msgstr "Η αλλαγή γλώσσας θα εφαρμοστεί μετά την επανεκκίνηση της εφαρμογής"
 
-#: ../src/SettingsDialog.cpp:112
+#: ../src/SettingsDialog.cpp:113
 msgctxt "SettingsDialog|"
 msgid "Select Fossil executable"
 msgstr "Επιλέξετε την εφαρμογή Fossil"
 
-#: ../src/SettingsDialog.cpp:120
+#: ../src/SettingsDialog.cpp:121
 msgctxt "SettingsDialog|"
 msgid "Select Graphical Diff application"
 msgstr "Επιλέξετε εφαρμογή γραφικής σύγκρισης"
 
-#: ../src/SettingsDialog.cpp:128
+#: ../src/SettingsDialog.cpp:129
 msgctxt "SettingsDialog|"
 msgid "Select Graphical Merge application"
 msgstr "Επιλέξετε εφαρμογή γραφικής σύνθεσης"
 
-#: ../src/SettingsDialog.cpp:136
+#: ../src/SettingsDialog.cpp:137
 msgctxt "SettingsDialog|"
 msgid "Clear Commit Message History"
 msgstr "Διαγραφή ιστορικού σχολίων καταχώρησης"
 
-#: ../src/SettingsDialog.cpp:136
+#: ../src/SettingsDialog.cpp:137
 msgctxt "SettingsDialog|"
 msgid "Are you sure want to clear the commit message history?"
 msgstr ""
 "Είσαστε σίγουροι ότι θέλετε να διαγράψετε το ιστορικό σχολίων καταχώρησης;"
 
-#: ../src/SettingsDialog.cpp:143
-msgctxt "SettingsDialog|"
-msgid "English (US)"
-msgstr "Αγγλικά (Ηνωμένων Πολιτειών)"
-
-#: ../src/SettingsDialog.cpp:144
-msgctxt "SettingsDialog|"
-msgid "Japanese"
-msgstr "Ιαπωνικά"
-
-#: ../src/SettingsDialog.cpp:145
-msgctxt "SettingsDialog|"
-msgid "Greek"
-msgstr "Ελληνικά"

intl/en_US.pot

@@ -1128,72 +1128,57 @@ msgctxt "SettingsDialog|"
 msgid "Ignore CR/NL"
 msgstr ""
 
-#: ../src/SettingsDialog.cpp:16
+#: ../src/SettingsDialog.cpp:17
 msgctxt "SettingsDialog|"
 msgid "Applications"
 msgstr ""
 
-#: ../src/SettingsDialog.cpp:45
+#: ../src/SettingsDialog.cpp:46
 msgctxt "SettingsDialog|"
 msgid "Diff File"
 msgstr ""
 
-#: ../src/SettingsDialog.cpp:46
+#: ../src/SettingsDialog.cpp:47
 msgctxt "SettingsDialog|"
 msgid "Open File"
 msgstr ""
 
-#: ../src/SettingsDialog.cpp:47
+#: ../src/SettingsDialog.cpp:48
 msgctxt "SettingsDialog|"
 msgid "Open Containing Folder"
 msgstr ""
 
-#: ../src/SettingsDialog.cpp:98
+#: ../src/SettingsDialog.cpp:99
 msgctxt "SettingsDialog|"
 msgid "Restart required"
 msgstr ""
 
-#: ../src/SettingsDialog.cpp:98
+#: ../src/SettingsDialog.cpp:99
 msgctxt "SettingsDialog|"
 msgid "The language change will take effect after restarting the application"
 msgstr ""
 
-#: ../src/SettingsDialog.cpp:112
+#: ../src/SettingsDialog.cpp:113
 msgctxt "SettingsDialog|"
 msgid "Select Fossil executable"
 msgstr ""
 
-#: ../src/SettingsDialog.cpp:120
+#: ../src/SettingsDialog.cpp:121
 msgctxt "SettingsDialog|"
 msgid "Select Graphical Diff application"
 msgstr ""
 
-#: ../src/SettingsDialog.cpp:128
+#: ../src/SettingsDialog.cpp:129
 msgctxt "SettingsDialog|"
 msgid "Select Graphical Merge application"
 msgstr ""
 
-#: ../src/SettingsDialog.cpp:136
+#: ../src/SettingsDialog.cpp:137
 msgctxt "SettingsDialog|"
 msgid "Clear Commit Message History"
 msgstr ""
 
-#: ../src/SettingsDialog.cpp:136
+#: ../src/SettingsDialog.cpp:137
 msgctxt "SettingsDialog|"
 msgid "Are you sure want to clear the commit message history?"
 msgstr ""
-
-#: ../src/SettingsDialog.cpp:143
-msgctxt "SettingsDialog|"
-msgid "English (US)"
-msgstr ""
-
-#: ../src/SettingsDialog.cpp:144
-msgctxt "SettingsDialog|"
-msgid "Japanese"
-msgstr ""
-
-#: ../src/SettingsDialog.cpp:145
-msgctxt "SettingsDialog|"
-msgid "Greek"
-msgstr ""

intl/mkbase.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+# Regenerate the the reference pot
+lupdate ../fuel.pro -ts en_US.ts -source-language en.US -target-language en.US
+#lconvert en_US.ts -o en_US.pot
+

intl/update.sh

@@ -1,14 +1,5 @@
 #!/bin/sh
-# Regenerate the the reference pot
-lupdate ../fuel.pro -ts en_US.ts -source-language en.US -target-language en.US
-lconvert en_US.ts -o en_US.pot
-
-# Merge reference pot file with all languages
-# Requires the gettext tool msgmerge
-for i in *.po
-do
-	echo "Merging $i"
-	msgmerge --update $i en_US.pot
-done
 
+# Update existing translations
+lupdate ../fuel.pro
 

manifest

@@ -1,15 +1,18 @@
-C Greek\slocalization\simprovements
+C Updated\stranslations
-D 2012-11-23T05:06:03.801
+D 2012-11-23T07:15:04.544
 F dist/arch/PKGBUILD dd21073c035af4e6a4ecb3842c1fd7ae45c5e93d
 F dist/win/fuel.iss ef3558dbba409eb194938b930377fc9ee27d319e
 F doc/Building.txt 7c0f1060d4a08ed330058d4a3a68905c05228381
 F doc/Changes.txt e21c9355aaeb7643c8d6784effd2f9ebadf3a8e0
 F doc/License.txt 4cc77b90af91e615a64ae04893fdffa7939db84c
 F fuel.pro f9053752c0ea40a7f9c90ac738a6c1689b92dfe5
-F intl/convert.sh 6dfabd9c78df20b2c5c767b301cc4cd8813f442d x
+F intl/convert.sh bec60f3a3023c71cbed4004dbedb2cf4b38cc9a4 x
-F intl/el_GR.po 78bde70ddc69e3edd4155a69a7403479a5e888d0
+F intl/el_GR.po 2845b683aeba15499d2e44ce9364b7ab58b0af2f
-F intl/en_US.pot 259dab159768c95141334e3e436b534f33297d4b
+F intl/el_GR.ts fd53670ac8e2473069b58785170b0a01465474ad
-F intl/update.sh 321b3012ea5129e9ea32e52df4f1de509e974882 x
+F intl/en_US.pot b5a0efc51a0dd23ef8e2fd77f8631eae914eecef
+F intl/en_US.ts 353405c330103dc63addc4c9cebb69c9751f5e9f
+F intl/mkbase.sh f87e0ccb0a47c380df5bb989050e7d385ec26cbe x
+F intl/update.sh b5312e108eec47f9c8cb7d6790c57335e6b52829 x
 F rsrc/fuel.desktop 43145556bc61f5a91b497c38a16aec44af271d29
 F rsrc/fuel.rc 8e9ac966f283102c11a77cd7f936cdc09e09bd79
 F rsrc/icons/Address\sBook-01.png ef2cec80ea5a559b72e8be4a344a1869fe69cbd8
@@ -191,7 +194,7 @@ F ui/CommitDialog.ui 6200f6cabdcf40a20812e811be28e0793f82516f
 F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d
 F ui/MainWindow.ui 998f26c6fe75bd655cf3d4f0073e67dc0bf3b3d7
 F ui/SettingsDialog.ui 7f578450cf01d6786ff2d91a2142505192446e3f
-P 2ea5d0942b6b7487e6d42b2e79c8a032bde86f6c
+P 5c32ff2efe372a028076540d398b5256c6577658
-R bdcefd51be0696d82bc5dfecc4de7184
+R 8bc9452780812342b38a564854e3bece
 U kostas
-Z 7e9efd6037740c02079df908fb1c4d0c
+Z ac1c9eb4bf9f11b9a6a6394828d99b51

manifest.uuid

@@ -1 +1 @@
-5c32ff2efe372a028076540d398b5256c6577658
+24074dfcc2b754993aa5531725a53e6aea8ddc55