Bookmark: Clean up translations

Some unusual contexts went unnoticed so far.

Change-Id: I6017d8ae92310ee3b56538d1fa5c52f0de0a4c8a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>

share/qtcreator/translations/qtcreator_cs.ts

@@ -44,7 +44,7 @@
     </message>
 </context>
 <context>
-    <name>BookmarkDialog</name>
+    <name>Bookmarks</name>
     <message>
         <source>Add Bookmark</source>
         <translation>Přidat záložku</translation>
@@ -81,13 +81,6 @@
         <source>Add in folder:</source>
         <translation>Přidat do složky:</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkManager</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Záložky</translation>
-    </message>
     <message>
         <source>Remove</source>
         <translation>Odstranit</translation>
@@ -100,21 +93,6 @@
         <source>You are going to delete a Folder which will also&lt;br&gt;remove its content. Are you sure you would like to continue?</source>
         <translation type="obsolete">Chystáte se smazat složku, přičemž se smaže&lt;br&gt;i její obsah. Jste si jistý, že přesto chcete pokračovat?</translation>
     </message>
-    <message>
-        <source>New Folder</source>
-        <translation>Nová složka</translation>
-    </message>
-</context>
-<context>
-    <name>BookmarkWidget</name>
-    <message>
-        <source>Delete Folder</source>
-        <translation>Smazat složku</translation>
-    </message>
-    <message>
-        <source>Rename Folder</source>
-        <translation>Přejmenovat složku</translation>
-    </message>
     <message>
         <source>Show Bookmark</source>
         <translation>Ukázat záložku</translation>
@@ -143,17 +121,6 @@
         <source>Add</source>
         <translation>Přidat</translation>
     </message>
-    <message>
-        <source>Remove</source>
-        <translation>Odstranit</translation>
-    </message>
-</context>
-<context>
-    <name>Bookmarks</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Záložky</translation>
-    </message>
     <message>
         <source>Move Up</source>
         <translation>Posunout nahoru</translation>

share/qtcreator/translations/qtcreator_da.ts

@@ -3883,7 +3883,7 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
     </message>
 </context>
 <context>
-    <name>BookmarkDialog</name>
+    <name>Bookmarks</name>
     <message>
         <source>Add Bookmark</source>
         <translation>Tilføj bogmærke</translation>
@@ -3916,13 +3916,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
         <source>Rename Folder</source>
         <translation>Omdøb mappe</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkManager</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Bogmærker</translation>
-    </message>
     <message>
         <source>Remove</source>
         <translation>Fjern</translation>
@@ -3931,25 +3924,10 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
         <source>Deleting a folder also removes its content.&lt;br&gt;Do you want to continue?</source>
         <translation>Sletning af en mappe fjerner også alt dens indhold.&lt;br&gt;Vil du fortsætte?</translation>
     </message>
-    <message>
-        <source>New Folder</source>
-        <translation>Ny mappe</translation>
-    </message>
     <message>
         <source>Bookmark</source>
         <translation>Bogmærke</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkWidget</name>
-    <message>
-        <source>Delete Folder</source>
-        <translation>Slet mappe</translation>
-    </message>
-    <message>
-        <source>Rename Folder</source>
-        <translation>Omdøb mappe</translation>
-    </message>
     <message>
         <source>Show Bookmark</source>
         <translation>Vis bogmærke</translation>
@@ -3966,9 +3944,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
         <source>Rename Bookmark</source>
         <translation>Omdøb bogmærke</translation>
     </message>
-</context>
-<context>
-    <name>Bookmarks</name>
     <message>
         <source>Edit Bookmark</source>
         <translation>Rediger bogmærke</translation>
@@ -3981,10 +3956,6 @@ F.eks., vil &quot;Revision: 15&quot; efterlade grenen ved revision 15.</translat
         <source>Line number:</source>
         <translation>Linjenummer:</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Bogmærker</translation>
-    </message>
     <message>
         <source>Move Up</source>
         <translation>Flyt op</translation>

share/qtcreator/translations/qtcreator_de.ts

@@ -25,7 +25,7 @@
     </message>
 </context>
 <context>
-    <name>BookmarkDialog</name>
+    <name>Bookmarks</name>
     <message>
         <source>Add Bookmark</source>
         <translation>Lesezeichen hinzufügen</translation>
