Fixed regless cocoa and updated locs

prodigeni · Nov 30, 2013 · a0cc1f2 · a0cc1f2
1 parent 01403a3
commit a0cc1f2
Show file tree

Hide file tree

Showing 51 changed files with 910 additions and 2,614 deletions.
diff --git a/build.py b/build.py
@@ -168,17 +168,12 @@ def build_help(edition):
     conftmpl = op.join(current_path, 'help', 'conf.tmpl')
     sphinxgen.gen(help_basepath, help_destpath, changelog_path, tixurl, confrepl, conftmpl, changelogtmpl)
 
-def build_base_localizations():
-    loc.compile_all_po('locale')
-    loc.compile_all_po(op.join('hscommon', 'locale'))
-    loc.merge_locale_dir(op.join('hscommon', 'locale'), 'locale')
-
 def build_qt_localizations():
     loc.compile_all_po(op.join('qtlib', 'locale'))
     loc.merge_locale_dir(op.join('qtlib', 'locale'), 'locale')
 
 def build_localizations(ui, edition):
-    build_base_localizations()
+    loc.compile_all_po('locale')
     if ui == 'cocoa':
         app = cocoa_app(edition)
         loc.build_cocoa_localizations(app, en_stringsfile=op.join('cocoa', 'base', 'en.lproj', 'Localizable.strings'))
@@ -220,8 +215,6 @@ def build_updatepot():
     # We want to merge the generated pot with the old pot in the most preserving way possible.
     ui_packages = ['qt', op.join('cocoa', 'inter')]
     loc.generate_pot(ui_packages, op.join('locale', 'ui.pot'), ['tr'], merge=(not ISOSX))
-    print("Building hscommon.pot")
-    loc.generate_pot(['hscommon'], op.join('hscommon', 'locale', 'hscommon.pot'), ['tr'])
     print("Building qtlib.pot")
     loc.generate_pot(['qtlib'], op.join('qtlib', 'locale', 'qtlib.pot'), ['tr'])
     if ISOSX:
@@ -236,13 +229,11 @@ def build_updatepot():
 def build_mergepot():
     print("Updating .po files using .pot files")
     loc.merge_pots_into_pos('locale')
-    loc.merge_pots_into_pos(op.join('hscommon', 'locale'))
     loc.merge_pots_into_pos(op.join('qtlib', 'locale'))
     loc.merge_pots_into_pos(op.join('cocoalib', 'locale'))
 
 def build_normpo():
     loc.normalize_all_pos('locale')
-    loc.normalize_all_pos(op.join('hscommon', 'locale'))
     loc.normalize_all_pos(op.join('qtlib', 'locale'))
     loc.normalize_all_pos(op.join('cocoalib', 'locale'))
 

diff --git a/cocoa/base/en.lproj/Localizable.strings b/cocoa/base/en.lproj/Localizable.strings
@@ -1,6 +1,5 @@
 
 "%@ Results" = "%@ Results";
-"A previous action is still hanging in there. You can't start a new one yet. Wait a few seconds, then try again." = "A previous action is still hanging in there. You can't start a new one yet. Wait a few seconds, then try again.";
 "About dupeGuru" = "About dupeGuru";
 "Action" = "Action";
 "Actions" = "Actions";

diff --git a/cocoalib/en.lproj/cocoalib.strings b/cocoalib/en.lproj/cocoalib.strings
@@ -1,28 +1,15 @@
 
-"%@ is Fairware" = "%@ is Fairware";
 "Although the application should continue to run after this error, it may be in an instable state, so it is recommended that you restart the application." = "Although the application should continue to run after this error, it may be in an instable state, so it is recommended that you restart the application.";
-"Buy" = "Buy";
 "Cancel" = "Cancel";
 "Clear List" = "Clear List";
-"Contribute" = "Contribute";
 "Don't Send" = "Don't Send";
-"Enter Key" = "Enter Key";
-"Enter your key" = "Enter your key";
 "Error Report" = "Error Report";
