Skip to content

Commit b71085a

Browse files
committed
Merge branch 'main' into chrome
2 parents 0439fa5 + 6a222a7 commit b71085a

File tree

11 files changed

+707
-9
lines changed

11 files changed

+707
-9
lines changed

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ Contributions (alphabetical order):
55

66
Essam Ambr aka (JaMaYcKa) https://github.com/JaMaYcKa2B1 (Arabic translation)
77
Henaro aka Ironwool https://github.com/perdolka (Russian and Ukrainian translation; redesign icon in svg; provide favicon)
8+
Sopor https://github.com/Sopor (Swedish translation)
89
Juan Salvador Aleixandre Talens https://github.com/juaalta (Spanish translation)
910
YFdyh000 <yfdyh000 at gmail.com> https://github.com/yfdyh000 (Simplified Chinese translation)

ChangeLog

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# ChangeLog for bookmarkdupes
22

3+
*bookmarkdupes-7.2:
4+
Martin Väth <martin at mvath.de>:
5+
- Merge changes from 6.6 (in particular: include swedish locales)
6+
37
*bookmarkdupes-7.1:
48
Martin Väth <martin at mvath.de>:
59
- Merge changes from 6.5 (in particular: include arabic locales)
@@ -8,6 +12,10 @@
812
Martin Väth <martin at mvath.de>:
913
- Remove support for stripping descriptions
1014

15+
*bookmarkdupes-6.6:
16+
Sopor:
17+
- Create ar sv_SE locales
18+
1119
*bookmarkdupes-6.5:
1220
Martin Väth <martin at mvath.de>:
1321
- Minor compatibility improvements

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ Explanation: First replace the URL by its full name path, and then omit the last
171171
(in alphabetical order)
172172

173173
- Essam Ambr aka (JaMaYcKa) https://github.com/JaMaYcKa2B1 (Arabic translation)
174+
- Sopor https://github.com/Sopor (Swedish translation)
174175
- Henaro aka Ironwool https://github.com/perdolka (Russian and Ukrainian translation; redesign icon in svg; provide favicon)
175176
- Juan Salvador Aleixandre Talens https://github.com/juaalta (Spanish translation)
176177
- YFdyh000 <yfdyh000 at gmail.com> https://github.com/yfdyh000 (Simplified Chinese translation)

_locales/de/messages.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"titleCheckboxRules": {
2727
"message": "Mit dieser Option können Lesezeichen ignoriert oder ähnliche Lesezeichen gefunden werde. Die Details werden mit Hilfe regulärer Ausdrücke festgelegt.",
28-
"description": "Explain what regular expresssions are used for"
28+
"description": "Explain what regular expressions are used for"
2929
},
3030
"radioFilter": {
3131
"message": "Ignorieren",

_locales/en/messages.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"titleCheckboxRules": {
2727
"message": "With this option bookmarks can be ignored or similar bookmarks can be found. The details are specified in terms of regular expressions.",
28-
"description": "Explain what regular expresssions are used for"
28+
"description": "Explain what regular expressions are used for"
2929
},
3030
"radioFilter": {
3131
"message": "Filter",
@@ -96,7 +96,7 @@
9696
"description": "Input field for the replacement text for the regular expression matches. The text should be short"
9797
},
9898
"titleRuleReplace": {
99-
"message": "The replacement text for the regular expresssion matches. Symbols like $$& or $$1 can be used to refer to the match or a brace content. The special texts \\L$$& and \\U$$& mean a lower and upper case version of the matches, respectively. The special texts $$URL, $$NAME, and $$TITLE mean the original (unmodified) URL and the bookmark full name/title (with/without path), respectively. The latter three can be preceeded or followed by $$& to prepend or append the original match",
99+
"message": "The replacement text for the regular expression matches. Symbols like $$& or $$1 can be used to refer to the match or a brace content. The special texts \\L$$& and \\U$$& mean a lower and upper case version of the matches, respectively. The special texts $$URL, $$NAME, and $$TITLE mean the original (unmodified) URL and the bookmark full name/title (with/without path), respectively. The latter three can be preceded or followed by $$& to prepend or append the original match",
100100
"description": "Explain that the text will be used as replacement text for the regular expression matches"
101101
},
102102
"buttonRuleUp": {

_locales/es/messages.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"titleCheckboxRules": {
2727
"message": "Con esta opción, se pueden ignorar los marcadores o se pueden encontrar marcadores similares. Los detalles se especifican en términos de expresiones regulares.",
28-
"description": "Explain what regular expresssions are used for"
28+
"description": "Explain what regular expressions are used for"
2929
},
3030
"radioFilter": {
3131
"message": "Filtro",

_locales/ru/messages.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"titleCheckboxRules": {
2727
"message": "С помощью этой опции можно игнорировать или находить подобные закладки, в соответствии с правилами. Подробности указано в терминах регулярных выражений.",
28-
"description": "Explain what regular expresssions are used for"
28+
"description": "Explain what regular expressions are used for"
2929
},
3030
"radioFilter": {
3131
"message": "Фильтр\u00A0\u00A0",

0 commit comments

Comments
 (0)