@@ -58,13 +58,6 @@
         <source>Add in folder:</source>
         <translation>Im Verzeichnis:</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkManager</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Lesezeichen</translation>
-    </message>
     <message>
         <source>Remove</source>
         <translation>Entfernen</translation>
@@ -73,25 +66,10 @@
         <source>Deleting a folder also removes its content.&lt;br&gt;Do you want to continue?</source>
         <translation>Beim Löschen eines Verzeichnisses wird auch dessen Inhalt gelöscht.&lt;br&gt;Möchten Sie trotzdem fortsetzen?</translation>
     </message>
-    <message>
-        <source>New Folder</source>
-        <translation>Neues Verzeichnis</translation>
-    </message>
     <message>
         <source>Bookmark</source>
         <translation>Lesezeichen</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkWidget</name>
-    <message>
-        <source>Delete Folder</source>
-        <translation>Verzeichnis löschen</translation>
-    </message>
-    <message>
-        <source>Rename Folder</source>
-        <translation>Verzeichnis umbenennen</translation>
-    </message>
     <message>
         <source>Show Bookmark</source>
         <translation>Lesezeichen anzeigen</translation>
@@ -108,13 +86,6 @@
         <source>Rename Bookmark</source>
         <translation>Lesezeichen umbenennen</translation>
     </message>
-</context>
-<context>
-    <name>Bookmarks</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Lesezeichen</translation>
-    </message>
     <message>
         <source>Move Up</source>
         <translation>Nach oben</translation>

share/qtcreator/translations/qtcreator_es.ts

@@ -89,7 +89,7 @@
     </message>
 </context>
 <context>
-    <name>BookmarkDialog</name>
+    <name>Bookmarks</name>
     <message>
         <source>Add Bookmark</source>
         <translation>Agregar marcador</translation>
@@ -126,17 +126,10 @@
         <source>Rename Folder</source>
         <translation>Renombrar directorio</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkManager</name>
     <message>
         <source>Bookmark</source>
         <translation type="obsolete">Marcador</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Marcadores</translation>
-    </message>
     <message>
         <source>Remove</source>
         <translation>Suprimir</translation>
@@ -149,17 +142,6 @@
         <source>New Folder</source>
         <translation>Nuevo directorio</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkWidget</name>
-    <message>
-        <source>Delete Folder</source>
-        <translation>Suprimir directorio</translation>
-    </message>
-    <message>
-        <source>Rename Folder</source>
-        <translation>Renombrar directorio</translation>
-    </message>
     <message>
         <source>Show Bookmark</source>
         <translation>Mostrar marcador</translation>
@@ -184,17 +166,6 @@
         <source>Add</source>
         <translation>Agregar</translation>
     </message>
-    <message>
-        <source>Remove</source>
-        <translation>Suprimir</translation>
-    </message>
-</context>
-<context>
-    <name>Bookmarks</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Marcadores</translation>
-    </message>
     <message>
         <source>&amp;Remove Bookmark</source>
         <translation>Sup&amp;rimir marcador</translation>

share/qtcreator/translations/qtcreator_fr.ts

@@ -48,7 +48,7 @@
     </message>
 </context>
 <context>
-    <name>BookmarkDialog</name>
+    <name>Bookmarks</name>
     <message>
         <source>Add Bookmark</source>
         <translation>Ajouter un signet</translation>
@@ -85,17 +85,10 @@
         <source>Add in folder:</source>
         <translation>Ajouter dans le dossier :</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkManager</name>
     <message>
         <source>Bookmark</source>
         <translation type="obsolete">Signet</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Signets</translation>
-    </message>
     <message>
         <source>Remove</source>
         <translation>Supprimer</translation>
@@ -108,21 +101,6 @@
         <source>You are going to delete a Folder which will also&lt;br&gt;remove its content. Are you sure you would like to continue?</source>
         <translation type="obsolete">Vous allez supprimer un dossier et tout ce qu&apos;il contient.&lt;br&gt;Êtes vous sûr de vouloir continuer ?</translation>
     </message>
-    <message>
-        <source>New Folder</source>
-        <translation>Nouveau dossier</translation>
-    </message>
-</context>
-<context>
-    <name>BookmarkWidget</name>
-    <message>
-        <source>Delete Folder</source>
-        <translation>Supprimer le dossier</translation>
-    </message>
-    <message>
-        <source>Rename Folder</source>
-        <translation>Renommer le dossier</translation>
-    </message>
     <message>
         <source>Show Bookmark</source>
         <translation>Afficher le signet</translation>