-"Fairware?" = "Fairware?";
 "No" = "No";
 "OK" = "OK";
 "Please wait..." = "Please wait...";
-"Register" = "Register";
-"Registration e-mail:" = "Registration e-mail:";
-"Registration key:" = "Registration key:";
 "Send" = "Send";
 "Something went wrong. Would you like to send the error report to Hardcoded Software?" = "Something went wrong. Would you like to send the error report to Hardcoded Software?";
 "Status: Working..." = "Status: Working...";
-"Submit" = "Submit";
-"This app is registered, thanks!" = "This app is registered, thanks!";
-"Try" = "Try";
-"Type the key you received when you contributed to %@, as well as the e-mail used as a reference for the purchase." = "Type the key you received when you contributed to %@, as well as the e-mail used as a reference for the purchase.";
 "Work in progress, please wait." = "Work in progress, please wait.";
 "Work in progress..." = "Work in progress...";
 "Yes" = "Yes";
diff --git a/cocoalib/locale/cocoalib.pot b/cocoalib/locale/cocoalib.pot
@@ -1,23 +1,13 @@
 # 
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: utf-8\n"
-
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "%@ is Fairware"
-msgstr ""
 
 #: cocoalib/en.lproj/cocoalib.strings:0
 msgid ""
 "Although the application should continue to run after this error, it may be "
 "in an instable state, so it is recommended that you restart the application."
 msgstr ""
 
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "Buy"
-msgstr ""
-
 #: cocoalib/en.lproj/cocoalib.strings:0
 msgid "Cancel"
 msgstr ""
@@ -26,30 +16,14 @@ msgstr ""
 msgid "Clear List"
 msgstr ""
 
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "Contribute"
-msgstr ""
-
 #: cocoalib/en.lproj/cocoalib.strings:0
 msgid "Don't Send"
 msgstr ""
 
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "Enter Key"
-msgstr ""
-
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "Enter your key"
-msgstr ""
-
 #: cocoalib/en.lproj/cocoalib.strings:0
 msgid "Error Report"
 msgstr ""
 
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "Fairware?"
-msgstr ""
-
 #: cocoalib/en.lproj/cocoalib.strings:0
 msgid "No"
 msgstr ""
@@ -62,18 +36,6 @@ msgstr ""
 msgid "Please wait..."
 msgstr ""
 
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "Register"
-msgstr ""
-
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "Registration e-mail:"
-msgstr ""
-
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "Registration key:"
-msgstr ""
-
 #: cocoalib/en.lproj/cocoalib.strings:0
 msgid "Send"
 msgstr ""
@@ -88,24 +50,6 @@ msgstr ""
 msgid "Status: Working..."
 msgstr ""
 
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "Submit"
-msgstr ""
-
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "This app is registered, thanks!"
-msgstr ""
-
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "Try"
-msgstr ""
-
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid ""
-"Type the key you received when you contributed to %@, as well as the e-mail "
-"used as a reference for the purchase."
-msgstr ""
-
 #: cocoalib/en.lproj/cocoalib.strings:0
 msgid "Work in progress, please wait."
 msgstr ""

diff --git a/cocoalib/locale/cs/LC_MESSAGES/cocoalib.po b/cocoalib/locale/cs/LC_MESSAGES/cocoalib.po
@@ -9,20 +9,12 @@ msgstr ""
 "Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "%@ is Fairware"
-msgstr "%@ is Fairware"
-
 #: cocoalib/en.lproj/cocoalib.strings:0
 msgid ""
 "Although the application should continue to run after this error, it may be "
 "in an instable state, so it is recommended that you restart the application."
 msgstr ""
 
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "Buy"
-msgstr "Buy"
-
 #: cocoalib/en.lproj/cocoalib.strings:0
 msgid "Cancel"
 msgstr "Cancel"
