Skip to content

Commit

Permalink
Merge branch 'hotfix-1.13.1'
Browse files Browse the repository at this point in the history
* hotfix-1.13.1:
  Update version info.
  lang: improve zh-tw localization
  lang: register lv and sl
  lang: revise for ScrapBook X
  lang: merge templateHelp.html
  lang: take Slovenian (sl) and Latvian (lv) locale from ScrapBook 1.5.14
  lang: remove duplicate .properties entry
  core: recover sbCommonUtils.execProgram() for addon compatibility
  • Loading branch information
danny0838 committed Sep 3, 2016
2 parents 0a4517b + cc1a7b8 commit 7d21d41
Show file tree
Hide file tree
Showing 31 changed files with 1,207 additions and 28 deletions.
2 changes: 2 additions & 0 deletions chrome.manifest
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@ locale scrapbook gl-ES chrome/locale/gl-ES/scrapbook/
locale scrapbook hu-HU chrome/locale/hu-HU/scrapbook/
locale scrapbook it chrome/locale/it/scrapbook/
locale scrapbook ja chrome/locale/ja/scrapbook/
locale scrapbook lv-LV chrome/locale/lv-LV/scrapbook/
locale scrapbook ko-KR chrome/locale/ko-KR/scrapbook/
locale scrapbook pl chrome/locale/pl/scrapbook/
locale scrapbook pt-BR chrome/locale/pt-BR/scrapbook/
locale scrapbook ro chrome/locale/ro/scrapbook/
locale scrapbook ru-RU chrome/locale/ru-RU/scrapbook/
locale scrapbook sk-SK chrome/locale/sk-SK/scrapbook/
locale scrapbook sl chrome/locale/sl/scrapbook/
locale scrapbook sv-SE chrome/locale/sv-SE/scrapbook/
locale scrapbook tr chrome/locale/tr/scrapbook/
locale scrapbook uk chrome/locale/uk/scrapbook/
Expand Down
1 change: 0 additions & 1 deletion chrome/locale/ar/scrapbook/message.properties
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ QUOTATION='%S'
# overlay.properties
# -----------------------------------------------------------------------------

ADDRESS=العنوان:
MAX_COMMENT=توسيع منطقة التعليق
MIN_COMMENT=طي منطقة التعليق
EDIT_UNDO_LAST=There is no history to undo
Expand Down
1 change: 0 additions & 1 deletion chrome/locale/cs-CZ/scrapbook/message.properties
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ QUOTATION='%S'
# overlay.properties
# -----------------------------------------------------------------------------

ADDRESS=Adresa URL:
MAX_COMMENT=Rozšířit místo pro komentář
MIN_COMMENT=Zmenšit místo pro komentář
EDIT_UNDO_LAST=There is no history to undo
Expand Down
1 change: 0 additions & 1 deletion chrome/locale/de/scrapbook/message.properties
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ QUOTATION="%S"
# overlay.properties
# -----------------------------------------------------------------------------

ADDRESS=URL:
MAX_COMMENT=Beschreibungsfeld vergrößern
MIN_COMMENT=Beschreibungsfeld verkleinern
EDIT_UNDO_LAST=There is no history to undo
Expand Down
1 change: 0 additions & 1 deletion chrome/locale/en-US/scrapbook/message.properties
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ QUOTATION='%S'
# overlay.properties
# -----------------------------------------------------------------------------

ADDRESS=URL:
MAX_COMMENT=Expand Comment Area
MIN_COMMENT=Collapse Comment Area
EDIT_UNDO_LAST=There is no history to undo
Expand Down
1 change: 0 additions & 1 deletion chrome/locale/es-ES/scrapbook/message.properties
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ QUOTATION='%S'
# overlay.properties
# -----------------------------------------------------------------------------