@@ -151,17 +129,6 @@
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
-    <message>
-        <source>Remove</source>
-        <translation>Supprimer</translation>
-    </message>
-</context>
-<context>
-    <name>Bookmarks</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Signets</translation>
-    </message>
     <message>
         <source>Move Up</source>
         <translation>Déplacer vers le haut</translation>

share/qtcreator/translations/qtcreator_hr.ts

@@ -9383,7 +9383,7 @@ should a repository require SSH-authentication (see documentation on SSH and the
     </message>
 </context>
 <context>
-    <name>BookmarkDialog</name>
+    <name>Bookmarks</name>
     <message>
         <source>Add Bookmark</source>
         <translation>Dodaj knjižnu oznaku</translation>
@@ -16741,15 +16741,11 @@ Check the test environment.</source>
     </message>
 </context>
 <context>
-    <name>BookmarkManager</name>
+    <name>Bookmarks</name>
     <message>
         <source>Bookmark</source>
         <translation>Knjižna oznaka</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Knjižne oznake</translation>
-    </message>
     <message>
         <source>Remove</source>
         <translation>Ukloni</translation>
@@ -16758,17 +16754,6 @@ Check the test environment.</source>
         <source>Deleting a folder also removes its content.&lt;br&gt;Do you want to continue?</source>
         <translation>Brisanjem mape se uklanja i njen sadržaj.&lt;br&gt;Želiš li nastaviti?</translation>
     </message>
-    <message>
-        <source>New Folder</source>
-        <translation>Nova mapa</translation>
-    </message>
-</context>
-<context>
-    <name>Bookmarks</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Knjižne oznake</translation>
-    </message>
     <message>
         <source>Move Up</source>
         <translation>Premjesti prema gore</translation>
@@ -40861,15 +40846,7 @@ What do you want to do?</source>
     </message>
 </context>
 <context>
-    <name>BookmarkWidget</name>
+    <name>Bookmarks</name>
-    <message>
-        <source>Delete Folder</source>
-        <translation>Ukloni mapu</translation>
-    </message>
-    <message>
-        <source>Rename Folder</source>
-        <translation>Preimenuj mapu</translation>
-    </message>
     <message>
         <source>Show Bookmark</source>
         <translation>Prikaži knjižnu oznaku</translation>

share/qtcreator/translations/qtcreator_hu.ts

@@ -77,7 +77,7 @@
     </message>
 </context>
 <context>
-    <name>BookmarkDialog</name>
+    <name>Bookmarks</name>
     <message>
         <source>Add Bookmark</source>
         <translation>Künyvjelző hozzáadása</translation>
@@ -110,13 +110,6 @@
         <source>Rename Folder</source>
         <translation>Dosszié átnevezése</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkManager</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Könyvjelzők</translation>
-    </message>
     <message>
         <source>Remove</source>
         <translation>Eltávolítás</translation>
@@ -125,13 +118,6 @@
         <source>You are going to delete a Folder which will also&lt;br&gt;remove its content. Are you sure you would like to continue?</source>
         <translation>Egy olyan irattárat fog törölni, mely &lt;br&gt;törölni fogja annak tartalmát is. Biztos benne, hogy folytatni szeretné?</translation>
     </message>
-    <message>
-        <source>New Folder</source>
-        <translation>Új dosszié</translation>
-    </message>
-</context>
-<context>
-    <name>BookmarkWidget</name>
     <message>
         <source>Delete Folder</source>
         <translation>Irattár törlése</translation>
@@ -164,21 +150,10 @@
         <source>Add</source>
         <translation>Hozzáadás</translation>
     </message>
-    <message>
-        <source>Remove</source>
-        <translation>Eltávolítás</translation>
-    </message>
-</context>
-<context>
-    <name>Bookmarks</name>
     <message>
         <source>&amp;Remove Bookmark</source>
         <translation type="obsolete">Könyvjelző &amp;eltávolítása</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Könyvjelzők</translation>
-    </message>
     <message>
         <source>Remove all Bookmarks</source>
         <translation>Az összes könyvjelző eltávolítása</translation>

share/qtcreator/translations/qtcreator_it.ts

@@ -98,7 +98,7 @@
     </message>
 </context>
 <context>
-    <name>BookmarkDialog</name>
+    <name>Bookmarks</name>
     <message>
         <source>Add Bookmark</source>
         <translation>Aggiungi un Segnalibro</translation>
@@ -135,17 +135,10 @@
         <source>Rename Folder</source>
         <translation>Rinomina la Cartella</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkManager</name>
     <message>
         <source>Bookmark</source>
         <translation type="obsolete">Segnalibro</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Segnalibri</translation>
-    </message>
     <message>
         <source>Remove</source>
         <translation>Rimuovi</translation>
@@ -158,17 +151,6 @@
         <source>New Folder</source>
         <translation>Nuova Cartella</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkWidget</name>
-    <message>
-        <source>Delete Folder</source>
-        <translation>Cancella la Cartella</translation>
-    </message>
-    <message>
-        <source>Rename Folder</source>
-        <translation>Rinomina la Cartella</translation>
-    </message>
     <message>
         <source>Show Bookmark</source>
         <translation>Mostra il Segnalibro</translation>
@@ -193,17 +175,6 @@
         <source>Add</source>
         <translation>Aggiungi</translation>
     </message>
-    <message>
-        <source>Remove</source>
-        <translation>Rimuovi</translation>
-    </message>
-</context>
-<context>
-    <name>Bookmarks</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Segnalibri</translation>
-    </message>
     <message>
         <source>&amp;Remove Bookmark</source>
         <translation>&amp;Rimuovi Segnalibro</translation>

share/qtcreator/translations/qtcreator_ja.ts

@@ -7513,7 +7513,7 @@ SSH 認証が必要とされるリポジトリで使用されます(SSH の SSH_
     </message>
 </context>
 <context>
-    <name>BookmarkDialog</name>
+    <name>Bookmarks</name>
     <message>
         <source>Add Bookmark</source>
         <translation>ブックマークの追加</translation>
@@ -12877,10 +12877,6 @@ in the system&apos;s browser for manual download.</source>
 </context>
 <context>
     <name>Bookmarks</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>ブックマーク</translation>
-    </message>
     <message>
         <source>Move Up</source>
         <translation>上に移動</translation>
@@ -33401,15 +33397,7 @@ When a problem is detected, the application is interrupted and can be debugged.<
     </message>
 </context>
 <context>
-    <name>BookmarkWidget</name>
+    <name>Bookmarks</name>
-    <message>
-        <source>Delete Folder</source>
-        <translation>フォルダを削除する</translation>
-    </message>
-    <message>
-        <source>Rename Folder</source>
-        <translation>フォルダ名の変更</translation>
-    </message>
     <message>
         <source>Show Bookmark</source>
         <translation>ブックマークを開く</translation>
@@ -33426,13 +33414,6 @@ When a problem is detected, the application is interrupted and can be debugged.<
         <source>Rename Bookmark</source>
         <translation>ブックマークの名前変更</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkManager</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>ブックマーク</translation>
-    </message>
     <message>
         <source>Remove</source>
         <translation>削除</translation>
@@ -33441,10 +33422,6 @@ When a problem is detected, the application is interrupted and can be debugged.<
         <source>Deleting a folder also removes its content.&lt;br&gt;Do you want to continue?</source>
         <translation>フォルダを削除すると中身も削除されます。&lt;br&gt;続行しますか？</translation>
     </message>
-    <message>
-        <source>New Folder</source>
-        <translation>新しいフォルダ</translation>
-    </message>
     <message>
         <source>Bookmark</source>
         <translation>ブックマーク</translation>

share/qtcreator/translations/qtcreator_pl.ts

@@ -1378,7 +1378,7 @@
     </message>
 </context>
 <context>
-    <name>BookmarkDialog</name>
+    <name>Bookmarks</name>
     <message>
         <source>Add Bookmark</source>
         <translation>Dodaj zakładkę</translation>
@@ -1986,10 +1986,6 @@ Przyczyna: %3</translation>
 </context>
 <context>
     <name>Bookmarks</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Zakładki</translation>
-    </message>
     <message>
         <source>Move Up</source>
         <translation>Przenieś do góry</translation>
@@ -9958,15 +9954,7 @@ Nie zostanie zastosowane do białych znaków w komentarzach i ciągach znakowych
     </message>
 </context>
 <context>
-    <name>BookmarkWidget</name>
+    <name>Bookmarks</name>
-    <message>
-        <source>Delete Folder</source>
-        <translation>Usuń katalog</translation>
-    </message>
-    <message>
-        <source>Rename Folder</source>
-        <translation>Zmień nazwę katalogu</translation>
-    </message>
     <message>
         <source>Show Bookmark</source>
         <translation>Pokaż zakładkę</translation>
@@ -9983,13 +9971,6 @@ Nie zostanie zastosowane do białych znaków w komentarzach i ciągach znakowych
         <source>Rename Bookmark</source>
         <translation>Zmień nazwę zakładki</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkManager</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Zakładki</translation>
-    </message>
     <message>
         <source>Remove</source>
         <translation>Usuń</translation>
@@ -9998,10 +9979,6 @@ Nie zostanie zastosowane do białych znaków w komentarzach i ciągach znakowych
         <source>Deleting a folder also removes its content.&lt;br&gt;Do you want to continue?</source>
         <translation>Usunięcie katalogu usuwa również jego zawartość.&lt;br&gt;Czy kontynuować?</translation>
     </message>
-    <message>
-        <source>New Folder</source>
-        <translation>Nowy katalog</translation>
-    </message>
     <message>
         <source>Bookmark</source>
         <translation>Zakładka</translation>

share/qtcreator/translations/qtcreator_ru.ts

@@ -5577,7 +5577,7 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
     </message>
 </context>
 <context>
-    <name>BookmarkDialog</name>
+    <name>Bookmarks</name>
     <message>
         <source>Add Bookmark</source>
         <translation>Добавить закладку</translation>
@@ -5610,13 +5610,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
         <source>Add in folder:</source>
         <translation>Добавить в папку:</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkManager</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Закладки</translation>
-    </message>
     <message>
         <source>Remove</source>
         <translation>Удалить</translation>
@@ -5625,25 +5618,10 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
         <source>Deleting a folder also removes its content.&lt;br&gt;Do you want to continue?</source>
         <translation>Удаление папки приведёт к удалению её содержимого.&lt;br&gt;Желаете продолжить?</translation>
     </message>
-    <message>
-        <source>New Folder</source>
-        <translation>Новая папка</translation>
-    </message>
     <message>
         <source>Bookmark</source>
         <translation>Закладка</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkWidget</name>
-    <message>
-        <source>Delete Folder</source>
-        <translation>Удалить папку</translation>
-    </message>
-    <message>
-        <source>Rename Folder</source>
-        <translation>Переименовать папку</translation>
-    </message>
     <message>
         <source>Show Bookmark</source>
         <translation>Показать закладку</translation>
@@ -5660,13 +5638,6 @@ For example, &quot;Revision: 15&quot; will leave the branch at revision 15.</sou
         <source>Rename Bookmark</source>
         <translation>Переименовать закладку</translation>
     </message>
-</context>
-<context>
-    <name>Bookmarks</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Закладки</translation>
-    </message>
     <message>
         <source>Edit Bookmark</source>
         <translation>Изменение закладки</translation>

share/qtcreator/translations/qtcreator_sl.ts

@@ -109,7 +109,7 @@
     </message>
 </context>
 <context>
-    <name>BookmarkDialog</name>
+    <name>Bookmarks</name>
     <message>
         <source>Add Bookmark</source>
         <translation>Dodaj zaznamek</translation>
@@ -149,13 +149,6 @@
         <source>Add in Folder:</source>
         <translation type="obsolete">Dodaj v mapo:</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkManager</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Zaznamki</translation>
-    </message>
     <message>
         <source>Remove</source>
         <translation>Odstrani</translation>
@@ -164,25 +157,10 @@
         <source>Deleting a folder also removes its content.&lt;br&gt;Do you want to continue?</source>
         <translation>Izbris mape odstrani tudi njeno vsebino.&lt;br&gt;Ali želite nadaljevati?</translation>
     </message>
-    <message>
-        <source>New Folder</source>
-        <translation>Nova mapa</translation>
-    </message>
     <message>
         <source>You are going to delete a Folder which will also&lt;br&gt;remove its content. Are you sure you would like to continue?</source>
         <translation type="obsolete">Nameravate izbrisati mapo, pri čemer bo zbrisana&lt;br&gt;tudi njena vsebina. Ali res želite nadaljevati?</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkWidget</name>
-    <message>
-        <source>Delete Folder</source>
-        <translation>Izbriši mapo</translation>
-    </message>
-    <message>
-        <source>Rename Folder</source>
-        <translation>Preimenuj mapo</translation>
-    </message>
     <message>
         <source>Show Bookmark</source>
         <translation>Prikaži zaznamek</translation>
@@ -203,17 +181,6 @@
         <source>Add</source>
         <translation>Dodaj</translation>
     </message>
-    <message>
-        <source>Remove</source>
-        <translation>Odstrani</translation>
-    </message>
-</context>
-<context>
-    <name>Bookmarks</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Zaznamki</translation>
-    </message>
     <message>
         <source>Move Up</source>
         <translation>Premakni gor</translation>

share/qtcreator/translations/qtcreator_uk.ts

@@ -806,7 +806,7 @@ Local pulls are not applied to the master branch.</source>
     </message>
 </context>
 <context>
-    <name>BookmarkDialog</name>
+    <name>Bookmarks</name>
     <message>
         <source>Add Bookmark</source>
         <translation>Додати закладку</translation>
@@ -839,13 +839,6 @@ Local pulls are not applied to the master branch.</source>
         <source>Add in folder:</source>
         <translation>Додати в теку:</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkManager</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Закладки</translation>
-    </message>
     <message>
         <source>Remove</source>
         <translation>Видалити</translation>
@@ -854,21 +847,6 @@ Local pulls are not applied to the master branch.</source>
         <source>Deleting a folder also removes its content.&lt;br&gt;Do you want to continue?</source>
         <translation>Видалення теки призводить до видалення її вмісту.&lt;br&gt;Бажаєте продовжити?</translation>
     </message>
-    <message>
-        <source>New Folder</source>
-        <translation>Нова тека</translation>
-    </message>
-</context>
-<context>
-    <name>BookmarkWidget</name>
-    <message>
-        <source>Delete Folder</source>
-        <translation>Видалити теку</translation>
-    </message>
-    <message>
-        <source>Rename Folder</source>
-        <translation>Перейменувати теку</translation>
-    </message>
     <message>
         <source>Show Bookmark</source>
         <translation>Показати закладку</translation>
@@ -889,17 +867,6 @@ Local pulls are not applied to the master branch.</source>
         <source>Add</source>
         <translation type="vanished">Додати</translation>
     </message>
-    <message>
-        <source>Remove</source>
-        <translation type="vanished">Видалити</translation>
-    </message>
-</context>
-<context>
-    <name>Bookmarks</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Закладки</translation>
-    </message>
     <message>
         <source>Move Up</source>
         <translation>Пересунути вгору</translation>

share/qtcreator/translations/qtcreator_zh_CN.ts

@@ -114,7 +114,7 @@
     </message>
 </context>
 <context>
-    <name>BookmarkDialog</name>
+    <name>Bookmarks</name>
     <message>
         <source>Add Bookmark</source>
         <translation>添加书签</translation>
@@ -151,13 +151,6 @@
         <source>Add in folder:</source>
         <translation>添加到文件夹:</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkManager</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>书签</translation>
-    </message>
     <message>
         <source>Remove</source>
         <translation>删除</translation>
@@ -166,21 +159,6 @@
         <source>Deleting a folder also removes its content.&lt;br&gt;Do you want to continue?</source>
         <translation>删除文件夹会同时删除文件夹下的文件。&lt;br&gt;您确定继续吗？</translation>
     </message>
-    <message>
-        <source>New Folder</source>
-        <translation>新文件夹</translation>
-    </message>
-</context>
-<context>
-    <name>BookmarkWidget</name>
-    <message>
-        <source>Delete Folder</source>
-        <translation>删除文件夹</translation>
-    </message>
-    <message>
-        <source>Rename Folder</source>
-        <translation>重命名文件夹</translation>
-    </message>
     <message>
         <source>Show Bookmark</source>
         <translation>显示书签</translation>
@@ -205,17 +183,6 @@
         <source>Add</source>
         <translation>添加</translation>
     </message>
-    <message>
-        <source>Remove</source>
-        <translation>删除</translation>
-    </message>
-</context>
-<context>
-    <name>Bookmarks</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>书签</translation>
-    </message>
     <message>
         <source>Move Up</source>
         <translation>向上移动</translation>

share/qtcreator/translations/qtcreator_zh_TW.ts

@@ -32,7 +32,7 @@
     </message>
 </context>
 <context>
-    <name>BookmarkDialog</name>
+    <name>Bookmarks</name>
     <message>
         <source>Add Bookmark</source>
         <translation>新增書籤</translation>
@@ -65,13 +65,6 @@
         <source>Add in folder:</source>
         <translation>新增到資料夾:</translation>
     </message>
-</context>
-<context>
-    <name>BookmarkManager</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>書籤</translation>
-    </message>
     <message>
         <source>Remove</source>
         <translation>移除</translation>
@@ -80,21 +73,6 @@
         <source>Deleting a folder also removes its content.&lt;br&gt;Do you want to continue?</source>
         <translation>刪除資料夾會同時移除它的內容。&lt;br&gt;您確定要繼續嗎?</translation>
     </message>
-    <message>
-        <source>New Folder</source>
-        <translation>新資料夾</translation>
-    </message>
-</context>
-<context>
-    <name>BookmarkWidget</name>
-    <message>
-        <source>Delete Folder</source>
-        <translation>刪除資料夾</translation>
-    </message>
-    <message>
-        <source>Rename Folder</source>
-        <translation>重新命名資料夾</translation>
-    </message>
     <message>
         <source>Show Bookmark</source>
         <translation>顯示書籤</translation>
@@ -115,17 +93,6 @@
         <source>Add</source>
         <translation>新增</translation>
     </message>
-    <message>
-        <source>Remove</source>
-        <translation>移除</translation>
-    </message>
-</context>
-<context>
-    <name>Bookmarks</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>書籤</translation>
-    </message>
     <message>
         <source>Move Up</source>
         <translation>向上移動</translation>

src/plugins/autotoolsprojectmanager/makefileparserthread.cpp

@@ -5,7 +5,7 @@
 
 #include <QMutexLocker>
 
-using namespace AutotoolsProjectManager::Internal;
+namespace AutotoolsProjectManager::Internal {
 
 MakefileParserThread::MakefileParserThread(ProjectExplorer::BuildSystem *bs)
     : m_parser(bs->projectFilePath().toString()),
@@ -92,3 +92,5 @@ void MakefileParserThread::run()
     m_cflags = m_parser.cflags();
     m_cxxflags = m_parser.cxxflags();
 }
+
+} // AutotoolsProjectManager::Internal

src/plugins/bookmarks/bookmark.cpp

@@ -2,25 +2,26 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
 #include "bookmark.h"
+
 #include "bookmarkmanager.h"
 #include "bookmarks_global.h"
+#include "bookmarkstr.h"
 
 #include <utils/utilsicons.h>
 
-#include <QApplication>
-#include <QFileInfo>
 #include <QTextBlock>
 
-using namespace Bookmarks::Internal;
 using namespace Utils;
 
+namespace Bookmarks::Internal {
+
 Bookmark::Bookmark(int lineNumber, BookmarkManager *manager) :
     TextMark(FilePath(), lineNumber, Constants::BOOKMARKS_TEXT_MARK_CATEGORY),
     m_manager(manager)
 {
-    setColor(Utils::Theme::Bookmarks_TextMarkColor);
+    setColor(Theme::Bookmarks_TextMarkColor);
-    setIcon(Utils::Icons::BOOKMARK_TEXTEDITOR.icon());
+    setIcon(Icons::BOOKMARK_TEXTEDITOR.icon());
-    setDefaultToolTip(QApplication::translate("BookmarkManager", "Bookmark"));
+    setDefaultToolTip(Tr::tr("Bookmark"));
     setPriority(TextEditor::TextMark::NormalPriority);
 }
 
@@ -94,3 +95,5 @@ QString Bookmark::note() const
 {
     return toolTip();
 }
+
+} // Bookmarks::Internal

src/plugins/bookmarks/bookmark.h

@@ -5,8 +5,7 @@
 
 #include <texteditor/textmark.h>
 
-namespace Bookmarks {
+namespace Bookmarks::Internal {
-namespace Internal {
 
 class BookmarkManager;
 
@@ -35,5 +34,4 @@ private:
     QString m_lineText;
 };
 
-} // namespace Internal
+} // Bookmarks::Internal
-} // namespace Bookmarks

