SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
Physolia · Nov 11, 2023 · dc789b0 · dc789b0
1 parent 12b3d7f
commit dc789b0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/urifilters/ikws/searchproviders/codeberg.desktop b/src/urifilters/ikws/searchproviders/codeberg.desktop
@@ -5,12 +5,14 @@ Keys=codeberg,cb
 Name=Codeberg
 Name[ca]=Codeberg
 Name[ca@valencia]=Codeberg
+Name[cs]=Codeberg
 Name[eo]=Codeberg
 Name[es]=Codeberg
 Name[eu]=Codeberg
 Name[fr]=Codeberg
 Name[he]=Codeberg
 Name[ia]=Codeberg
+Name[it]=Codeberg
 Name[ka]=Codeberg
 Name[nl]=Codeberg
 Name[pl]=Codeberg
@@ -19,6 +21,7 @@ Name[sl]=Codeberg
 Name[tr]=Codeberg
 Name[uk]=Codeberg
 Name[x-test]=xxCodebergxx
+Name[zh_TW]=Codeberg
 Query=https://codeberg.org/explore/repos?sort=recentupdate&language=&q=\\{@}&only_show_relevant=true
 Query[ca]=https://codeberg.org/explore/repos?sort=recentupdate&language=&q=\\{@}&only_show_relevant=true
 Query[ca@valencia]=https://codeberg.org/explore/repos?sort=recentupdate&language=&q=\\{@}&only_show_relevant=true
@@ -28,6 +31,7 @@ Query[eu]=https://codeberg.org/explore/repos?sort=recentupdate&language=&q=\\{@}
 Query[fr]=https://codeberg.org/explore/repos?sort=recentupdate&language=&q=\\{@}&only_show_relevant=true
 Query[he]=https://codeberg.org/explore/repos?sort=recentupdate&language=&q=\\{@}&only_show_relevant=true
 Query[ia]=https://codeberg.org/explore/repos?sort=recentupdate&language=&q=\\{@}&only_show_relevant=true
+Query[it]=https://codeberg.org/explore/repos?sort=recentupdate&language=&q=\\{@}&only_show_relevant=true
 Query[ka]=https://codeberg.org/explore/repos?sort=recentupdate&language=&q=\\{@}&only_show_relevant=true
 Query[nl]=https://codeberg.org/explore/repos?sort=recentupdate&language=&q=\\{@}&only_show_relevant=true
 Query[pl]=https://codeberg.org/explore/repos?sort=recentupdate&language=&q=\\{@}&only_show_relevant=true
@@ -36,4 +40,5 @@ Query[sl]=https://codeberg.org/explore/repos?sort=recentupdate&language=&q=\\{@}
 Query[tr]=https://codeberg.org/explore/repos?sort=recentupdate&language=&q=\\{@}&only_show_relevant=true
 Query[uk]=https://codeberg.org/explore/repos?sort=recentupdate&language=&q=\\{@}&only_show_relevant=true
 Query[x-test]=xxhttps://codeberg.org/explore/repos?sort=recentupdate&language=&q=\\{@}&only_show_relevant=truexx
+Query[zh_TW]=https://codeberg.org/explore/repos?sort=recentupdate&language=&q=\\{@}&only_show_relevant=true
 Type=Service
diff --git a/src/urifilters/ikws/searchproviders/pypi.desktop b/src/urifilters/ikws/searchproviders/pypi.desktop
@@ -11,6 +11,7 @@ Name[eu]=PyPI
 Name[fr]=PyPI
 Name[he]=PyPI
 Name[ia]=PyPI
+Name[it]=PyPI
 Name[ka]=PyPI
 Name[nl]=PyPI
 Name[pl]=PyPI
@@ -19,16 +20,19 @@ Name[sl]=PyPI
 Name[tr]=PyPI
 Name[uk]=PyPI
 Name[x-test]=xxPyPIxx
+Name[zh_TW]=PyPI
 Query=https://pypi.org/search/?q=\\{@}
 Query[ast]=https://pypi.org/search/?q=\\{@}
 Query[ca]=https://pypi.org/search/?q=\\{@}
 Query[ca@valencia]=https://pypi.org/search/?q=\\{@}
+Query[cs]=https://pypi.org/search/?q=\\{@}
 Query[eo]=https://pypi.org/search/?q=\\{@}
 Query[es]=https://pypi.org/search/?q=\\{@}
 Query[eu]=https://pypi.org/search/?q=\\{@}
 Query[fr]=https://pypi.org/search/?q=\\{@}
 Query[he]=https://pypi.org/search/?q=\\{@}
 Query[ia]=https://pypi.org/search/?q=\\{@}
+Query[it]=https://pypi.org/search/?q=\\{@}
 Query[ka]=https://pypi.org/search/?q=\\{@}
 Query[nl]=https://pypi.org/search/?q=\\{@}
 Query[pl]=https://pypi.org/search/?q=\\{@}
@@ -37,4 +41,5 @@ Query[sl]=https://pypi.org/search/?q=\\{@}
 Query[tr]=https://pypi.org/search/?q=\\{@}
 Query[uk]=https://pypi.org/search/?q=\\{@}
 Query[x-test]=xxhttps://pypi.org/search/?q=\\{@}xx
+Query[zh_TW]=https://pypi.org/search/?q=\\{@}
 Type=Service