ADDRESS=Dirección:
MAX_COMMENT=Expandir área de comentarios
MIN_COMMENT=Contraer área de comentarios
EDIT_UNDO_LAST=There is no history to undo
Expand Down
1 change: 0 additions & 1 deletion chrome/locale/fi-FI/scrapbook/message.properties
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ QUOTATION="%S"
# overlay.properties
# -----------------------------------------------------------------------------

ADDRESS=URL:
MAX_COMMENT=Laajenna kommenttialue
MIN_COMMENT=Supista kommenttialue
EDIT_UNDO_LAST=There is no history to undo
Expand Down
1 change: 0 additions & 1 deletion chrome/locale/fr/scrapbook/message.properties
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ QUOTATION='%S'
# overlay.properties
# -----------------------------------------------------------------------------

ADDRESS=URL:
MAX_COMMENT=Développer la zone de commentaire
MIN_COMMENT=Réduire la zone de commentaire
EDIT_UNDO_LAST=There is no history to undo
Expand Down
1 change: 0 additions & 1 deletion chrome/locale/gl-ES/scrapbook/message.properties
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ QUOTATION='%S'
# overlay.properties
# -----------------------------------------------------------------------------

ADDRESS=URL:
MAX_COMMENT=Ampliar área de comentario
MIN_COMMENT=Reducir área de comentario
EDIT_UNDO_LAST=There is no history to undo
Expand Down
1 change: 0 additions & 1 deletion chrome/locale/hu-HU/scrapbook/message.properties
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ QUOTATION=„%S”
# overlay.properties
# -----------------------------------------------------------------------------

ADDRESS=URL:
MAX_COMMENT=Megjegyzés terület kinyitása
MIN_COMMENT=Megjegyzés terület becsukása
EDIT_UNDO_LAST=There is no history to undo
Expand Down
1 change: 0 additions & 1 deletion chrome/locale/it/scrapbook/message.properties
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ QUOTATION='%S
# overlay.properties
# -----------------------------------------------------------------------------

ADDRESS=URL:
MAX_COMMENT=Espandi l'area del commento
MIN_COMMENT=Contrai l'area del commento
EDIT_UNDO_LAST=There is no history to undo
Expand Down
1 change: 0 additions & 1 deletion chrome/locale/ja/scrapbook/message.properties
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ QUOTATION=「%S」
# overlay.properties
# -----------------------------------------------------------------------------

ADDRESS=URL:
MAX_COMMENT=コメントエリアを広げる
MIN_COMMENT=コメントエリアを折りたたむ
EDIT_UNDO_LAST=There is no history to undo
Expand Down
1 change: 0 additions & 1 deletion chrome/locale/ko-KR/scrapbook/message.properties
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ QUOTATION=「%S」
# overlay.properties
# -----------------------------------------------------------------------------

ADDRESS=URL:
MAX_COMMENT=주석 영역 보이기
MIN_COMMENT=주석 영역 숨기기
EDIT_UNDO_LAST=There is no history to undo
Expand Down
411 changes: 411 additions & 0 deletions chrome/locale/lv-LV/scrapbook/message.dtd

Large diffs are not rendered by default.

164 changes: 164 additions & 0 deletions chrome/locale/lv-LV/scrapbook/message.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
# -----------------------------------------------------------------------------
# capture.properties
# -----------------------------------------------------------------------------

CONNECT=Savienojas... %S
CONNECT_SUCCESS=Savienots ar (Content-Type: %S)
CONNECT_FAILURE=Savienojums neizdevās. (%S)
CONTENT_TYPE_FAILURE=Neizdevās noteikt Content-Type.
LOADING=Ielādē... %1$S %2$S
SAVE_START=Uzsāk saglabāšanu
SAVE_ABORT=Saglabāšana pārtraukta.
REBUILD_LINKS=Pārkārto saites (%S/%S)... %S : %S
REBUILD_LINKS_COMPLETE=Pabeigts.
WAITING=Gaida (%S s)...
FILTER_BY_STRING=URL, kas nesatur ievadīto virkni, tiks izslēgtas.