src/plugins/bookmarks/bookmarkfilter.cpp

@@ -9,10 +9,11 @@
 
 #include <utils/algorithm.h>
 
-using namespace Bookmarks::Internal;
 using namespace Core;
 using namespace Utils;
 
+namespace Bookmarks::Internal {
+
 BookmarkFilter::BookmarkFilter(BookmarkManager *manager)
     : m_manager(manager)
 {
@@ -114,3 +115,5 @@ void BookmarkFilter::accept(const LocatorFilterEntry &selection, QString *newTex
         m_manager->gotoBookmark(bookmark);
     }
 }
+
+} // Bookmarks::Internal

src/plugins/bookmarks/bookmarkfilter.h

@@ -5,14 +5,12 @@
 
 #include <coreplugin/locator/ilocatorfilter.h>
 
-namespace Bookmarks {
+namespace Bookmarks::Internal {
-namespace Internal {
 
 class BookmarkManager;
 
 class BookmarkFilter : public Core::ILocatorFilter
 {
-    Q_OBJECT
 public:
     explicit BookmarkFilter(BookmarkManager *manager);
     void prepareSearch(const QString &entry) override;
@@ -26,5 +24,4 @@ private:
     QList<Core::LocatorFilterEntry> m_results;
 };
 
-} // namespace Internal
+} // Bookmarks::Internal
-} // namespace Bookmarks

