Merge pull request #2744 from federicobond/rename-contributions

Rename contributions strings to contrib
This commit is contained in:
Ben Fry
2014-08-05 17:36:07 -04:00
14 changed files with 136 additions and 131 deletions
@@ -87,7 +87,7 @@ class AvailableContribution extends Contribution {
tempFolder = type.createTempFolder();
} catch (IOException e) {
if (status != null)
status.setErrorMessage(Language.text("contributions.errors.temporary_directory"));
status.setErrorMessage(Language.text("contrib.errors.temporary_directory"));
return null;
}
Base.unzip(contribArchive, tempFolder);
@@ -116,7 +116,7 @@ class AvailableContribution extends Contribution {
tempFolder = enclosingFolder;
*/
if (status != null)
status.setErrorMessage(Language.interpolate("contributions.errors.needs_repackage", getName(), type.getTitle()));
status.setErrorMessage(Language.interpolate("contrib.errors.needs_repackage", getName(), type.getTitle()));
//status.setErrorMessage("This " + type + " needs to be repackaged according to the guidelines.");
return null;
}
@@ -129,7 +129,7 @@ class AvailableContribution extends Contribution {
if (contribFolder == null) {
if (status != null)
status.setErrorMessage(Language.interpolate("contributions.errors.no_contribution_found", type));
status.setErrorMessage(Language.interpolate("contrib.errors.no_contribution_found", type));
} else {
File propFile = new File(contribFolder, type + ".properties");
@@ -181,7 +181,7 @@ class AvailableContribution extends Contribution {
} else {
if (status != null)
status.setErrorMessage(Language.text("contributions.errors.overwriting_properties"));
status.setErrorMessage(Language.text("contrib.errors.overwriting_properties"));
}
}
@@ -72,7 +72,7 @@ public class ContributionManager {
// TODO this is often -1, may need to set progress to indeterminate
int fileSize = conn.getContentLength();
// System.out.println("file size is " + fileSize);
progress.startTask(Language.text("contributions.progress.downloading"), fileSize);
progress.startTask(Language.text("contrib.progress.downloading"), fileSize);
}
InputStream in = conn.getInputStream();
@@ -140,7 +140,7 @@ public class ContributionManager {
download(url, contribZip, downloadProgress);
if (!downloadProgress.isCanceled() && !downloadProgress.isError()) {
installProgress.startTask(Language.text("contributions.progress.installing"), ProgressMonitor.UNKNOWN);
installProgress.startTask(Language.text("contrib.progress.installing"), ProgressMonitor.UNKNOWN);
LocalContribution contribution =
ad.install(editor.getBase(), contribZip, false, status);
@@ -159,10 +159,10 @@ public class ContributionManager {
} catch (Exception e) {
e.printStackTrace();
status.setErrorMessage(Language.text("contributions.errors.download_and_install"));
status.setErrorMessage(Language.text("contrib.errors.download_and_install"));
}
} catch (IOException e) {
status.setErrorMessage(Language.text("contributions.errors.temporary_directory"));
status.setErrorMessage(Language.text("contrib.errors.temporary_directory"));
}
}
}, "Contribution Installer").start();
@@ -498,8 +498,8 @@ public class ContributionManager {
static private void installOnStartUp(final Base base, final AvailableContribution availableContrib) {
if (availableContrib.link == null) {
Base.showWarning(Language.interpolate("contributions.errors.update_on_restart_failed", availableContrib.getName()),
Language.text("contributions.unsupported_operating_system"));
Base.showWarning(Language.interpolate("contrib.errors.update_on_restart_failed", availableContrib.getName()),
Language.text("contrib.unsupported_operating_system"));
return;
}
try {
@@ -508,8 +508,8 @@ public class ContributionManager {
ContributionManager.downloadAndInstallOnStartup(base, downloadUrl, availableContrib);
} catch (MalformedURLException e) {
Base.showWarning(Language.interpolate("contributions.errors.update_on_restart_failed", availableContrib.getName()),
Language.text("contributions.errors.malformed_url"), e);
Base.showWarning(Language.interpolate("contrib.errors.update_on_restart_failed", availableContrib.getName()),
Language.text("contrib.errors.malformed_url"), e);
}
}
@@ -41,7 +41,7 @@ import processing.app.*;
public class ContributionManagerDialog {
static final String ANY_CATEGORY = Language.text("contributions.all");
static final String ANY_CATEGORY = Language.text("contrib.all");
JFrame dialog;
String title;
@@ -86,7 +86,7 @@ public class ContributionManagerDialog {
if (dialog == null) {
dialog = new JFrame(Language.text("contributions"));
restartButton = new JButton(Language.text("contributions.restart"));
restartButton = new JButton(Language.text("contrib.restart"));
restartButton.setVisible(false);
restartButton.addActionListener(new ActionListener() {
@@ -99,8 +99,8 @@ public class ContributionManagerDialog {
if (ed.getSketch().isModified()) {
int option = Base
.showYesNoQuestion(editor, title,
Language.text("contributions.unsaved_changes"),
Language.text("contributions.unsaved_changes.prompt"));
Language.text("contrib.unsaved_changes"),
Language.text("contrib.unsaved_changes.prompt"));
if (option == JOptionPane.NO_OPTION)
return;
@@ -156,9 +156,9 @@ public class ContributionManagerDialog {
updateCategoryChooser();
if (error) {
if (exception instanceof SocketTimeoutException) {
status.setErrorMessage(Language.text("contributions.errors.list_download.timeout"));
status.setErrorMessage(Language.text("contrib.errors.list_download.timeout"));
} else {
status.setErrorMessage(Language.text("contributions.errors.list_download"));
status.setErrorMessage(Language.text("contrib.errors.list_download"));
}
exception.printStackTrace();
}
@@ -198,7 +198,7 @@ public class ContributionManagerDialog {
filterPanel.add(Box.createHorizontalStrut(6));
JLabel categoryLabel = new JLabel(Language.text("library.category"));
JLabel categoryLabel = new JLabel(Language.text("contrib.category"));
filterPanel.add(categoryLabel);
filterPanel.add(Box.createHorizontalStrut(5));
@@ -436,8 +436,8 @@ public class ContributionManagerDialog {
List<String> filters;
public FilterField () {
super(Language.text("library.filter_your_search"));
filterHint = Language.text("library.filter_your_search");
super(Language.text("contrib.filter_your_search"));
filterHint = Language.text("contrib.filter_your_search");
showingHint = true;
filters = new ArrayList<String>();
@@ -50,13 +50,13 @@ import processing.app.Language;
*/
class ContributionPanel extends JPanel {
static public final String REMOVE_RESTART_MESSAGE =
String.format("<i>%s</i>", Language.text("contributions.messages.remove_restart"));
String.format("<i>%s</i>", Language.text("contrib.messages.remove_restart"));
static public final String INSTALL_RESTART_MESSAGE =
String.format("<i>%s</i>", Language.text("contributions.messages.install_restart"));
String.format("<i>%s</i>", Language.text("contrib.messages.install_restart"));
static public final String UPDATE_RESTART_MESSAGE =
String.format("<i>%s</i>", Language.text("contributions.messages.update_restart"));
String.format("<i>%s</i>", Language.text("contrib.messages.update_restart"));
static public final String PROGRESS_BAR_CONSTRAINT = "Install/Remove Progress Bar Panel";
@@ -576,7 +576,7 @@ class ContributionPanel extends JPanel {
String sentence = contrib.getSentence();
if (sentence == null || sentence.isEmpty()) {
sentence = String.format("<i>%s</i>", Language.text("contributions.errors.description_unavailable"));
sentence = String.format("<i>%s</i>", Language.text("contrib.errors.description_unavailable"));
} else {
sentence = sanitizeHtmlTags(sentence);
sentence = toHtmlLinks(sentence);
@@ -649,16 +649,16 @@ class ContributionPanel extends JPanel {
if (contrib.isDeletionFlagged()) {
installRemoveButton.addActionListener(undoActionListener);
installRemoveButton.setText(Language.text("contributions.undo"));
installRemoveButton.setText(Language.text("contrib.undo"));
} else if (contrib.isInstalled()) {
installRemoveButton.addActionListener(removeActionListener);
installRemoveButton.setText(Language.text("contributions.remove"));
installRemoveButton.setText(Language.text("contrib.remove"));
installRemoveButton.setVisible(true);
installRemoveButton.setEnabled(!contrib.isUpdateFlagged());
reorganizePaneComponents();
} else {
installRemoveButton.addActionListener(installActionListener);
installRemoveButton.setText(Language.text("contributions.install"));
installRemoveButton.setText(Language.text("contrib.install"));
}
contextMenu.removeAll();
@@ -674,7 +674,7 @@ class ContributionPanel extends JPanel {
private void installContribution(AvailableContribution info) {
if (info.link == null) {
listPanel.contribManager.status.setErrorMessage(Language.interpolate("contributions.unsupported_operating_system", info.getType()));
listPanel.contribManager.status.setErrorMessage(Language.interpolate("contrib.unsupported_operating_system", info.getType()));
} else {
installContribution(info, info.link);
}
@@ -701,7 +701,7 @@ class ContributionPanel extends JPanel {
installRemoveButton.setEnabled(!contrib.isUpdateFlagged());
if (isError()) {
listPanel.contribManager.status.setErrorMessage(Language.text("contributions.download_error"));
listPanel.contribManager.status.setErrorMessage(Language.text("contrib.download_error"));
}
((CardLayout) barButtonCardPane.getLayout()).show(barButtonCardPane, BUTTON_CONSTRAINT);
isInstallInProgress = false;
@@ -718,8 +718,8 @@ class ContributionPanel extends JPanel {
listPanel.contribManager.status);
} catch (MalformedURLException e) {
Base.showWarning(Language.text("contributions.errors.install_failed"),
Language.text("contributions.errors.malformed_url"), e);
Base.showWarning(Language.text("contrib.errors.install_failed"),
Language.text("contrib.errors.malformed_url"), e);
// not sure why we'd re-enable the button if it had an error...
// installRemoveButton.setEnabled(true);
}
@@ -742,7 +742,7 @@ class ContributionPanel extends JPanel {
protected void resetInstallProgressBarState() {
installProgressBar.setString(Language.text("contributions.progress.starting"));
installProgressBar.setString(Language.text("contrib.progress.starting"));
installProgressBar.setIndeterminate(false);
installProgressBar.setValue(0);
installProgressBar.setVisible(false);
@@ -762,7 +762,7 @@ class ContributionPanel extends JPanel {
if (contrib != null) {
updateButton.setVisible((contribListing.hasUpdates(contrib) && !contrib.isUpdateFlagged() && !contrib.isDeletionFlagged()) || isUpdateInProgress);
}
installRemoveButton.setVisible(isSelected() || installRemoveButton.getText().equals(Language.text("contributions.remove")) || isUpdateInProgress);
installRemoveButton.setVisible(isSelected() || installRemoveButton.getText().equals(Language.text("contrib.remove")) || isUpdateInProgress);
reorganizePaneComponents();
// for (JTextPane textPane : headerPaneSet) {
+29 -31
View File
@@ -191,10 +191,6 @@ find.btn.find = Find
# Find in reference (Frame)
find_in_reference = Find in Reference
# Library Manager (Frame)
library.category = Category:
library.filter_your_search = Filter your search...
# File (Frame)
file = Select an image or other data file to copy to your sketch
@@ -262,33 +258,35 @@ editor.status.printing.canceled = Printing canceled.
# ---------------------------------------
# Contribution Panel
contributions = Contribution Manager
contributions.restart = Restart Processing
contributions.unsaved_changes = Unsaved changes have been found
contributions.unsaved_changes.prompt = Are you sure you want to restart Processing without saving first?
contributions.messages.remove_restart = Please restart Processing to finish removing this item.
contributions.messages.install_restart = Please restart Processing to finish installing this item.
contributions.messages.update_restart = Please restart Processing to finish updating this item.
contributions.errors.list_download = Could not download the list of available contributions.
contributions.errors.list_download.timeout = Connection timed out while downloading the contribution list.
contributions.errors.download_and_install = Error during download and install.
contributions.errors.description_unavailable = Description unavailable.
contributions.errors.malformed_url = "The link fetched from Processing.org is not valid.\nYou can still install this library manually by visiting\nthe library's website.
contributions.errors.needs_repackage = %s needs to be repackaged according to the %s guidelines.
contributions.errors.no_contribution_found = Could not find a %s in the downloaded file.
contributions.errors.overwriting_properties = Error overwriting .properties file.
contributions.errors.install_failed = Install failed.
contributions.errors.update_on_restart_failed = Update on restart of %s failed.
contributions.errors.temporary_directory = Could not write to temporary directory.
contributions.all = All
contributions.undo = Undo
contributions.remove = Remove
contributions.install = Install
contributions.progress.installing = Installing
contributions.progress.starting = Starting
contributions.progress.downloading = Downloading
contributions.download_error = An error occured while downloading the contribution.
contributions.unsupported_operating_system = Your operating system doesn't appear to be supported. You should visit the %s's library for more info.
contrib = Contribution Manager
contrib.category = Category:
contrib.filter_your_search = Filter your search...
contrib.restart = Restart Processing
contrib.unsaved_changes = Unsaved changes have been found
contrib.unsaved_changes.prompt = Are you sure you want to restart Processing without saving first?
contrib.messages.remove_restart = Please restart Processing to finish removing this item.
contrib.messages.install_restart = Please restart Processing to finish installing this item.
contrib.messages.update_restart = Please restart Processing to finish updating this item.
contrib.errors.list_download = Could not download the list of available contributions.
contrib.errors.list_download.timeout = Connection timed out while downloading the contribution list.
contrib.errors.download_and_install = Error during download and install.
contrib.errors.description_unavailable = Description unavailable.
contrib.errors.malformed_url = "The link fetched from Processing.org is not valid.\nYou can still install this library manually by visiting\nthe library's website.
contrib.errors.needs_repackage = %s needs to be repackaged according to the %s guidelines.
contrib.errors.no_contribution_found = Could not find a %s in the downloaded file.
contrib.errors.overwriting_properties = Error overwriting .properties file.
contrib.errors.install_failed = Install failed.
contrib.errors.update_on_restart_failed = Update on restart of %s failed.
contrib.errors.temporary_directory = Could not write to temporary directory.
contrib.all = All
contrib.undo = Undo
contrib.remove = Remove
contrib.install = Install
contrib.progress.installing = Installing
contrib.progress.starting = Starting
contrib.progress.downloading = Downloading
contrib.download_error = An error occured while downloading the contribution.
contrib.unsupported_operating_system = Your operating system doesn't appear to be supported. You should visit the %s's library for more info.
# ---------------------------------------
@@ -172,10 +172,6 @@ find.btn.find = Suchen
# Find in reference (Frame)
find_in_reference = Suche in Referenz
# Library Manager (Frame)
library.category = Kategorie:
library.filter_your_search = Suche filtern ...
# File (Frame)
file = Grafik oder andere Datei zum Sketch kopieren
@@ -225,9 +221,16 @@ editor.tab.rename.description = Name der neuen Datei
editor.sketch.rename.description = Name des neuen Sketches
# ---------------------------------------
# Contribution Panel
contrib.category = Kategorie:
contrib.filter_your_search = Suche filtern ...
# ---------------------------------------
# Warnings
warn.delete = Löschen
warn.delete.sketch = Den Sketch endgültig löschen?
warn.delete.file = Die Datei "%s" entgültig löschen?
warn.delete.file = Die Datei "%s" entgültig löschen?
@@ -174,10 +174,6 @@ find.btn.find = Αναζήτηση
# Find in reference (Frame)
find_in_reference = Αναζήτηση στην Processing Reference
# Library Manager (Frame)
library.category = Κατηγορία:
library.filter_your_search = Φιλτράρισμα αναζήτησης...
# File (Frame)
file = Επιλέξτε μια εικόνα ή άλλο αρχείο δεδομένων για να αντιγράψετε στο Σχέδιό σας
@@ -236,10 +232,12 @@ editor.status.printing.canceled = Ακύρωση εκτύπωσης.
# ---------------------------------------
# Contribution Panel
contributions.undo = Αναίρεση
contributions.remove = Διαγραφή
contributions.install = Εγκατάσταση
contributions.progress.starting = Εκκίνηση
contributions.progress.downloading = Μεταφόρτωση
contributions.download_error = Προέκυψε σφάλμα κατά την μεταφόρτωση της συνεισφοράς.
contributions.unsupported_operating_system = Το λειτουργικό σας σύστημα μάλλον δεν υποστηρίζεται. Επισκευθείτε την βιβλιοθήκη των %s για περισσότερα.
contrib.category = Κατηγορία:
contrib.filter_your_search = Φιλτράρισμα αναζήτησης...
contrib.undo = Αναίρεση
contrib.remove = Διαγραφή
contrib.install = Εγκατάσταση
contrib.progress.starting = Εκκίνηση
contrib.progress.downloading = Μεταφόρτωση
contrib.download_error = Προέκυψε σφάλμα κατά την μεταφόρτωση της συνεισφοράς.
contrib.unsupported_operating_system = Το λειτουργικό σας σύστημα μάλλον δεν υποστηρίζεται. Επισκευθείτε την βιβλιοθήκη των %s για περισσότερα.
@@ -174,10 +174,6 @@ find.btn.find = Buscar
# Find in reference (Frame)
find_in_reference = Buscar en el manual de referencia
# Library Manager (Frame)
library.category = Categoría:
library.filter_your_search = Filtrar tu búsqueda...
# File (Frame)
file = Selecciona una imagen u otro archivo de datos para copiar a tu sketch
@@ -236,10 +232,12 @@ editor.status.printing.canceled = Impresión cancelada.
# ---------------------------------------
# Contribution Panel
contributions.undo = Deshacer
contributions.remove = Eliminar
contributions.install = Instalar
contributions.progress.starting = Iniciando
contributions.progress.downloading = Descargando
contributions.download_error = Ocurrió un error al descargar la contribución.
contributions.unsupported_operating_system = Tu sistema operativo no está soportado. Visita la documentación de la biblioteca para más información.
contrib.category = Categoría:
contrib.filter_your_search = Filtrar tu búsqueda...
contrib.undo = Deshacer
contrib.remove = Eliminar
contrib.install = Instalar
contrib.progress.starting = Iniciando
contrib.progress.downloading = Descargando
contrib.download_error = Ocurrió un error al descargar la contribución.
contrib.unsupported_operating_system = Tu sistema operativo no está soportado. Visita la documentación de la biblioteca para más información.
@@ -164,10 +164,6 @@ find.btn.find = Rechercher
# Find in reference (Frame)
find_in_reference = Chercher dans la doc (en)
# Library Manager (Frame)
library.category = Catégorie:
library.filter_your_search = Filtrer la recherche...
# File (Frame)
file = Selectionner une image ou fichier de données à ajouter au sketch
@@ -206,3 +202,10 @@ editor.header.previous_tab = Onglet précédent
editor.header.next_tab = Onglet suivant
editor.header.delete.warning.title = Ouais, mais non.
editor.header.delete.warning.text = Impossible de supprimer le dernier onglet du sketch.
# ---------------------------------------
# Contribution Panel
contrib.category = Catégorie:
contrib.filter_your_search = Filtrer la recherche...
@@ -174,10 +174,6 @@ find.btn.find = 検索
# Find in reference (Frame)
find_in_reference = リファレンスから探す
# Library Manager (Frame)
library.category = カテゴリ:
library.filter_your_search = 検索をフィルタ...
# File (Frame)
file = スケッチにコピーする画像やその他のデータファイルを選択して下さい
@@ -217,3 +213,10 @@ editor.header.previous_tab = 前のタブ
editor.header.next_tab = 次のタブ
editor.header.delete.warning.title = Yeah, no.
editor.header.delete.warning.text = 最後に開いたスケッチの最後のタブは削除できません
# ---------------------------------------
# Contribution Panel
contrib.category = カテゴリ:
contrib.filter_your_search = 検索をフィルタ...
@@ -182,10 +182,6 @@ find.btn.find = Find
# Find in reference (Frame)
find_in_reference = Find in Reference
# Library Manager (Frame)
library.category = Category:
library.filter_your_search = Filter your search...
# File (Frame)
file = Select an image or other data file to copy to your sketch
@@ -244,10 +240,12 @@ editor.status.printing.canceled = Printing canceled.
# ---------------------------------------
# Contribution Panel
contributions.undo = Undo
contributions.remove = Remove
contributions.install = Install
contributions.progress.starting = Starting
contributions.progress.downloading = Downloading
contributions.download_error = An error occured while downloading the contribution.
contributions.unsupported_operating_system = Your operating system doesn't appear to be supported. You should visit the %s's library for more info.
contrib.category = Category:
contrib.filter_your_search = Filter your search...
contrib.undo = Undo
contrib.remove = Remove
contrib.install = Install
contrib.progress.starting = Starting
contrib.progress.downloading = Downloading
contrib.download_error = An error occured while downloading the contribution.
contrib.unsupported_operating_system = Your operating system doesn't appear to be supported. You should visit the %s's library for more info.
@@ -174,10 +174,6 @@ find.btn.find = Zoeken
# Find in reference (Frame)
find_in_reference = Zoeken in Handleiding
# Library Manager (Frame)
library.category = Categorie:
library.filter_your_search = Filter zoekresultaten...
# File (Frame)
file = Selecteer een bestand om te kopiëren naar uw schets
@@ -215,4 +211,11 @@ editor.header.delete = Verwijderen
editor.header.previous_tab = Vorige Tabblad
editor.header.next_tab = Volgende Tabblad
editor.header.delete.warning.title = Waarschuwing
editor.header.delete.warning.text = U kunt het laatste tabblad van de laatst geopende schets niet verwijderen.
editor.header.delete.warning.text = U kunt het laatste tabblad van de laatst geopende schets niet verwijderen.
# ---------------------------------------
# Contribution Panel
contrib.category = Categorie:
contrib.filter_your_search = Filter zoekresultaten...
@@ -174,10 +174,6 @@ find.btn.find = Seguinte
# Find in reference (Frame)
find_in_reference = Procurar na Referência
# Library Manager (Frame)
library.category = Categoria:
library.filter_your_search = Filtrar a sua procura...
# File (Frame)
file = Seleccionar uma imagem ou outro ficheiro de dados para copiar para o sketch
@@ -236,10 +232,12 @@ editor.status.printing.canceled = Impressão cancelada.
# ---------------------------------------
# Contribution Panel
contributions.undo = Desfazer
contributions.remove = Refazer
contributions.install = Instalar
contributions.progress.starting = A iniciar
contributions.progress.downloading = A descarregar
contributions.download_error = Ocorreu um erro a descarregar a contribuição.
contributions.unsupported_operating_system = O seu sistema operativo não parece ser suportado. Deve visitar a biblioteca %s para mais informação.
contrib.category = Categoria:
contrib.filter_your_search = Filtrar a sua procura...
contrib.undo = Desfazer
contrib.remove = Refazer
contrib.install = Instalar
contrib.progress.starting = A iniciar
contrib.progress.downloading = A descarregar
contrib.download_error = Ocorreu um erro a descarregar a contribuição.
contrib.unsupported_operating_system = O seu sistema operativo não parece ser suportado. Deve visitar a biblioteca %s para mais informação.
@@ -176,10 +176,6 @@ find.btn.find = Bul
# Find in reference (Frame)
find_in_reference = Referans Bul (en)
# Library Manager (Frame)
library.category = Kategori:
library.filter_your_search = Aramayı Filtrele...
# File (Frame)
file = Sketch'e eklemek için görüntü veya başka bir data dosyası seç
@@ -216,3 +212,10 @@ editor.header.previous_tab = Önceki Sekme
editor.header.next_tab = Sonraki Sekme
editor.header.delete.warning.title = Evet, hayır.
editor.header.delete.warning.text = Aktif sketchteki son sekmeyi silemezsin.
# ---------------------------------------
# Contribution Panel
contrib.category = Kategori:
contrib.filter_your_search = Aramayı Filtrele...