Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.

Commit 4d9502f

Browse files
redmundsredmunds
committed
Merge pull request #7825 from adobe/release
Merge changes from release branch back to master
2 parents c6d57d6 + d4e67c3 commit 4d9502f

4 files changed

Lines changed: 47 additions & 10 deletions

File tree

‎src/nls/fr/strings.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ define({
3737
"NO_MODIFICATION_ALLOWED_ERR": "Le répertoire cible ne peut pas être modifié.",
3838
"NO_MODIFICATION_ALLOWED_ERR_FILE": "Vous n’êtes pas autorisé à effectuer des modifications.",
3939
"CONTENTS_MODIFIED_ERR": "Le fichier a été modifié dans une application autre que {APP_NAME}.",
40+
"UNSUPPORTED_ENCODING_ERR": "Le fichier n’est pas codé au format UTF-8.",
4041
"FILE_EXISTS_ERR": "Le fichier ou le répertoire existe déjà.",
4142
"FILE": "fichier",
4243
"DIRECTORY": "répertoire",
@@ -179,7 +180,6 @@ define({
179180
"FILE_FILTER_INSTRUCTIONS": "Exclure les fichiers et dossiers correspondant à l’une des chaînes/sous-chaînes ou aux <a href='{0}' title='{0}'>caractères génériques</a> suivants. Entrez chaque chaîne sur une ligne différente.",
180181
"FILE_FILTER_LIST_PREFIX": "sauf",
181182
"FILE_FILTER_CLIPPED_SUFFIX": "et {0} autre(s)",
182-
183183
"FILTER_COUNTING_FILES": "Comptage des fichiers\u2026",
184184
"FILTER_FILE_COUNT": "Autorise {0} fichier(s) sur les {1} {2}",
185185
"FILTER_FILE_COUNT_ALL": "Autorise les {0} fichiers {1}",

‎src/nls/it/strings.js‎

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ define({
3636
"NO_MODIFICATION_ALLOWED_ERR" : "La cartella selezionata non può essere modificata.",
3737
"NO_MODIFICATION_ALLOWED_ERR_FILE" : "Non hai i permessi necessari per effettuare la modifica.",
3838
"CONTENTS_MODIFIED_ERR" : "Il file è stato modificato fuori {APP_NAME}.",
39+
"UNSUPPORTED_ENCODING_ERR" : "Il file non è testo codificato in UTF-8",
3940
"FILE_EXISTS_ERR" : "Il file è già presente.",
4041
"FILE" : "file",
4142
"DIRECTORY" : "cartella",
@@ -45,7 +46,7 @@ define({
4546
"OPEN_DIALOG_ERROR" : "Errore durante il caricamento della finestra di dialogo per l’apertura del file. (errore {0})",
4647
"REQUEST_NATIVE_FILE_SYSTEM_ERROR" : "Errore durante il tentativo di caricare la cartella <span class='dialog-filename'>{0}</span>. (errore {1})",
4748
"READ_DIRECTORY_ENTRIES_ERROR" : "Errore durante la lettura del contenuto della cartella <span class='dialog-filename'>{0}</span>. (errore {1})",
48-
49+
4950
// File open/save error string
5051
"ERROR_OPENING_FILE_TITLE" : "Errore durante l’apertura del file",
5152
"ERROR_OPENING_FILE" : "Errore durante il tentativo di apertura del file <span class='dialog-filename'>{0}</span>. {1}",
@@ -155,6 +156,7 @@ define({
155156
"FIND_IN_FILES_TITLE_PART3" : "&mdash; {0} {1} {2} in {3} {4}",
156157
"FIND_IN_FILES_SCOPED" : "in <span class='dialog-filename'>{0}</span>",
157158
"FIND_IN_FILES_NO_SCOPE" : "nel progetto",
159+
"FIND_IN_FILES_ZERO_FILES" : "Filtra esclude tutti i file {0}",
158160
"FIND_IN_FILES_FILE" : "file",
159161
"FIND_IN_FILES_FILES" : "file",
160162
"FIND_IN_FILES_MATCH" : "corrispondenza",
@@ -164,7 +166,18 @@ define({
164166
"FIND_IN_FILES_FILE_PATH" : "<span class='dialog-filename'>{0}</span> {2} <span class='dialog-path'>{1}</span>", // We shoudl use normal dashes on Windows instead of em dash eventually
165167
"ERROR_FETCHING_UPDATE_INFO_TITLE" : "Si è verificato un errore nel recuperare le informazioni aggiornate",
166168
"ERROR_FETCHING_UPDATE_INFO_MSG" : "Si è verificato un errore nel recuperare le informazioni aggiornate dal server. Assicurati di essere connesso a internet e riprova.",
167-
169+
"ERROR_CSSQUICKEDIT_BETWEENCLASSES" : "CSS Quick Edit: posiziona il cursore sul nome di una classe singola.",
170+
"ERROR_CSSQUICKEDIT_CLASSNOTFOUND" : "CSS Quick Edit: attributo classe incompleto",
171+
"ERROR_CSSQUICKEDIT_IDNOTFOUND" : "CSS Quick Edit: attributo id incompleto",
172+
"ERROR_CSSQUICKEDIT_UNSUPPORTEDATTR" : "CSS Quick Edit: posiziona il cursore su etichetta, classe, oppure id",
173+
"ERROR_JSQUICKEDIT_FUNCTIONNOTFOUND" : "JS Quick Edit: posiziona il cursore su nome della funziona",
174+
"EDIT_FILE_FILTER" : "Modifica\u2026",
175+
"ERROR_QUICK_DOCS_PROVIDER_NOT_FOUND" : "Quick Docs non disponibile per posizione attuale del cursore",
176+
"ERROR_QUICK_EDIT_PROVIDER_NOT_FOUND" : "Quick Edit non disponibile per posizione attuale del cursore",
177+
"ERROR_TIMINGQUICKEDIT_INVALIDSYNTAX" : "Funzione CSS Timing Quick Edit: sintassi invalida",
178+
"FILE_FILTER_CLIPPED_SUFFIX" : "e {0} in più ",
179+
"FILE_FILTER_INSTRUCTIONS" : "Esclude i file e cartelle che sono uguali a qualsiasi delle seguente stringhe / sottostringhe o <a href='{0}' title='{0}'>caratteri jolly</a>. Digita ciascun stringa su una nuova riga.",
180+
168181
/**
169182
* ProjectManager
170183
*/
@@ -253,6 +266,7 @@ define({
253266
"CMD_FIND" : "Cerca",
254267
"CMD_FIND_FIELD_PLACEHOLDER" : "Trova\u2026",
255268
"CMD_FIND_IN_FILES" : "Cerca nei file",
269+
"CMD_FIND_IN_SELECTED" : "Cerca nel file/cartella selezionata",
256270
"CMD_FIND_IN_SUBTREE" : "Cerca in\u2026",
257271
"CMD_FIND_NEXT" : "Cerca il successivo",
258272
"CMD_FIND_PREVIOUS" : "Cerca il precedente",
@@ -263,6 +277,8 @@ define({
263277
"CMD_DELETE_LINES" : "Elimina linea",
264278
"CMD_COMMENT" : "Commenta/De-commenta linee",
265279
"CMD_BLOCK_COMMENT" : "Commenta/De-commenta blocco",
280+
"CMD_ADD_NEXT_MATCH" : "Aggiungi la prossima correspondenza alla selezione",
281+
"CMD_SKIP_CURRENT_MATCH" : "Salta e aggiungi prossima correspondenza",
266282
"CMD_LINE_UP" : "Sposta la riga in alto",
267283
"CMD_LINE_DOWN" : "Sposta la riga in basso",
268284
"CMD_OPEN_LINE_ABOVE" : "Apri linea sopra",
@@ -290,6 +306,7 @@ define({
290306
"CMD_SORT_WORKINGSET_AUTO" : "Ordinamento automatico",
291307

292308
// Navigate menu Commands
309+
"FIND_MENU" : "Trova",
293310
"NAVIGATE_MENU" : "Naviga",
294311
"CMD_QUICK_OPEN" : "Apri velocemente",
295312
"CMD_GOTO_LINE" : "Vai alla linea",
@@ -315,12 +332,18 @@ define({
315332
"CMD_SHOW_EXTENSIONS_FOLDER" : "Mostra cartella estensioni",
316333
"CMD_TWITTER" : "{TWITTER_NAME} su Twitter",
317334
"CMD_ABOUT" : "Informazioni su {APP_TITLE}",
335+
"CMD_SHOW_IN_EXPLORER" : "Mostra in Explorer",
336+
"CMD_SHOW_IN_FINDER" : "Mostra nel finder",
337+
318338
"CMD_OPEN_PREFERENCES" : "Apri il file delle preferenze",
319339

320340
// Strings for main-view.html
321341
"EXPERIMENTAL_BUILD" : "Build sperimentale",
322342
"DEVELOPMENT_BUILD" : "Build di sviluppo",
343+
"CMD_SUGGEST" : "Suggerisci una feature",
344+
"CMD_SUPPORT" : "Supporto per {APP_NAME}",
323345
"RELOAD_FROM_DISK" : "Ricarica dal disco",
346+
"CMD_GET_INVOLVED" : "Far parte",
324347
"KEEP_CHANGES_IN_EDITOR" : "Conserva le modifiche nell’editor",
325348
"CLOSE_DONT_SAVE" : "Chiudi (non salvare)",
326349
"RELAUNCH_CHROME" : "Riavvia Google Chrome",
@@ -451,6 +474,9 @@ define({
451474
"CMD_ENABLE_NODE_DEBUGGER" : "Abilita Node Debugger",
452475
"CMD_LOG_NODE_STATE" : "Registra i Log Node State nella Console",
453476
"CMD_RESTART_NODE" : "Riavvia Node",
477+
"CMD_SHOW_ERRORS_IN_STATUS_BAR" : "Mostra errori nella barra di stato",
478+
"ERRORS" : "Errori",
479+
454480

455481
"LANGUAGE_TITLE" : "Cambia la lingua",
456482
"LANGUAGE_MESSAGE" : "Lingua:",
@@ -491,4 +517,5 @@ define({
491517
"DOCS_MORE_LINK" : "Leggi tutto"
492518
});
493519

494-
/* Last translation of: 9b6c0bdafc63db035ffba98c008700e8cef1f19b */
520+
/* Last translation of: e47dc5b16ec4bfabacfdb5c62f67a94feca85d50 */
521+

‎src/nls/ja/strings.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ define({
3737
"NO_MODIFICATION_ALLOWED_ERR": "対象ディレクトリは変更できません。",
3838
"NO_MODIFICATION_ALLOWED_ERR_FILE": "ファイルを変更する権限がありません。",
3939
"CONTENTS_MODIFIED_ERR": "このファイルは {APP_NAME} 以外で変更されています。",
40+
"UNSUPPORTED_ENCODING_ERR": "ファイルは UTF-8 でエンコードされたテキストではありません。",
4041
"FILE_EXISTS_ERR": "ファイルまたはディレクトリは既に存在しています。",
4142
"FILE": "ファイル",
4243
"DIRECTORY": "ディレクトリ",
@@ -179,7 +180,6 @@ define({
179180
"FILE_FILTER_INSTRUCTIONS": "次の文字列やサブストリング、または<a href='{0}' title='{0}'>ワイルドカード</a>のいずれかに一致するファイルおよびフォルダーを除外します。各文字列を新しい行に入力してください。",
180181
"FILE_FILTER_LIST_PREFIX": "例外",
181182
"FILE_FILTER_CLIPPED_SUFFIX": "さらに {0} 件",
182-
183183
"FILTER_COUNTING_FILES": "ファイル数を確認中\u2026",
184184
"FILTER_FILE_COUNT": "{2}の {1} ファイル中 {0} ファイルを許可",
185185
"FILTER_FILE_COUNT_ALL": "{1}の全 {0} ファイルを許可",

‎src/utils/UpdateNotification.js‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,16 @@ define(function (require, exports, module) {
147147

148148
if (fetchData) {
149149
var lookupPromise = new $.Deferred(),
150-
localVersionInfoUrl = _versionInfoUrl || _getVersionInfoUrl();
150+
localVersionInfoUrl;
151151

152-
// If the current locale isn't en, check whether we actually have a locale-specific update notification, and fall back to en if not.
153-
if (brackets.getLocale() !== "en") {
152+
// If the current locale isn't "en" or "en-US", check whether we actually have a
153+
// locale-specific update notification, and fall back to "en" if not.
154+
// Note: we check for both "en" and "en-US" to watch for the general case or
155+
// country-specific English locale. The former appears default on Mac, while
156+
// the latter appears default on Windows.
157+
var locale = brackets.getLocale().toLowerCase();
158+
if (locale !== "en" && locale !== "en-us") {
159+
localVersionInfoUrl = _versionInfoUrl || _getVersionInfoUrl();
154160
$.ajax({
155161
url: localVersionInfoUrl,
156162
cache: false,
@@ -170,11 +176,15 @@ define(function (require, exports, module) {
170176
}).always(function (jqXHR, status, error) {
171177
lookupPromise.resolve();
172178
});
179+
} else {
180+
localVersionInfoUrl = _getVersionInfoUrl("en");
181+
lookupPromise.resolve();
173182
}
174-
}).always(function (jqXHR, status, error) {
183+
}).done(function (jqXHR, status, error) {
175184
lookupPromise.resolve();
176185
});
177186
} else {
187+
localVersionInfoUrl = _versionInfoUrl || _getVersionInfoUrl("en");
178188
lookupPromise.resolve();
179189
}
180190

@@ -321,7 +331,7 @@ define(function (require, exports, module) {
321331
var oldValues;
322332
var usingOverrides = false; // true if any of the values are overridden.
323333
var result = new $.Deferred();
324-
var versionInfoUrl = _getVersionInfoUrl();
334+
var versionInfoUrl;
325335

326336
if (_testValues) {
327337
oldValues = {};

0 commit comments

Comments
 (0)
⚡