src/plugins/bookmarks/bookmarkmanager.cpp

@@ -43,8 +43,7 @@ using namespace ProjectExplorer;
 using namespace Core;
 using namespace Utils;
 
-namespace Bookmarks {
+namespace Bookmarks::Internal {
-namespace Internal {
 
 BookmarkDelegate::BookmarkDelegate(QObject *parent)
     : QStyledItemDelegate(parent)
@@ -794,5 +793,4 @@ NavigationView BookmarkViewFactory::createWidget()
     return {view, view->createToolBarWidgets()};
 }
 
-} // namespace Internal
+} // Bookmarks::Internal
-} // namespace Bookmarks

src/plugins/bookmarks/bookmarkmanager.h

@@ -16,8 +16,7 @@
 
 namespace Core { class IContext; }
 
-namespace Bookmarks {
+namespace Bookmarks::Internal {
-namespace Internal {
 
 class Bookmark;
 class BookmarksPlugin;
@@ -102,17 +101,13 @@ private:
 
 class BookmarkView final : public Utils::ListView
 {
-    Q_OBJECT
-
 public:
     explicit BookmarkView(BookmarkManager *manager);
 
     QList<QToolButton *> createToolBarWidgets();
 
-public slots:
     void gotoBookmark(const QModelIndex &index);
 
-protected slots:
     void removeFromContextMenu();
     void removeAll();
 
@@ -129,8 +124,6 @@ private:
 
 class BookmarkViewFactory : public Core::INavigationWidgetFactory
 {
-    Q_OBJECT
-
 public:
     BookmarkViewFactory(BookmarkManager *bm);
 
@@ -142,8 +135,6 @@ private:
 
 class BookmarkDelegate : public QStyledItemDelegate
 {
-    Q_OBJECT
-
 public:
     BookmarkDelegate(QObject *parent = nullptr);
 
@@ -156,5 +147,4 @@ private:
     mutable QPixmap m_selectedPixmap;
 };
 
-} // namespace Internal
+} // Bookmarks::Internal
-} // namespace Bookmarks

src/plugins/bookmarks/bookmarksplugin.cpp

@@ -31,8 +31,7 @@ using namespace Utils;
 
 using namespace Bookmarks::Constants;
 
-namespace Bookmarks {
+namespace Bookmarks::Internal {
-namespace Internal {
 
 class BookmarksPluginPrivate : public QObject
 {
@@ -225,5 +224,4 @@ void BookmarksPluginPrivate::requestContextMenu(TextEditorWidget *widget,
         menu->addAction(&m_editBookmarkAction);
 }
 
-} // namespace Internal
+} // Bookmarks::Internal
-} // namespace Bookmarks

src/plugins/bookmarks/bookmarksplugin.h

@@ -5,8 +5,7 @@
 
 #include <extensionsystem/iplugin.h>
 
-namespace Bookmarks {
+namespace Bookmarks::Internal {
-namespace Internal {
 
 class BookmarksPlugin final : public ExtensionSystem::IPlugin
 {
@@ -20,5 +19,4 @@ class BookmarksPlugin final : public ExtensionSystem::IPlugin
     class BookmarksPluginPrivate *d = nullptr;
 };
 
-} // namespace Internal
+} // Bookmarks::Internal
-} // namespace Bookmarks