@@ -31,30 +23,14 @@ msgstr "Cancel"
 msgid "Clear List"
 msgstr ""
 
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "Contribute"
-msgstr "Contribute"
-
 #: cocoalib/en.lproj/cocoalib.strings:0
 msgid "Don't Send"
 msgstr "Don't Send"
 
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "Enter Key"
-msgstr "Enter Key"
-
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "Enter your key"
-msgstr "Enter your key"
-
 #: cocoalib/en.lproj/cocoalib.strings:0
 msgid "Error Report"
 msgstr ""
 
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "Fairware?"
-msgstr "Fairware?"
-
 #: cocoalib/en.lproj/cocoalib.strings:0
 msgid "No"
 msgstr ""
@@ -67,18 +43,6 @@ msgstr ""
 msgid "Please wait..."
 msgstr ""
 
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "Register"
-msgstr "Register"
-
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "Registration e-mail:"
-msgstr ""
-
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "Registration key:"
-msgstr "Registration key:"
-
 #: cocoalib/en.lproj/cocoalib.strings:0
 msgid "Send"
 msgstr "Send"
@@ -95,26 +59,6 @@ msgstr ""
 msgid "Status: Working..."
 msgstr ""
 
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "Submit"
-msgstr "Submit"
-
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "This app is registered, thanks!"
-msgstr "This app is registered, thanks!"
-
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "Try"
-msgstr "Try"
-
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid ""
-"Type the key you received when you contributed to %@, as well as the e-mail "
-"used as a reference for the purchase."
-msgstr ""
-"Type the key you received when you contributed to %@, as well as the e-mail "
-"used as a reference for the purchase."
-
 #: cocoalib/en.lproj/cocoalib.strings:0
 msgid "Work in progress, please wait."
 msgstr ""

diff --git a/cocoalib/locale/de/LC_MESSAGES/cocoalib.po b/cocoalib/locale/de/LC_MESSAGES/cocoalib.po
@@ -9,20 +9,12 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "%@ is Fairware"
-msgstr "%@ is Fairware"
-
 #: cocoalib/en.lproj/cocoalib.strings:0
 msgid ""
 "Although the application should continue to run after this error, it may be "
 "in an instable state, so it is recommended that you restart the application."
 msgstr ""
 
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "Buy"
-msgstr "Buy"
-
 #: cocoalib/en.lproj/cocoalib.strings:0
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -31,30 +23,14 @@ msgstr "Abbrechen"
 msgid "Clear List"
 msgstr ""
 
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "Contribute"
-msgstr "Spenden"
-
 #: cocoalib/en.lproj/cocoalib.strings:0
 msgid "Don't Send"
 msgstr "Don't Send"
 
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "Enter Key"
-msgstr "Registrieren"
-
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "Enter your key"
-msgstr "Schlüssel eingeben"
-
 #: cocoalib/en.lproj/cocoalib.strings:0
 msgid "Error Report"
 msgstr ""
 
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "Fairware?"
-msgstr "Fairware?"
-
 #: cocoalib/en.lproj/cocoalib.strings:0
 msgid "No"
 msgstr ""
@@ -67,18 +43,6 @@ msgstr ""
 msgid "Please wait..."
 msgstr ""
 
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "Register"
-msgstr "Register"
-
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "Registration e-mail:"
-msgstr ""
-
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "Registration key:"
-msgstr "Registrierungsschlüssel:"
-
 #: cocoalib/en.lproj/cocoalib.strings:0
 msgid "Send"
 msgstr "Send"
@@ -95,26 +59,6 @@ msgstr ""
 msgid "Status: Working..."
 msgstr ""
 
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "Submit"
-msgstr "Abschicken"
-
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "This app is registered, thanks!"
-msgstr "This app is registered, thanks!"
-
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid "Try"
-msgstr "Try"
-
-#: cocoalib/en.lproj/cocoalib.strings:0
-msgid ""
-"Type the key you received when you contributed to %@, as well as the e-mail "
-"used as a reference for the purchase."
-msgstr ""
-"Geben Sie den empfangenen Schlüssel und die E-Mail-Adresse als Referenz für "
-"den Kauf an, wenn Sie für %@ gespendet haben."
-
 #: cocoalib/en.lproj/cocoalib.strings:0
 msgid "Work in progress, please wait."
 msgstr ""