# -----------------------------------------------------------------------------
# combine.properties
# -----------------------------------------------------------------------------

FINISH_BUTTON_LABEL=Apvienot
CANNOT_COMBINE_FRAMES=Neizdevās apvienot, jo šī lapa satur rāmjus.
WARN_ABOUT_INDEPTH=PIEZĪME: Dziļajā saglabāšanā saglabātās saistītās lapas netiks apvienotas.


# -----------------------------------------------------------------------------
# fulltext.properties
# -----------------------------------------------------------------------------

BUILD_CACHE=Kešatmiņas atjaunošana
BUILD_CACHE_INIT=Inicializē...
BUILD_CACHE_UPDATE=Atjauno... %S
BUILD_CACHE_REMOVE=Noņemšana... %S
RESULTS_FOUND=Atrasti %S
MATCHING=Atbilst RegExp %S
INCLUDING=Iekļaujot %S
EXCLUDING=Neiekļaujot %S
QUOTATION='%S'


# -----------------------------------------------------------------------------
# overlay.properties
# -----------------------------------------------------------------------------

MAX_COMMENT=Expand Comment Area
MIN_COMMENT=Collapse Comment Area
EDIT_UNDO_LAST=There is no history to undo
EDIT_SAVE_CHANGES=The page is modified with ScrapBook. Be sure to discard them?
EDIT_REMOVE_HIGHLIGHT=Noņemt iezīmēto
EDIT_INLINE=Rediģēt '%S' iekļauto anotāciju
EDIT_ATTACH_LINK_TITLE=Attach Link
EDIT_ATTACH_INNERLINK_TITLE=Attach Inner Link
EDIT_ATTACH_FILE_TITLE=Attach File
EDIT_ATTACH_INNERLINK_ENTER=Input the item ID:
EDIT_ATTACH_INNERLINK_INVALID=Invalid item ID: %S
EDIT_ATTACH_FILE_OVERWRITE=Would you like to overwrite the file '%S'?
EDIT_ATTACH_FILE_INVALID=Unable to write '%S'.
SAVE=Saglabā... (%S) %S
SAVE_COMPLETE=Saglabāšana pabeigta
PAGE_SAVED=This page has %S saved version(s)!
TRANSFER_DATA=Datu pārsūtīšana... (%S Bytes)
DOWNLOAD_DATA=Downloading data... %S (%S)
ROOT_FOLDER=Saknes mape
SELECT_FOLDER=Atlasīt mapi...


# -----------------------------------------------------------------------------
# property.properties
# -----------------------------------------------------------------------------

ADDRESS=URL:
TYPE_FOLDER=Mape
TYPE_PAGE=Lapa
TYPE_NOTE=Piezīme
TYPE_NOTEX=Note Page
TYPE_FILE=Fails
TYPE_COMBINE=Kombinēta lapa
TYPE_INDEPTH=Dziļi saglabātās lapas
TYPE_BOOKMARK=Grāmatzīme
TYPE_SEPARATOR=Atdalītājs
FILES_COUNT=%S (%S Files, %S Folders)
ITEMS_COUNT=%S (%S Folders, %S Items)
CALCULATING=Aprēķināšana... (%S/%S)
DIAGNOSIS_OK=Labs
DIAGNOSIS_NG=Atrasti %S nederīgi vienumi
INVALID=NEDERĪGS


# -----------------------------------------------------------------------------
# scrapbook.properties
# -----------------------------------------------------------------------------

ROOT_FOLDER=Saknes mape
DEFAULT_FOLDER=Jauna mape
DEFAULT_NOTEX=New Note Page
SEARCH_RESULTS_FOUND=%S Results Found.
ITEMS_REMOVED=Dzēsti %S vienumi
COMPLETED=Pabeigts
CONFIRM_DELETE=Vai tiešām vēlaties dzēst šo vienumu?
FILTER_BY_DAYS=Ievadiet dienu skaitu filtrēšanai
ERROR_INVALID_URL=KĻŪDA: Nederīgs URL.\n%S
MB_CLOSE_WINDOW=Pirms mainīt saglabāšanas mapi, aizveriet logu:\n[%S]
SAVE_OK_BUTTON=Saglabāt
START_BUTTON=Sākt
SCANNING_TREE=Scanning... (%S)
SCANNING_DIR=Scanning (%S/%S)... %S
SCANNING_FILE=Scanning... (%S/%S)
ERR_FAIL_GET_DIR=ScrapBook FATAL ERROR: Failed to get data directory '%S'.
ERR_FAIL_REMOVE_FILE=ScrapBook ERROR: Failed to remove file '%S'.\n\n%S
ERR_FAIL_WRITE_FILE=ScrapBook ERROR: Failed to write file '%S'.\n\n%S
ERR_FILE_NOT_EXIST=ScrapBook ERROR: File '%S' does not exist.
ERR_FAIL_EXEC_FILE=ScrapBook ERROR: File '%S' is not executable.
MSG_LARGE_COMMENT=ScrapBook NOTICE: Too long comment makes ScrapBook slow.
ERR_FAIL_RESOLVE_URL=*** Failed to resolve URL '%2$S' (relative to '%1$S').
ERR_FAIL_SET_PREF=Unable to set pref: %S
WARN_DOUBLE_ENTRY=ScrapBook WARNING: Found double entries of resource '%S'.
ERR_NO_FILE2URL=ScrapBook ERROR: Could not find 'sb-file2url.txt'.
ERR_NO_URL2NAME=ScrapBook ERROR: Could not find 'sb-url2name.txt'.
ERR_NO_SOURCE_URL=ScrapBook ERROR: Could not find the source URL for '%S'.
ERR_INAVLID_REGEXP=RegExp syntax invalid: %S
ERR_FAIL_NOT_INTERNALIZE_TYPE=ScrapBook ERROR: You can do this only for HTML files.
ERR_FAIL_INIT_DATASOURCE=ScrapBook ERROR: Failed to initialize datasource.\n\n%S
ERR_FAIL_ADD_RESOURCE=ScrapBook ERROR: Failed to add resource to datasource.\n\n%S
ERR_FAIL_ADD_RESOURCE1=ScrapBook ERROR: Failed to add resource to datasource (1).\n\n%S
ERR_FAIL_ADD_RESOURCE2=ScrapBook ERROR: Failed to add resource to datasource (2).\n\n%S
ERR_FAIL_CLEAN_DATASOURCE=ScrapBook ERROR: Failed to clean up datasource.\n\n%S
ERR_FAIL_SAVE_FILE=ScrapBook ERROR: Cannot save file '%S'.
MSG_CANT_SAVE_LOCKED=This item is locked and cannot be saved.
MSG_CANT_MODIFY=ScrapBook ERROR: Cannot modify the content of files with type %S.
MSG_NOT_UTF8=ScrapBook NOTICE: '%S' is not UTF-8 encoded, unsupported chars may lose after saving.
ERR_UNKNOWN_DATA_TYPE=ScrapBook ERROR: Unknown data type %S.
MSG_ATTACH_ACROSS_TAGS=ScrapBook ERROR: Can't attach a link across HTML tags.
ERR_FAIL_READ_FILE_SIZE=ScrapBook ERROR: Cannot read file size from '%S'. (maybe due to long or improper file name)
MSG_NO_BACKUP_FILES=No backup files found.
ERR_FAIL_GET_CSS=Unable to access CSS from '%1$S' in page '%2$S'\n\n%3$S
ERR_FAIL_DOWNLOAD_FILE=*** Could not download file '%S'\n\n%S
ERR_FAIL_COPY_FILE="*** Could not copy file '%S'\n\n%S
ERR_FAIL_REMOVE_RESOURCE=ScrapBook ERROR: Failed to remove resource '%S' from datasource.
ERR_TRADE_INVALID_ARGS=Invalid agurments in sbTradeService::parseIndexDat.
ERR_FAIL_SEND=ScrapBook FATAL ERROR.
ERR_SEARCH_REGEXP_INAVLID=ERROR: Invalid regular expression '%S'
ERR_SEARCH_DATE_INAVLID=ERROR: Invalid date format '%S'
MSG_UPDATE_PREFS=Successfully updated preferences. Restart Firefox to apply full changes.
ERR_UPDATE_PREFS=ERROR: Failed to update preferences.\n\n%S
ERR_SAVE_DOWNLINKFILTER=The following RegExps are invalid and will be skipped on execution. Stop and fix them now?\n\n%S
ERR_SAVE_DOWNLINKFILTER_LINE=Line %S: %S
ERR_FAIL_MAKE_CONTAINER=Unable to convert the item to a folder.\n\n%S
ERR_FAIL_UNMAKE_CONTAINER=Unable to convert the item to a non-folder.\n\n%S
ERR_FAIL_UNMAKE_CONTAINER_NONEMPTY=The item must contain no subitems to be converted to a non-folder.


# -----------------------------------------------------------------------------
# trade.properties
# -----------------------------------------------------------------------------

DETECT=%S vienumi atrasti %S
FAILED=Neizdevās
CREATE_FOLDER=Izveidota mape [%S]
SELECT_PATH=Izvēlieties mapi eksportēšanai un importēšanai.
ERROR_SAME_ID_EXISTS=Tāds ID jau pastāv.
ERROR_INVALID_FILEPATH=KĻŪDA: Nepareizs faila ceļš.\n%S


1 change: 0 additions & 1 deletion chrome/locale/pl/scrapbook/message.properties
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ QUOTATION='%S'
# overlay.properties
# -----------------------------------------------------------------------------

ADDRESS=Adres URL:
MAX_COMMENT=Rozwiń obszar komentarzy
MIN_COMMENT=Zwiń obszar komentarzy
EDIT_UNDO_LAST=There is no history to undo
Expand Down
1 change: 0 additions & 1 deletion chrome/locale/pt-BR/scrapbook/message.properties
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ QUOTATION='%S'
# overlay.properties
# -----------------------------------------------------------------------------

ADDRESS=URL:
MAX_COMMENT=Expandir Área de Comentário
MIN_COMMENT=Comprimir Área de Comentário
EDIT_UNDO_LAST=There is no history to undo
Expand Down
1 change: 0 additions & 1 deletion chrome/locale/ro/scrapbook/message.properties
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ QUOTATION=„%S”
# overlay.properties
# -----------------------------------------------------------------------------

ADDRESS=Adresă:
MAX_COMMENT=Extinde zona de comentariu
MIN_COMMENT=Restrânge zona de comentariu
EDIT_UNDO_LAST=There is no history to undo
Expand Down
1 change: 0 additions & 1 deletion chrome/locale/ru-RU/scrapbook/message.properties
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ QUOTATION='%S'
# overlay.properties
# -----------------------------------------------------------------------------

ADDRESS=URL:
MAX_COMMENT=Увеличить поле комментария
MIN_COMMENT=Уменьшить поле комментария
EDIT_UNDO_LAST=There is no history to undo
Expand Down
1 change: 0 additions & 1 deletion chrome/locale/sk-SK/scrapbook/message.properties
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ QUOTATION='%S'
# overlay.properties
# -----------------------------------------------------------------------------

ADDRESS=Adresa URL:
MAX_COMMENT=Zobraziť pole pre komentár
MIN_COMMENT=Collapse Comment Area
EDIT_UNDO_LAST=There is no history to undo
Expand Down
Loading

0 comments on commit 7d21d41

Please sign in to comment.